[U-Boot-Users] [Patch 4/4] U-Boot-V2: ARM: Sync up defconfigs
Menon, Nishanth
x0nishan at ti.com
Wed May 7 13:56:02 CEST 2008
Sync up ARM defconfigs due to modifications done by Kconfig changes
Signed-off-by: Nishanth Menon <x0nishan at ti.com>
Index: u-boot-v2.git/arch/arm/configs/netx_nxdb500_defconfig
===================================================================
--- u-boot-v2.git.orig/arch/arm/configs/netx_nxdb500_defconfig
2008-05-02 14:32:08.000000000 -0500
+++ u-boot-v2.git/arch/arm/configs/netx_nxdb500_defconfig
2008-05-02 14:36:40.000000000 -0500
@@ -1,34 +1,51 @@
#
# Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-git
-# Sat Sep 22 15:53:21 2007
+# U-Boot version: 2.0.0-rc5-git
+# Fri May 2 14:36:24 2008
#
-CONFIG_TEXT_BASE=0x08f80000
+CONFIG_ARCH_TEXT_BASE=0x81f00000
CONFIG_BOARDINFO="Hilscher Netx nxdb500"
+# CONFIG_BOARD_LINKER_SCRIPT is not set
+CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
CONFIG_ARM926EJS=y
CONFIG_ARCH_NETX=y
# CONFIG_MACH_MX1ADS is not set
# CONFIG_MACH_SCB9328 is not set
+# CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_IMX27ADS is not set
# CONFIG_MACH_ECO920 is not set
CONFIG_MACH_NXDB500=y
+# CONFIG_MACH_PCM037 is not set
CONFIG_NETX_SDRAM_CTRL=0x010D0121
CONFIG_NETX_SDRAM_TIMING_CTRL=0x03C13261
CONFIG_NETX_MEM_CTRL=0x0203030F
CONFIG_NETX_COOKIE=32
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
CONFIG_INITRD_TAG=y
+
+#
+# Boot Features
+#
+CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_SKIP_RELOCATION is not set
CONFIG_GREGORIAN_CALENDER=y
+CONFIG_HAS_KALLSYMS=y
+CONFIG_HAS_MODULES=y
+CONFIG_CMD_MEMORY=y
#
# General Settings
#
+CONFIG_TEXT_BASE=0x08f80000
CONFIG_BROKEN=y
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_KALLSYMS is not set
CONFIG_PROMPT="uboot:"
CONFIG_BAUDRATE=115200
CONFIG_CMDLINE_EDITING=y
@@ -36,7 +53,9 @@
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
-CONFIG_HUSH_PARSER=y
+CONFIG_SHELL_HUSH=y
+# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
@@ -48,7 +67,10 @@
#
# Debugging
#
-CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_ENABLE_FLASH_NOISE is not set
+# CONFIG_ENABLE_PARTITION_NOISE is not set
+# CONFIG_ENABLE_DEVICE_NOISE is not set
#
# Commands
@@ -58,10 +80,13 @@
# scripting
#
CONFIG_CMD_EDIT=y
-CONFIG_CMD_EXEC=y
CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ENVIRONMENT=y
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADENV is not set
+# CONFIG_CMD_EXPORT is not set
+# CONFIG_CMD_PRINTENV is not set
CONFIG_CMD_HELP=y
+# CONFIG_CMD_READLINE is not set
#
# file commands
@@ -85,26 +110,15 @@
# CONFIG_CMD_SPLASH is not set
#
-# i2c
-#
-# CONFIG_CMD_I2C is not set
-
-#
# memory
#
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MEMORY=y
CONFIG_CMD_CRC=y
# CONFIG_CMD_MTEST is not set
#
-# network
-#
-# CONFIG_CMD_MII is not set
-
-#
# flash
#
CONFIG_CMD_FLASH=y
@@ -148,12 +162,20 @@
CONFIG_DRIVER_NET_NETX=y
#
+# SPI drivers
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_MC13783 is not set
+
+#
# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
# CONFIG_DRIVER_CFI_NEW is not set
+CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
+# CONFIG_NAND is not set
#
# Filesystem support
Index: u-boot-v2.git/arch/arm/configs/pcm037_defconfig
===================================================================
--- u-boot-v2.git.orig/arch/arm/configs/pcm037_defconfig
2008-05-02 14:32:08.000000000 -0500
+++ u-boot-v2.git/arch/arm/configs/pcm037_defconfig 2008-05-02
14:36:49.000000000 -0500
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-git
-# Thu Oct 18 19:32:40 2007
+# U-Boot version: 2.0.0-rc5-git
+# Fri May 2 14:36:46 2008
#
CONFIG_ARCH_TEXT_BASE=0x87f00000
CONFIG_BOARDINFO="Phytec phyCORE-i.MX31"
@@ -13,19 +13,27 @@
# CONFIG_MACH_MX1ADS is not set
# CONFIG_MACH_SCB9328 is not set
# CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_IMX27ADS is not set
# CONFIG_MACH_ECO920 is not set
# CONFIG_MACH_NXDB500 is not set
CONFIG_MACH_PCM037=y
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+
+#
+# Boot Features
+#
+CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_SKIP_RELOCATION is not set
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
+CONFIG_CMD_MEMORY=y
#
# General Settings
@@ -42,6 +50,7 @@
CONFIG_MAXARGS=16
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
@@ -54,7 +63,7 @@
#
# Debugging
#
-CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
# CONFIG_ENABLE_PARTITION_NOISE is not set
# CONFIG_ENABLE_DEVICE_NOISE is not set
@@ -68,8 +77,12 @@
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ENVIRONMENT=y
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADENV is not set
+# CONFIG_CMD_EXPORT is not set
+# CONFIG_CMD_PRINTENV is not set
CONFIG_CMD_HELP=y
+# CONFIG_CMD_READLINE is not set
#
# file commands
@@ -95,7 +108,6 @@
# memory
#
CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MEMORY=y
# CONFIG_CMD_CRC is not set
# CONFIG_CMD_MTEST is not set
@@ -142,10 +154,18 @@
CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=0
#
+# SPI drivers
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_IMX is not set
+# CONFIG_DRIVER_SPI_MC13783 is not set
+
+#
# flash drivers
#
CONFIG_DRIVER_CFI=y
# CONFIG_DRIVER_CFI_NEW is not set
+CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
Index: u-boot-v2.git/arch/arm/configs/pcm038_defconfig
===================================================================
--- u-boot-v2.git.orig/arch/arm/configs/pcm038_defconfig
2008-05-02 14:32:08.000000000 -0500
+++ u-boot-v2.git/arch/arm/configs/pcm038_defconfig 2008-05-02
14:36:57.000000000 -0500
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.0.0-git
-# Wed Nov 28 09:49:55 2007
+# U-Boot version: 2.0.0-rc5-git
+# Fri May 2 14:36:55 2008
#
CONFIG_ARCH_TEXT_BASE=0xa0000000
CONFIG_BOARDINFO="Phytec phyCORE-i.MX27"
@@ -14,9 +14,11 @@
# CONFIG_MACH_MX1ADS is not set
# CONFIG_MACH_SCB9328 is not set
CONFIG_MACH_PCM038=y
+# CONFIG_MACH_IMX27ADS is not set
# CONFIG_MACH_ECO920 is not set
# CONFIG_MACH_NXDB500 is not set
# CONFIG_MACH_PCM037 is not set
+# CONFIG_IMX_CLKO is not set
#
# Arm specific settings
@@ -24,6 +26,12 @@
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+
+#
+# Boot Features
+#
+# CONFIG_SKIP_LOWLEVEL_INIT is not set
+# CONFIG_SKIP_RELOCATION is not set
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
@@ -45,6 +53,7 @@
CONFIG_MAXARGS=16
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
@@ -58,7 +67,6 @@
# Debugging
#
# CONFIG_DEBUG_INFO is not set
-# CONFIG_SKIP_LOWLEVEL_INIT is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
# CONFIG_ENABLE_PARTITION_NOISE is not set
# CONFIG_ENABLE_DEVICE_NOISE is not set
@@ -150,11 +158,19 @@
CONFIG_DRIVER_NET_IMX27=y
#
+# SPI drivers
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_IMX is not set
+# CONFIG_DRIVER_SPI_MC13783 is not set
+
+#
# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
# CONFIG_DRIVER_CFI_NEW is not set
+CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
Index: u-boot-v2.git/arch/arm/configs/scb9328_defconfig
===================================================================
--- u-boot-v2.git.orig/arch/arm/configs/scb9328_defconfig
2008-05-02 14:32:08.000000000 -0500
+++ u-boot-v2.git/arch/arm/configs/scb9328_defconfig 2008-05-02
14:37:05.000000000 -0500
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-git
-# Fri Oct 19 11:00:09 2007
+# U-Boot version: 2.0.0-rc5-git
+# Fri May 2 14:37:03 2008
#
CONFIG_ARCH_TEXT_BASE=0x08f80000
CONFIG_BOARDINFO="Synertronixx scb9328"
@@ -14,19 +14,27 @@
# CONFIG_MACH_MX1ADS is not set
CONFIG_MACH_SCB9328=y
# CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_IMX27ADS is not set
# CONFIG_MACH_ECO920 is not set
# CONFIG_MACH_NXDB500 is not set
# CONFIG_MACH_PCM037 is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+
+#
+# Boot Features
+#
+CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_SKIP_RELOCATION is not set
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
+CONFIG_CMD_MEMORY=y
#
# General Settings
@@ -43,6 +51,7 @@
CONFIG_MAXARGS=16
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
@@ -55,7 +64,7 @@
#
# Debugging
#
-CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
# CONFIG_ENABLE_PARTITION_NOISE is not set
# CONFIG_ENABLE_DEVICE_NOISE is not set
@@ -69,8 +78,12 @@
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ENVIRONMENT=y
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADENV is not set
+# CONFIG_CMD_EXPORT is not set
+# CONFIG_CMD_PRINTENV is not set
CONFIG_CMD_HELP=y
+# CONFIG_CMD_READLINE is not set
#
# file commands
@@ -96,7 +109,6 @@
# memory
#
CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MEMORY=y
# CONFIG_CMD_CRC is not set
# CONFIG_CMD_MTEST is not set
@@ -144,11 +156,19 @@
CONFIG_DRIVER_NET_DM9000=y
#
+# SPI drivers
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_IMX is not set
+# CONFIG_DRIVER_SPI_MC13783 is not set
+
+#
# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
# CONFIG_DRIVER_CFI_NEW is not set
+CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
More information about the U-Boot
mailing list