diff options
| author | Robert Schwebel (Laptop) <rsc@thebe.(none)> | 2007-09-25 22:01:01 +0200 |
|---|---|---|
| committer | Robert Schwebel (Laptop) <rsc@thebe.(none)> | 2007-09-25 22:01:01 +0200 |
| commit | e6ca62360ef526b587f706e49d25bba08d33ee35 (patch) | |
| tree | 7edba92643c364be111e305ac58c1ec90c2d6ed5 /arch | |
| parent | a487eaa9c81b28c9b58ca64c8779ba8ca99447fd (diff) | |
| download | barebox-e6ca62360ef526b587f706e49d25bba08d33ee35.tar.gz barebox-e6ca62360ef526b587f706e49d25bba08d33ee35.tar.xz | |
Subject: clean up TEXT_BASE
This patch makes TEXT_BASE a consistent per-arch config switch.
Additionally, it converts all TEXT_BASE occurences from string to hex.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 12 | ||||
| -rw-r--r-- | arch/arm/configs/netx_nxdb500_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/scb9328_defconfig | 2 | ||||
| -rw-r--r-- | arch/blackfin/Kconfig | 4 | ||||
| -rw-r--r-- | arch/ppc/Kconfig | 6 | ||||
| -rw-r--r-- | arch/ppc/configs/phycore_mpc5200b_tiny_defconfig | 2 | ||||
| -rw-r--r-- | arch/sandbox/Kconfig | 6 | ||||
| -rw-r--r-- | arch/sandbox/configs/sandbox_defconfig | 2 |
8 files changed, 20 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 35aba95f80..12996cdf0d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1,10 +1,10 @@ -config TEXT_BASE - string - default "0x08f00000" if MACH_MX1ADS - default "0x08f80000" if MACH_SCB9328 - default "0x81f00000" if MACH_NXDB500 - default "0x21e00000" if MACH_ECO920 +config ARCH_TEXT_BASE + hex + default 0x08f00000 if MACH_MX1ADS + default 0x08f80000 if MACH_SCB9328 + default 0x81f00000 if MACH_NXDB500 + default 0x21e00000 if MACH_ECO920 config BOARDINFO default "Synertronixx scb9328" if MACH_SCB9328 diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig index 3e67b73bb6..70af580475 100644 --- a/arch/arm/configs/netx_nxdb500_defconfig +++ b/arch/arm/configs/netx_nxdb500_defconfig @@ -3,7 +3,7 @@ # U-Boot version: 2.0.0-git # Sat Sep 22 15:53:21 2007 # -CONFIG_TEXT_BASE="0x08f80000" +CONFIG_TEXT_BASE=0x08f80000 CONFIG_BOARDINFO="Hilscher Netx nxdb500" CONFIG_ARM=y CONFIG_ARM926EJS=y diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig index a50829a614..b76816ed30 100644 --- a/arch/arm/configs/scb9328_defconfig +++ b/arch/arm/configs/scb9328_defconfig @@ -3,7 +3,7 @@ # Linux kernel version: 2.6.20-rc5 # Tue Jun 26 00:41:32 2007 # -CONFIG_TEXT_BASE="0x08f80000" +CONFIG_TEXT_BASE=0x08f80000 CONFIG_ARM=y CONFIG_ARM920T=y CONFIG_ARCH_IMX=y diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 8268d0c6ed..0192b2e920 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -9,6 +9,10 @@ config BF561 config BOARDINFO default "PII IPE337" if MACH_IPE337 +config ARCH_TEXT_BASE + hex + default 0x00000000 + choice prompt "Select your board" diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index c6f0a50656..fc2048bfda 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -2,9 +2,9 @@ config BOARDINFO default "Phytec Phycore mpc5200b tiny" if MACH_PHYCORE_MPC5200B_TINY -config TEXT_BASE - default 0 if RELOCATABLE - default 0x1000000 if MACH_PHYCORE_MPC5200B_TINY +config ARCH_TEXT_BASE + default 0x00000000 if RELOCATABLE + default 0x01000000 if MACH_PHYCORE_MPC5200B_TINY config MPC5XXX_EARLY_CONSOLE bool diff --git a/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig b/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig index 65f2073aaf..cd04e16f30 100644 --- a/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig +++ b/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig @@ -3,7 +3,7 @@ # U-Boot version: 2.0.0-trunk # Sun Jul 1 14:40:26 2007 # -CONFIG_TEXT_BASE="0x1000000" +CONFIG_TEXT_BASE=0x1000000 CONFIG_ARCH_MPC5200=y CONFIG_MPC5200=y CONFIG_CACHELINE_SIZE=32 diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index eb849398b4..e079496155 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -1,7 +1,7 @@ -config TEXT_BASE - string - default "0x08f00000" if MACH_MX1ADS +config ARCH_TEXT_BASE + hex + default 0x00000000 config BOARDINFO default "sandbox" diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig index a222d8db20..940c9426a3 100644 --- a/arch/sandbox/configs/sandbox_defconfig +++ b/arch/sandbox/configs/sandbox_defconfig @@ -3,7 +3,7 @@ # U-Boot version: 2.0.0-trunk # Fri Jul 13 21:25:53 2007 # -CONFIG_TEXT_BASE="" +CONFIG_TEXT_BASE=0x00000000 CONFIG_BOARDINFO="sandbox" CONFIG_LINUX=y CONFIG_GREGORIAN_CALENDER=y |