MIPS: make config options more generic
cover MIPS: make config options more generic
This patch series contains cleanups and enhancements to consolidate the INCA-IP related config options and to make them more generic. Additionally, the cache operation mode is now configurable. All changes are needed to prepare the support of newer MIPS based Lantiq XWAY SoCs.
Daniel Schwierzeck (4):
MIPS: INCA-IP: rename inca-swap-bytes host tool
MIPS: rename INFINEON_EBU_BOOTCFG to CONFIG_SYS_XWAY_EBU_BOOTFG
MIPS: make cache operation mode configurable
README: update MIPS related informations
README | 35 +++++++++++++++++++++++-
arch/mips/cpu/mips32/start.S | 19 ++++++++++---
include/configs/incaip.h | 4 ++-
tools/Makefile | 8 +++---
tools/{inca-swap-bytes.c => xway-swap-bytes.c} | 0
5 files changed, 56 insertions(+), 10 deletions(-)
rename tools/{inca-swap-bytes.c => xway-swap-bytes.c} (100%)Signature · 1 line
1.7.6
PATCH 1/4 MIPS: INCA-IP: rename inca-swap-bytes host tool
The INCA-IP SoC belongs to the Lantiq XWAY SoC product portfolio. For the upcoming support of other Lantiq SoC devices this tool should not solely depend on the INCA-IP board.
Rename the tool to xway-swap-bytes and add an config option to enable compilation optionally.
---
include/configs/incaip.h | 2 ++
tools/Makefile | 8 ++++----
tools/{inca-swap-bytes.c => xway-swap-bytes.c} | 0
3 files changed, 6 insertions(+), 4 deletions(-)
rename tools/{inca-swap-bytes.c => xway-swap-bytes.c} (100%)include/configs/incaip.h +2 -0
@@ -31,6 +31,8 @@#define CONFIG_MIPS32 1/* MIPS 4Kc CPU core */ #define CONFIG_INCA_IP 1/* on a INCA-IP Board */ +#define CONFIG_XWAY_SWAP_BYTES +/* * Clock for the MIPS core (MHz) * allowed values: 100000000, 133000000, and 150000000 (default)
tools/Makefile +4 -4
@@ -43,7 +43,7 @@ ifneq ($(HOST_TOOLS_ALL),) CONFIG_LCD_LOGO = y CONFIG_CMD_LOADS = y CONFIG_CMD_NET = y -CONFIG_INCA_IP = y +CONFIG_XWAY_SWAP_BYTES = y CONFIG_NETCONSOLE = y CONFIG_SHA1_CHECK_UB_IMG = y endif
@@ -65,7 +65,7 @@ BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX) BIN_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX) BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX) BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX) -BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX) +BIN_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX) BIN_FILES-y += mkimage$(SFX) BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX) BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
@@ -85,7 +85,7 @@ OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o NOPED_OBJ_FILES-y += fit_image.o OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o -OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o +OBJ_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes.o NOPED_OBJ_FILES-y += kwbimage.o NOPED_OBJ_FILES-y += imximage.o NOPED_OBJ_FILES-y += mkimage.o
@@ -175,7 +175,7 @@ $(obj)img2srec$(SFX): $(obj)img2srec.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTSTRIP) $@ -$(obj)inca-swap-bytes$(SFX): $(obj)inca-swap-bytes.o +$(obj)xway-swap-bytes$(SFX): $(obj)xway-swap-bytes.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTSTRIP) $@
tools/xway-swap-bytes.c renamed from tools/inca-swap-bytes.c +0 -0
Signature · 1 line
1.7.6
PATCH 2/4 MIPS: rename INFINEON_EBU_BOOTCFG to CONFIG_SYS_XWAY_EBU_BOOTFG
In reply to Daniel SchwierzeckThis define is a board-specific config option and should be renamed to follow the U-Boot naming convention. Additionally, add an explaining comment for this option.
--- arch/mips/cpu/mips32/start.S | 13 ++++++++++--- include/configs/incaip.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-)
arch/mips/cpu/mips32/start.S +10 -3
@@ -64,9 +64,16 @@ _start: RVECENT(reset,0) # U-boot entry point RVECENT(reset,1) # software reboot -#ifdef CONFIG_INCA_IP - .word INFINEON_EBU_BOOTCFG # EBU init code, fetched during - .word 0x00000000 # booting phase of the flash +#ifdef CONFIG_SYS_XWAY_EBU_BOOTCFG + /* + * Almost all Lantiq XWAY SoC devices have an external bus unit (EBU) to + * access external NOR flashes. If the board boots from NOR flash the + * internal BootROM does a blind read at address 0xB0000010 to read the + * initial configuration for that EBU in order to access the flash + * device with correct parameters. This config option is board-specific. + */ + .word CONFIG_SYS_XWAY_EBU_BOOTCFG + .word 0x00000000 #else RVECENT(romReserved,2) #endif
include/configs/incaip.h +1 -1
@@ -41,7 +41,7 @@#define CONFIG_CPU_CLOCK_RATE 150000000#endif -#define INFINEON_EBU_BOOTCFG 0x40C4/* CMULT = 8 */ +#define CONFIG_SYS_XWAY_EBU_BOOTCFG 0x40C4/* CMULT = 8 */ #define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */
Signature · 1 line
1.7.6
PATCH 3/4 MIPS: make cache operation mode configurable
In reply to Daniel SchwierzeckCurrently the cache operation mode is hard-coded to CONF_CM_CACHABLE_NONCOHERENT. This is not appropiate for CPUs or SOCs which operate at a different mode.
This patch makes the cache operation mode configurable via board config.
--- arch/mips/cpu/mips32/start.S | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
arch/mips/cpu/mips32/start.S +5 -1
@@ -27,6 +27,10 @@ #include <asm/regdef.h> #include <asm/mipsregs.h> +#ifndef CONFIG_SYS_MIPS_CACHE_MODE +#define CONFIG_SYS_MIPS_CACHE_MODE CONF_CM_CACHABLE_NONCOHERENT +#endif + /* * For the moment disable interrupts, mark the kernel mode and * set ST0_KX so that the CPU does not spit fire when using
@@ -249,7 +253,7 @@ reset: nop /* ... and enable them */ - li t0, CONF_CM_CACHABLE_NONCOHERENT + li t0, CONFIG_SYS_MIPS_CACHE_MODE mtc0 t0, CP0_CONFIG #endif
Signature · 1 line
1.7.6
PATCH 4/4 README: update MIPS related informations
In reply to Daniel SchwierzeckAmend section 'Directory Hierarchy' for current MIPS directory. Describe config options for MIPS.
--- README | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-)
README +34 -1
@@ -180,6 +180,7 @@ Directory Hierarchy: /lib Architecture specific library files /mips Files generic to MIPS architecture /cpu CPU specific files + /mips32 Files specific to MIPS32 CPUs /lib Architecture specific library files /nios2 Files generic to Altera NIOS2 architecture /cpu CPU specific files
@@ -382,6 +383,38 @@ The following options need to be configured: 2. The core frequency as calculated above is multiplied by this value. +- MIPS CPU options: + CONFIG_SYS_INIT_SP_OFFSET + + Offset relative to CONFIG_SYS_SDRAM_BASE for initial stack + pointer. This is needed for the temporary stack before + relocation. + + CONFIG_SYS_MIPS_CACHE_MODE + + Cache operation mode for the MIPS CPU. + See also arch/mips/include/asm/mipsregs.h. + Possible values are: + CONF_CM_CACHABLE_NO_WA + CONF_CM_CACHABLE_WA + CONF_CM_UNCACHED + CONF_CM_CACHABLE_NONCOHERENT + CONF_CM_CACHABLE_CE + CONF_CM_CACHABLE_COW + CONF_CM_CACHABLE_CUW + CONF_CM_CACHABLE_ACCELERATED + + CONFIG_SYS_XWAY_EBU_BOOTCFG + + Special option for Lantiq XWAY SoCs for booting from NOR flash. + See also arch/mips/cpu/mips32/start.S. + + CONFIG_XWAY_SWAP_BYTES + + Enable compilation of tools/xway-swap-bytes needed for Lantiq + XWAY SoCs for booting from NOR flash. The U-Boot image needs to + be swapped if a flash programmer is used. + - Linux Kernel Interface: CONFIG_CLOCKS_IN_MHZ
@@ -3070,7 +3103,7 @@ Low Level (hardware related) configuration options: globally (CONFIG_CMD_MEM). - CONFIG_SKIP_LOWLEVEL_INIT - [ARM only] If this variable is defined, then certain + [ARM, MIPS only] If this variable is defined, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate itself into RAM.
Signature · 1 line
1.7.6
cover MIPS: make config options more generic
In reply to Daniel SchwierzeckHi Daniel,
Daniel Schwierzeck wrote on 2011-07-27:
Quoted 6 lines
This patch series contains cleanups and enhancements to consolidate the INCA-IP related config options and to make them more generic. Additionally, the cache operation mode is now configurable. All changes are needed to prepare the support of newer MIPS based Lantiq XWAY SoCs.
my ack to the complete series:
Best Regards,
Thomas
cover MIPS: make config options more generic
Quoted 11 lines · thomas.langer at lantiq.com
Hi Daniel,
Daniel Schwierzeck wrote on 2011-07-27:
Quoted 6 lines
This patch series contains cleanups and enhancements to consolidate the INCA-IP related config options and to make them more generic. Additionally, the cache operation mode is now configurable. All changes are needed to prepare the support of newer MIPS based Lantiq XWAY SoCs.
Quoted 3 lines
my ack to the complete series:
Acked-by Thomas Langer <[email protected]>
Thanks for the patches, looks good. Will push shortly.
Shinya