Merge /home/git/users/rsc/u-boot-v2

8 files changed, 29 insertions, 33 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_config b/arch/arm/configs/netx_nxdb500_defconfig
index 3e67b73bb6..70af580475 100644
--- a/arch/arm/configs/netx_nxdb500_config
+++ 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..0544b6ef81 100644
--- a/arch/sandbox/configs/sandbox_defconfig
+++ b/arch/sandbox/configs/sandbox_defconfig
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-trunk
-# Fri Jul 13 21:25:53 2007
+# U-Boot version: 2.0.0-git
+# Tue Sep 25 22:07:54 2007
 #
-CONFIG_TEXT_BASE=""
+CONFIG_ARCH_TEXT_BASE=0x00000000
 CONFIG_BOARDINFO="sandbox"
 CONFIG_LINUX=y
 CONFIG_GREGORIAN_CALENDER=y
@@ -11,6 +11,7 @@ CONFIG_GREGORIAN_CALENDER=y
 #
 # General Settings              
 #
+CONFIG_TEXT_BASE=0x00000000
 # CONFIG_BROKEN is not set
 CONFIG_PROMPT="uboot:"
 CONFIG_BAUDRATE=115200
@@ -19,13 +20,16 @@ CONFIG_CMDLINE_EDITING=y
 # CONFIG_LONGHELP is not set
 CONFIG_CBSIZE=1024
 CONFIG_MAXARGS=16
-CONFIG_HUSH_PARSER=y
+CONFIG_SHELL_HUSH=y
+# CONFIG_SHELL_SIMPLE is not set
 CONFIG_PROMPT_HUSH_PS2="> "
 CONFIG_DYNAMIC_CRC_TABLE=y
 CONFIG_ERRNO_MESSAGES=y
 CONFIG_TIMESTAMP=y
 CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
+CONFIG_DEFAULT_ENVIRONMENT=y
+CONFIG_DEFAULT_ENVIRONMENT_PATH=""
 
 #
 # Debugging                     
@@ -39,7 +43,6 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # scripting                     
 #
 CONFIG_CMD_EDIT=y
-CONFIG_CMD_EXEC=y
 CONFIG_CMD_SLEEP=y
 CONFIG_CMD_ENVIRONMENT=y
 CONFIG_CMD_HELP=y
@@ -91,6 +94,7 @@ CONFIG_CMD_CRC=y
 # CONFIG_CMD_BOOTM is not set
 CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
+# CONFIG_CMD_TIMEOUT is not set
 CONFIG_CMD_PARTITION=y
 CONFIG_CMD_TEST=y
 CONFIG_NET=y
@@ -114,22 +118,10 @@ CONFIG_DRIVER_SERIAL_LINUX_COMSOLE=y
 #
 # Network drivers               
 #
+# CONFIG_DRIVER_NET_SMC911X is not set
 # CONFIG_DRIVER_NET_TAP is not set
 
 #
-# video drivers                 
-#
-# CONFIG_DRIVER_VIDEO_S1D13706 is not set
-
-#
-# I2C drivers                   
-#
-
-#
-# USB host support              
-#
-
-#
 # flash drivers                 
 #
 # CONFIG_DRIVER_CFI is not set