summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-12-21 11:43:06 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-12-21 11:43:06 +0100
commita5bd96de7ddf4071acfe3d310cdb7b121ab8cb2b (patch)
tree05162da1aab2886759104af8c9d0aed7f515a9ec
parentc0f46a1d3d13548d0a68686a87647c8a85f49e95 (diff)
parent4e4b03cd61808383a98cb1d10a47025e1909e0bd (diff)
downloadbarebox-a5bd96de7ddf4071acfe3d310cdb7b121ab8cb2b.tar.gz
barebox-a5bd96de7ddf4071acfe3d310cdb7b121ab8cb2b.tar.xz
Merge branch 'pu'
-rw-r--r--Makefile8
-rw-r--r--arch/arm/configs/a9m2410_defconfig96
-rw-r--r--arch/arm/configs/a9m2440_defconfig99
-rw-r--r--arch/arm/configs/at91sam9260ek_defconfig93
-rw-r--r--arch/arm/configs/at91sam9263ek_defconfig97
-rw-r--r--arch/arm/configs/eukrea_cpuimx27_defconfig109
-rw-r--r--arch/arm/configs/freescale_mx25_3stack_defconfig108
-rw-r--r--arch/arm/configs/freescale_mx35_3stack_defconfig108
-rw-r--r--arch/arm/configs/mmccpu_defconfig110
-rw-r--r--arch/arm/configs/mx21ads_defconfig105
-rw-r--r--arch/arm/configs/mx27ads_defconfig113
-rw-r--r--arch/arm/configs/netx_nxdb500_defconfig103
-rw-r--r--arch/arm/configs/omap3430_sdp3430_per_uart_defconfig67
-rw-r--r--arch/arm/configs/omap3530_beagle_per_uart_defconfig68
-rw-r--r--arch/arm/configs/omap3_evm_defconfig27
-rw-r--r--arch/arm/configs/pca100_defconfig110
-rw-r--r--arch/arm/configs/pcm037_defconfig123
-rw-r--r--arch/arm/configs/pcm043_defconfig114
-rw-r--r--arch/arm/configs/pm9263_defconfig96
-rw-r--r--arch/arm/configs/scb9328_defconfig144
-rw-r--r--arch/arm/mach-imx/include/mach/imx-ipu-fb.h2
-rw-r--r--arch/blackfin/configs/ipe337_defconfig27
-rw-r--r--arch/ppc/configs/pcm030_defconfig27
-rw-r--r--arch/sandbox/configs/sandbox_defconfig9
-rw-r--r--board/freescale-mx25-3-stack/3stack.c38
-rw-r--r--board/ipe337/ipe337.c1
-rw-r--r--board/netx/netx.c2
-rw-r--r--board/pcm037/pcm037.c1
-rw-r--r--board/pcm043/pcm043.c2
-rw-r--r--board/scb9328/scb9328.c4
-rw-r--r--commands/edit.c2
-rw-r--r--drivers/nand/nand_imx.c2
-rw-r--r--include/i2c/i2c.h8
-rw-r--r--include/readkey.h24
-rw-r--r--lib/readkey.c4
-rw-r--r--lib/readline.c6
-rw-r--r--lib/vsprintf.c2
37 files changed, 1304 insertions, 755 deletions
diff --git a/Makefile b/Makefile
index d69f6efbc9..f2dc079df3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-VERSION = 2
-PATCHLEVEL = 0
+VERSION = 2009
+PATCHLEVEL = 12
SUBLEVEL = 0
-EXTRAVERSION =-rc10
+EXTRAVERSION =-pre
NAME = Amissive Actinocutious Kiwi
# *DOCUMENTATION*
@@ -939,7 +939,7 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR)
CLEAN_FILES += barebox System.map include/barebox_default_env.h \
.tmp_version .tmp_barebox* barebox.bin barebox.S \
- .tmp_kallsyms* barebox_default_env
+ .tmp_kallsyms* barebox_default_env barebox.ldr
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include2 usr/include
diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig
index 5cd1ac2ac0..9429a3763d 100644
--- a/arch/arm/configs/a9m2410_defconfig
+++ b/arch/arm/configs/a9m2410_defconfig
@@ -1,53 +1,59 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc9
-# Wed Jul 1 14:15:55 2009
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:46:05 2009
#
-CONFIG_ARCH_TEXT_BASE=0x31fc0000
-CONFIG_BOARDINFO="Digi A9M2410"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_ARCH_S3C24xx=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
+CONFIG_CPU_32v4T=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x31fc0000
+CONFIG_BOARDINFO="Digi A9M2410"
+CONFIG_CPU_S3C2410=y
CONFIG_MACH_A9M2410=y
# CONFIG_MACH_A9M2440 is not set
-# CONFIG_MACH_PCA100 is not set
-# CONFIG_MACH_MMCCPU is not set
-CONFIG_ARCH_S3C24xx=y
-CONFIG_CPU_S3C2410=y
#
-# Board specific settings
+# Board specific settings
#
#
-# S3C24X0 Features
+# S3C24X0 Features
#
CONFIG_S3C24XX_LOW_LEVEL_INIT=y
CONFIG_S3C24XX_PLL_INIT=y
CONFIG_S3C24XX_SDRAM_INIT=y
CONFIG_S3C24XX_NAND_BOOT=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
@@ -55,12 +61,12 @@ CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x31fc0000
@@ -97,7 +103,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/a9m2410/env"
#
-# Debugging
+# Debugging
#
CONFIG_DEBUG_INFO=y
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -105,11 +111,11 @@ CONFIG_DEBUG_INFO=y
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -122,7 +128,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -136,14 +142,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
-# CONFIG_CMD_SPLASH is not set
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADY is not set
@@ -154,18 +159,19 @@ CONFIG_CMD_MTEST=y
# CONFIG_CMD_MTEST_ALTERNATIVE is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-CONFIG_CMD_NAND=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -175,39 +181,39 @@ CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_DRIVER_SERIAL_S3C24X0=y
# CONFIG_DRIVER_SERIAL_S3C24X0_AUTOSYNC is not set
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
CONFIG_DRIVER_NET_SMC91111=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
# CONFIG_DRIVER_CFI is not set
# CONFIG_DRIVER_CFI_OLD is not set
@@ -218,9 +224,11 @@ CONFIG_NAND_S3C24X0=y
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig
index f77bb70ccc..1fcabbb62e 100644
--- a/arch/arm/configs/a9m2440_defconfig
+++ b/arch/arm/configs/a9m2440_defconfig
@@ -1,53 +1,60 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc9
-# Wed Jul 1 14:23:41 2009
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:46:15 2009
#
-CONFIG_ARCH_TEXT_BASE=0x31fc0000
-CONFIG_BOARDINFO="Digi A9M2440"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_ARCH_S3C24xx=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
+CONFIG_CPU_32v4T=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x31fc0000
+CONFIG_BOARDINFO="Digi A9M2440"
+CONFIG_CPU_S3C2440=y
# CONFIG_MACH_A9M2410 is not set
CONFIG_MACH_A9M2440=y
-# CONFIG_MACH_PCA100 is not set
-# CONFIG_MACH_MMCCPU is not set
-CONFIG_ARCH_S3C24xx=y
-CONFIG_CPU_S3C2440=y
#
-# Board specific settings
+# Board specific settings
#
+CONFIG_MACH_A9M2410DEV=y
#
-# S3C24X0 Features
+# S3C24X0 Features
#
CONFIG_S3C24XX_LOW_LEVEL_INIT=y
CONFIG_S3C24XX_PLL_INIT=y
CONFIG_S3C24XX_SDRAM_INIT=y
CONFIG_S3C24XX_NAND_BOOT=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
@@ -55,12 +62,12 @@ CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x31fc0000
@@ -97,7 +104,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/a9m2440/env"
#
-# Debugging
+# Debugging
#
CONFIG_DEBUG_INFO=y
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -105,11 +112,11 @@ CONFIG_DEBUG_INFO=y
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -122,7 +129,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -136,14 +143,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
-# CONFIG_CMD_SPLASH is not set
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADY is not set
@@ -154,18 +160,19 @@ CONFIG_CMD_MTEST=y
# CONFIG_CMD_MTEST_ALTERNATIVE is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-CONFIG_CMD_NAND=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -175,39 +182,41 @@ CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_DRIVER_SERIAL_S3C24X0=y
# CONFIG_DRIVER_SERIAL_S3C24X0_AUTOSYNC is not set
+CONFIG_HAS_CS8900=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
+# CONFIG_DRIVER_NET_CS8900 is not set
# CONFIG_DRIVER_NET_SMC911X is not set
CONFIG_DRIVER_NET_SMC91111=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
# CONFIG_DRIVER_CFI is not set
# CONFIG_DRIVER_CFI_OLD is not set
@@ -218,9 +227,11 @@ CONFIG_NAND_S3C24X0=y
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
index 258b82eea9..61df756932 100644
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -1,46 +1,65 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Tue Oct 21 18:24:32 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:46:40 2009
#
-CONFIG_ARCH_TEXT_BASE=0x23f00000
-CONFIG_BOARDINFO="Atmel 91SAM9260-EK"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
+
+#
+# System Type
+#
CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x23f00000
+CONFIG_BOARDINFO="Atmel 91SAM9260-EK"
+
+#
+# Atmel AT91 System-on-Chip
+#
CONFIG_ARCH_AT91SAM9260=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 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
CONFIG_MACH_AT91SAM9260EK=y
-# CONFIG_MACH_PM9263 is not set
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
+CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x23f00000
@@ -73,7 +92,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/at91sam9260ek/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -81,11 +100,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/at91sam9260ek/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -98,7 +117,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -112,13 +131,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -127,18 +146,19 @@ CONFIG_CMD_MTEST=y
# CONFIG_CMD_MTEST_ALTERNATIVE is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -147,39 +167,41 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_DRIVER_SERIAL_ATMEL=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_MACB=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
# CONFIG_DRIVER_CFI is not set
# CONFIG_DRIVER_CFI_OLD is not set
@@ -188,9 +210,12 @@ CONFIG_NAND_ATMEL=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index c81371d57d..eb47856b05 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -1,39 +1,47 @@
#
# Automatically generated make config: don't edit
# barebox version: 2.0.0-rc10
-# Sat Sep 26 18:45:28 2009
+# Fri Dec 18 11:47:16 2009
#
-CONFIG_ARCH_TEXT_BASE=0x23f00000
-CONFIG_BOARDINFO="Atmel at91sam9263-ek"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
+
+#
+# System Type
+#
CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x23f00000
+CONFIG_BOARDINFO="Atmel at91sam9263-ek"
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91SAM9260 is not set
CONFIG_ARCH_AT91SAM9263=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_FREESCALE_MX25_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
CONFIG_MACH_AT91SAM9263EK=y
-# CONFIG_MACH_PM9263 is not set
-# CONFIG_MACH_A9M2410 is not set
-# CONFIG_MACH_A9M2440 is not set
-# CONFIG_MACH_PCA100 is not set
# CONFIG_MACH_MMCCPU is not set
-# CONFIG_MACH_EUKREA_CPUIMX27 is not set
+# CONFIG_MACH_PM9263 is not set
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
@@ -45,14 +53,15 @@ CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x23f00000
@@ -87,7 +96,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/at91sam9263ek/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -95,11 +104,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/at91sam9263ek/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -112,7 +121,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -126,13 +135,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -141,12 +150,12 @@ CONFIG_CMD_MTEST=y
# CONFIG_CMD_MTEST_ALTERNATIVE is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
CONFIG_CMD_BOOTM_ZLIB=y
@@ -162,40 +171,41 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
CONFIG_NET_NFS=y
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_DRIVER_SERIAL_ATMEL=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_MACB=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_NEW=y
@@ -212,14 +222,11 @@ CONFIG_NAND_ATMEL=y
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_USB is not set
-
-#
-# Video drivers
-#
+# CONFIG_USB_GADGET is not set
# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig
index 0e15bc56e8..b1624de958 100644
--- a/arch/arm/configs/eukrea_cpuimx27_defconfig
+++ b/arch/arm/configs/eukrea_cpuimx27_defconfig
@@ -1,39 +1,52 @@
#
# Automatically generated make config: don't edit
# barebox version: 2.0.0-rc10
-# Thu Oct 22 16:38:29 2009
+# Fri Dec 18 11:47:22 2009
#
-CONFIG_ARCH_TEXT_BASE=0xa0000000
-CONFIG_BOARDINFO="Eukrea CPUIMX27"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_FREESCALE_MX25_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
-# CONFIG_MACH_A9M2410 is not set
-# CONFIG_MACH_A9M2440 is not set
-# CONFIG_MACH_PCA100 is not set
-# CONFIG_MACH_MMCCPU is not set
-CONFIG_MACH_EUKREA_CPUIMX27=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0xa0000000
+CONFIG_BOARDINFO="Eukrea CPUIMX27"
CONFIG_ARCH_HAS_FEC_IMX=y
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
CONFIG_ARCH_IMX27=y
+# CONFIG_ARCH_IMX31 is not set
+# CONFIG_ARCH_IMX35 is not set
+CONFIG_MACH_EUKREA_CPUIMX27=y
+# CONFIG_MACH_IMX27ADS is not set
+# CONFIG_MACH_PCA100 is not set
+# CONFIG_MACH_PCM038 is not set
#
-# Board specific settings
+# Board specific settings
#
CONFIG_EUKREA_CPUIMX27_SDRAM_128MB=y
# CONFIG_EUKREA_CPUIMX27_SDRAM_256MB is not set
@@ -45,31 +58,33 @@ CONFIG_EUKREA_CPUIMX27_QUART1=y
# CONFIG_EUKREA_CPUIMX27_QUART4 is not set
#
-# i.MX specific settings
+# i.MX specific settings
#
CONFIG_IMX_CLKO=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
-# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_MMU=y
CONFIG_MMU=y
@@ -107,7 +122,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/eukrea_cpuimx27/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -115,11 +130,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/eukrea_cpuimx27/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -132,7 +147,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -146,13 +161,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -161,12 +176,12 @@ CONFIG_CMD_MTEST=y
# CONFIG_CMD_MTEST_ALTERNATIVE is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
@@ -182,6 +197,7 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
@@ -190,32 +206,34 @@ CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_FEC_IMX=y
#
-# SPI drivers
+# SPI drivers
#
CONFIG_SPI=y
CONFIG_DRIVER_SPI_IMX=y
CONFIG_DRIVER_SPI_MC13783=y
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
@@ -224,21 +242,16 @@ CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
CONFIG_NAND=y
CONFIG_NAND_IMX=y
-# CONFIG_MXC_NAND_LOW_LEVEL_ERASE is not set
# CONFIG_NAND_IMX_BOOT is not set
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_USB is not set
# CONFIG_USB_GADGET is not set
-
-#
-# Video drivers
-#
# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale_mx25_3stack_defconfig
index d9cefd417a..d308e5bf01 100644
--- a/arch/arm/configs/freescale_mx25_3stack_defconfig
+++ b/arch/arm/configs/freescale_mx25_3stack_defconfig
@@ -1,60 +1,80 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc8
-# Wed Apr 8 13:06:07 2009
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:47:29 2009
#
-CONFIG_ARCH_TEXT_BASE=0x87f00000
-CONFIG_BOARDINFO="Freescale MX25 3Stack"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-CONFIG_MACH_FREESCALE_MX25_3STACK=y
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
#
-# Board specific settings
+# System Type
#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x87f00000
+CONFIG_BOARDINFO="Freescale MX25 3Stack"
CONFIG_ARCH_HAS_FEC_IMX=y
+# CONFIG_ARCH_IMX_INTERNAL_BOOT is not set
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
CONFIG_ARCH_IMX25=y
+# CONFIG_ARCH_IMX27 is not set
+# CONFIG_ARCH_IMX31 is not set
+# CONFIG_ARCH_IMX35 is not set
+CONFIG_MACH_FREESCALE_MX25_3STACK=y
+
+#
+# Board specific settings
+#
#
-# i.MX specific settings
+# i.MX specific settings
#
+# CONFIG_IMX_CLKO is not set
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x87F00000
@@ -89,7 +109,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/freescale-mx25-3-stack/env/"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -97,11 +117,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/freescale-mx25-3-stack/env/"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -114,7 +134,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -128,13 +148,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -142,18 +162,19 @@ CONFIG_CMD_CRC=y
# CONFIG_CMD_MTEST is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-CONFIG_CMD_NAND=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -162,54 +183,59 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_FEC_IMX=y
# CONFIG_NET_USB is not set
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_HAS_CFI=y
# CONFIG_DRIVER_CFI is not set
# CONFIG_DRIVER_CFI_OLD is not set
CONFIG_NAND=y
+# CONFIG_NAND_IMX is not set
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
CONFIG_USB=y
CONFIG_USB_EHCI=y
# CONFIG_USB_ISP1504 is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale_mx35_3stack_defconfig
index d48adf5ecf..1319a695e6 100644
--- a/arch/arm/configs/freescale_mx35_3stack_defconfig
+++ b/arch/arm/configs/freescale_mx35_3stack_defconfig
@@ -1,57 +1,79 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc7
-# Mon Feb 2 16:43:49 2009
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:47:45 2009
#
-CONFIG_ARCH_TEXT_BASE=0x87f00000
-CONFIG_BOARDINFO="Freescale MX35 3Stack"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x87f00000
+CONFIG_BOARDINFO="Freescale MX35 3Stack"
+CONFIG_ARCH_HAS_FEC_IMX=y
+# CONFIG_ARCH_IMX_INTERNAL_BOOT is not set
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
+# CONFIG_ARCH_IMX27 is not set
+# CONFIG_ARCH_IMX31 is not set
CONFIG_ARCH_IMX35=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_PCM043 is not set
CONFIG_MACH_FREESCALE_MX35_3STACK=y
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
+# CONFIG_MACH_PCM043 is not set
#
-# Board specific settings
+# Board specific settings
#
#
-# i.MX specific settings
+# i.MX specific settings
#
-# CONFIG_CMD_IMX_FUSE is not set
+# CONFIG_IMX_CLKO is not set
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x87F00000
@@ -86,7 +108,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm043/env/"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -94,11 +116,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm043/env/"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -111,7 +133,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -125,13 +147,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -139,17 +161,19 @@ CONFIG_CMD_CRC=y
# CONFIG_CMD_MTEST is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -158,42 +182,47 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
CONFIG_DRIVER_NET_SMC911X=y
CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=0
-CONFIG_DRIVER_NET_IMX27=y
+# CONFIG_DRIVER_NET_SMC91111 is not set
+# CONFIG_DRIVER_NET_FEC_IMX is not set
#
-# SPI drivers
+# SPI drivers
#
CONFIG_SPI=y
# CONFIG_DRIVER_SPI_IMX is not set
# CONFIG_DRIVER_SPI_MC13783 is not set
+CONFIG_I2C=y
+CONFIG_DRIVER_I2C_IMX=y
+CONFIG_DRIVER_I2C_MC13892=y
+CONFIG_DRIVER_I2C_MC9SDZ60=y
#
-# flash drivers
+# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
@@ -201,9 +230,12 @@ CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig
index bc9bd6ac9a..2b80a30a59 100644
--- a/arch/arm/configs/mmccpu_defconfig
+++ b/arch/arm/configs/mmccpu_defconfig
@@ -1,60 +1,67 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc8
-# Tue May 19 09:44:44 2009
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:47:54 2009
#
-CONFIG_ARCH_TEXT_BASE=0x23f00000
-CONFIG_BOARDINFO="Bucyrus MMC-CPU"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
+
+#
+# System Type
+#
CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT91SAM9263=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
-# CONFIG_MACH_PCA100 is not set
-CONFIG_MACH_MMCCPU=y
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
#
-# Board specific settings
+# processor features
#
+CONFIG_ARCH_TEXT_BASE=0x23f00000
+CONFIG_BOARDINFO="Bucyrus MMC-CPU"
#
-# i.MX specific settings
+# Atmel AT91 System-on-Chip
#
+# CONFIG_ARCH_AT91SAM9260 is not set
+CONFIG_ARCH_AT91SAM9263=y
+# CONFIG_MACH_AT91SAM9263EK is not set
+CONFIG_MACH_MMCCPU=y
+# CONFIG_MACH_PM9263 is not set
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x23f00000
@@ -89,7 +96,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/mmccpu/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -97,11 +104,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/mmccpu/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -114,7 +121,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -128,13 +135,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -143,22 +150,19 @@ CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
#
-# i2c
-#
-CONFIG_CMD_I2C=y
-
-#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -167,39 +171,43 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_DRIVER_SERIAL_ATMEL=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_MACB=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+CONFIG_I2C=y
+# CONFIG_DRIVER_I2C_MC13892 is not set
+# CONFIG_DRIVER_I2C_MC9SDZ60 is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_NEW=y
@@ -212,15 +220,11 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# I2C drivers
-#
-CONFIG_I2C=y
-CONFIG_DRIVER_I2C_BITBANG=y
-
-#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig
index 6589ca8dba..99a87143ec 100644
--- a/arch/arm/configs/mx21ads_defconfig
+++ b/arch/arm/configs/mx21ads_defconfig
@@ -1,60 +1,78 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc8
-# Tue Apr 28 08:40:15 2009
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:48:02 2009
#
-CONFIG_ARCH_TEXT_BASE=0xc0000000
-CONFIG_BOARDINFO="Freescale i.MX21 ADS"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-CONFIG_MACH_IMX21ADS=y
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
-# CONFIG_MACH_PCA100 is not set
#
-# Board specific settings
+# System Type
#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0xc0000000
+CONFIG_BOARDINFO="Freescale i.MX21 ADS"
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
CONFIG_ARCH_IMX21=y
+# CONFIG_ARCH_IMX25 is not set
+# CONFIG_ARCH_IMX27 is not set
+# CONFIG_ARCH_IMX31 is not set
+# CONFIG_ARCH_IMX35 is not set
+CONFIG_MACH_IMX21ADS=y
+
+#
+# Board specific settings
+#
#
-# i.MX specific settings
+# i.MX specific settings
#
CONFIG_IMX_CLKO=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0xc1000000
@@ -89,7 +107,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/imx21ads/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -97,11 +115,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/imx21ads/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -114,7 +132,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -128,13 +146,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -143,18 +161,19 @@ CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-CONFIG_CMD_NAND=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -163,39 +182,41 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
CONFIG_NET_NFS=y
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_HAS_CS8900=y
#
-# Network drivers
+# Network drivers
#
CONFIG_DRIVER_NET_CS8900=y
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
@@ -214,9 +235,11 @@ CONFIG_NAND_IMX=y
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/mx27ads_defconfig
index d40fbd2fb8..71880c0b76 100644
--- a/arch/arm/configs/mx27ads_defconfig
+++ b/arch/arm/configs/mx27ads_defconfig
@@ -1,46 +1,82 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Thu Aug 21 16:59:40 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:48:21 2009
#
-CONFIG_ARCH_TEXT_BASE=0xa0000000
-CONFIG_BOARDINFO="Freescale i.MX27 ADS"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0xa0000000
+CONFIG_BOARDINFO="Freescale i.MX27 ADS"
+CONFIG_ARCH_HAS_FEC_IMX=y
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
CONFIG_ARCH_IMX27=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
+# CONFIG_ARCH_IMX31 is not set
+# CONFIG_ARCH_IMX35 is not set
+# CONFIG_MACH_EUKREA_CPUIMX27 is not set
CONFIG_MACH_IMX27ADS=y
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
+# CONFIG_MACH_PCA100 is not set
+# CONFIG_MACH_PCM038 is not set
+
+#
+# Board specific settings
+#
+
+#
+# i.MX specific settings
+#
CONFIG_IMX_CLKO=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
+CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0xa7f00000
@@ -75,7 +111,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/imx27ads/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -83,11 +119,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/imx27ads/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -100,7 +136,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -114,13 +150,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -129,18 +165,19 @@ CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -149,41 +186,42 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
-CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
-CONFIG_DRIVER_NET_IMX27=y
+# CONFIG_DRIVER_NET_SMC91111 is not set
+# CONFIG_DRIVER_NET_FEC_IMX is not set
#
-# SPI drivers
+# SPI drivers
#
CONFIG_SPI=y
CONFIG_DRIVER_SPI_IMX=y
CONFIG_DRIVER_SPI_MC13783=y
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
@@ -196,9 +234,12 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig
index 531533307d..95afb5ec2a 100644
--- a/arch/arm/configs/netx_nxdb500_defconfig
+++ b/arch/arm/configs/netx_nxdb500_defconfig
@@ -1,35 +1,49 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Thu Jul 3 09:34:20 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:48:29 2009
#
-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_CPU_ARM926T=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
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_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x81f00000
+CONFIG_BOARDINFO="Hilscher Netx nxdb500"
CONFIG_NETX_SDRAM_CTRL=0x010D0121
CONFIG_NETX_SDRAM_TIMING_CTRL=0x03C13261
CONFIG_NETX_MEM_CTRL=0x0203030F
CONFIG_NETX_COOKIE=32
+CONFIG_MACH_NXDB500=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
+CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
CONFIG_INITRD_TAG=y
+# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
@@ -37,11 +51,12 @@ CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
#
-# General Settings
+# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x08f80000
@@ -57,8 +72,6 @@ CONFIG_MACH_HAS_LOWLEVEL_INIT=y
CONFIG_MACH_DO_LOWLEVEL_INIT=y
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
@@ -66,16 +79,19 @@ CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
CONFIG_PARTITION=y
# CONFIG_DEFAULT_ENVIRONMENT is not set
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -83,11 +99,11 @@ CONFIG_PARTITION=y
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -95,11 +111,12 @@ CONFIG_CMD_SAVEENV=y
CONFIG_CMD_LOADENV=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_HELP=y
CONFIG_CMD_READLINE=y
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -113,14 +130,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
-# CONFIG_CMD_SPLASH is not set
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
@@ -129,58 +145,63 @@ CONFIG_CMD_CRC=y
# CONFIG_CMD_MTEST is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_TEST=y
+CONFIG_CMD_VERSION=y
+CONFIG_CMD_HELP=y
+CONFIG_CMD_DEVINFO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_NETX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_HAS_NETX_ETHER=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_NETX=y
#
-# SPI drivers
+# SPI drivers
#
CONFIG_SPI=y
# CONFIG_DRIVER_SPI_MC13783 is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_HAS_CFI=y
CONFIG_DRIVER_CFI=y
@@ -188,9 +209,15 @@ CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
+CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y
CONFIG_CRC32=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
index 81bd0c1017..4501f5ac9f 100644
--- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
+++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
@@ -1,23 +1,34 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Wed Jun 4 13:18:29 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:48:53 2009
#
-CONFIG_ARCH_TEXT_BASE=0x80e80000
-CONFIG_BOARDINFO="Texas Instrument's SDP343x"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_V7=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
CONFIG_ARCH_OMAP=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 is not set
-# CONFIG_MACH_PCM037 is not set
-CONFIG_MACH_OMAP=y
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x80e80000
+CONFIG_BOARDINFO="Texas Instrument's SDP343x"
#
# OMAP Features
@@ -29,20 +40,28 @@ CONFIG_OMAP_CLOCK_ALL=y
CONFIG_OMAP_CLOCK_SOURCE_S32K=y
CONFIG_OMAP3_CLOCK_CONFIG=y
# CONFIG_OMAP3_COPY_CLOCK_SRAM is not set
+CONFIG_GPMC=y
#
# OMAP Platform Features
#
CONFIG_MACH_OMAP343xSDP=y
+# CONFIG_MACH_BEAGLE is not set
+# CONFIG_MACH_OMAP3EVM is not set
# CONFIG_MACH_OMAP_ADVANCED_MUX is not set
+CONFIG_HAS_OMAP_NAND=y
+# CONFIG_MACH_OMAP_GPMC_NAND is not set
+# CONFIG_AEABI is not set
#
# Arm specific settings
#
-# CONFIG_CMDLINE_TAG is not set
-# CONFIG_SETUP_MEMORY_TAGS is not set
+CONFIG_CMD_ARM_CPUINFO=y
+CONFIG_CMDLINE_TAG=y
+CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
# CONFIG_CPU_V7_DCACHE_SKIP is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
# CONFIG_CMD_MEMORY is not set
@@ -50,6 +69,7 @@ CONFIG_HAS_MODULES=y
#
# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
# memory layout
@@ -70,15 +90,16 @@ CONFIG_MACH_DO_LOWLEVEL_INIT=y
CONFIG_ARCH_HAS_LOWLEVEL_INIT=y
CONFIG_PROMPT="X-load 343x> "
CONFIG_BAUDRATE=115200
-# CONFIG_CMDLINE_EDITING is not set
CONFIG_SIMPLE_READLINE=y
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
# CONFIG_SHELL_HUSH is not set
CONFIG_SHELL_SIMPLE=y
+# CONFIG_CMDLINE_EDITING is not set
# CONFIG_ERRNO_MESSAGES is not set
# CONFIG_TIMESTAMP is not set
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
# CONFIG_PARTITION is not set
@@ -106,8 +127,9 @@ CONFIG_DEBUG_INFO=y
# CONFIG_CMD_LOADENV is not set
# CONFIG_CMD_EXPORT is not set
# CONFIG_CMD_PRINTENV is not set
-# CONFIG_CMD_HELP is not set
# CONFIG_CMD_READLINE is not set
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
# file commands
@@ -146,10 +168,15 @@ CONFIG_CMD_LOADB=y
# booting
#
# CONFIG_CMD_BOOTM is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
# CONFIG_CMD_RESET is not set
CONFIG_CMD_GO=y
# CONFIG_CMD_TIMEOUT is not set
# CONFIG_CMD_PARTITION is not set
+CONFIG_CMD_VERSION=y
+# CONFIG_CMD_HELP is not set
+CONFIG_CMD_DEVINFO=y
# CONFIG_NET is not set
#
@@ -159,6 +186,7 @@ CONFIG_CMD_GO=y
#
# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
@@ -166,6 +194,7 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
# flash drivers
@@ -173,6 +202,9 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# CONFIG_DRIVER_CFI is not set
# CONFIG_DRIVER_CFI_OLD is not set
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
# Filesystem support
@@ -181,3 +213,4 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
CONFIG_FS_RAMFS=y
CONFIG_FS_DEVFS=y
CONFIG_CRC16=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig
index 3af799316a..76fbe84c6b 100644
--- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig
+++ b/arch/arm/configs/omap3530_beagle_per_uart_defconfig
@@ -1,24 +1,34 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Tue Jun 24 02:22:41 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:49:08 2009
#
-CONFIG_ARCH_TEXT_BASE=0x80e80000
-CONFIG_BOARDINFO="Texas Instrument's Beagle"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_V7=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
CONFIG_ARCH_OMAP=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 is not set
-# CONFIG_MACH_PCM037 is not set
-CONFIG_MACH_OMAP=y
-# CONFIG_MACH_AT91SAM9260EK is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x80e80000
+CONFIG_BOARDINFO="Texas Instrument's Beagle"
#
# OMAP Features
@@ -30,20 +40,27 @@ CONFIG_OMAP_CLOCK_ALL=y
CONFIG_OMAP_CLOCK_SOURCE_S32K=y
CONFIG_OMAP3_CLOCK_CONFIG=y
# CONFIG_OMAP3_COPY_CLOCK_SRAM is not set
+CONFIG_GPMC=y
#
# OMAP Platform Features
#
# CONFIG_MACH_OMAP343xSDP is not set
CONFIG_MACH_BEAGLE=y
+# CONFIG_MACH_OMAP3EVM is not set
+CONFIG_HAS_OMAP_NAND=y
+# CONFIG_MACH_OMAP_GPMC_NAND is not set
+# CONFIG_AEABI is not set
#
# Arm specific settings
#
-# CONFIG_CMDLINE_TAG is not set
-# CONFIG_SETUP_MEMORY_TAGS is not set
+CONFIG_CMD_ARM_CPUINFO=y
+CONFIG_CMDLINE_TAG=y
+CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
# CONFIG_CPU_V7_DCACHE_SKIP is not set
+# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
@@ -51,6 +68,7 @@ CONFIG_CMD_MEMORY=y
#
# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
# memory layout
@@ -71,15 +89,16 @@ CONFIG_MACH_DO_LOWLEVEL_INIT=y
CONFIG_ARCH_HAS_LOWLEVEL_INIT=y
CONFIG_PROMPT="X-load Beagle>"
CONFIG_BAUDRATE=115200
-# CONFIG_CMDLINE_EDITING is not set
CONFIG_SIMPLE_READLINE=y
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
# CONFIG_SHELL_HUSH is not set
CONFIG_SHELL_SIMPLE=y
+# CONFIG_CMDLINE_EDITING is not set
# CONFIG_ERRNO_MESSAGES is not set
# CONFIG_TIMESTAMP is not set
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
# CONFIG_PARTITION is not set
@@ -107,8 +126,9 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_CMD_LOADENV is not set
# CONFIG_CMD_EXPORT is not set
# CONFIG_CMD_PRINTENV is not set
-# CONFIG_CMD_HELP is not set
# CONFIG_CMD_READLINE is not set
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
# file commands
@@ -142,16 +162,20 @@ CONFIG_CMD_LOADB=y
# flash
#
# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_NAND is not set
#
# booting
#
# CONFIG_CMD_BOOTM is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
# CONFIG_CMD_RESET is not set
CONFIG_CMD_GO=y
# CONFIG_CMD_TIMEOUT is not set
# CONFIG_CMD_PARTITION is not set
+CONFIG_CMD_VERSION=y
+# CONFIG_CMD_HELP is not set
+CONFIG_CMD_DEVINFO=y
# CONFIG_NET is not set
#
@@ -161,6 +185,7 @@ CONFIG_CMD_GO=y
#
# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
@@ -168,6 +193,7 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
# flash drivers
@@ -175,6 +201,9 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# CONFIG_DRIVER_CFI is not set
# CONFIG_DRIVER_CFI_OLD is not set
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
# Filesystem support
@@ -183,3 +212,4 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
CONFIG_FS_RAMFS=y
CONFIG_FS_DEVFS=y
CONFIG_CRC16=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig
index 99d1198f3e..abf60e65b0 100644
--- a/arch/arm/configs/omap3_evm_defconfig
+++ b/arch/arm/configs/omap3_evm_defconfig
@@ -1,15 +1,22 @@
#
# Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc10
-# Mon Dec 14 16:16:09 2009
+# barebox version: 2009.12.0-pre
+# Fri Dec 18 16:39:27 2009
#
+# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
#
# System Type
#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_S3C24xx is not set
+
#
# Processor Type
#
@@ -20,7 +27,6 @@ CONFIG_CPU_32v7=y
#
# processor features
#
-CONFIG_ARCH_TEXT_BASE=0x80e80000
CONFIG_BOARDINFO="Texas Instrument's OMAP3EVM"
#
@@ -38,10 +44,13 @@ CONFIG_GPMC=y
#
# OMAP Platform Features
#
+# CONFIG_MACH_OMAP343xSDP is not set
+# CONFIG_MACH_BEAGLE is not set
CONFIG_MACH_OMAP3EVM=y
CONFIG_OMAP3EVM_UART1=y
# CONFIG_OMAP3EVM_UART3 is not set
CONFIG_HAS_OMAP_NAND=y
+# CONFIG_MACH_OMAP_GPMC_NAND is not set
CONFIG_AEABI=y
#
@@ -52,6 +61,7 @@ CONFIG_CMD_ARM_CPUINFO=y
# CONFIG_SETUP_MEMORY_TAGS is not set
# CONFIG_INITRD_TAG is not set
# CONFIG_CPU_V7_DCACHE_SKIP is not set
+# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
# CONFIG_CMD_MEMORY is not set
@@ -152,6 +162,7 @@ CONFIG_CMD_MEMINFO=y
#
# flash
#
+# CONFIG_CMD_FLASH is not set
#
# booting
@@ -175,6 +186,7 @@ CONFIG_CMD_DEVINFO=y
#
# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
@@ -182,11 +194,17 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
# flash drivers
#
-
+# CONFIG_DRIVER_CFI is not set
+CONFIG_DRIVER_CFI_OLD=y
+# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
# Filesystem support
@@ -195,3 +213,4 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
CONFIG_FS_RAMFS=y
CONFIG_FS_DEVFS=y
CONFIG_CRC16=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig
index 7ae2065d71..f0a9512446 100644
--- a/arch/arm/configs/pca100_defconfig
+++ b/arch/arm/configs/pca100_defconfig
@@ -1,62 +1,85 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc9
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:49:29 2009
#
-CONFIG_ARCH_TEXT_BASE=0xa7f00000
-CONFIG_BOARDINFO="Phytec phyCard-i.MX27"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-# CONFIG_MACH_PCM043 is not set
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
-CONFIG_MACH_PCA100=y
-# CONFIG_MACH_MMCCPU is not set
#
-# Board specific settings
+# System Type
#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0xa7f00000
+CONFIG_BOARDINFO="Phytec phyCard-i.MX27"
CONFIG_ARCH_HAS_FEC_IMX=y
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
CONFIG_ARCH_IMX27=y
+# CONFIG_ARCH_IMX31 is not set
+# CONFIG_ARCH_IMX35 is not set
+# CONFIG_MACH_EUKREA_CPUIMX27 is not set
+# CONFIG_MACH_IMX27ADS is not set
+CONFIG_MACH_PCA100=y
+# CONFIG_MACH_PCM038 is not set
+
+#
+# Board specific settings
+#
#
-# i.MX specific settings
+# i.MX specific settings
#
CONFIG_IMX_CLKO=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
+CONFIG_HAVE_MMU=y
+# CONFIG_MMU is not set
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0xa7f00000
CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y
@@ -90,7 +113,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/phycard-i.MX27/env/"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -98,11 +121,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/phycard-i.MX27/env/"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -115,7 +138,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -129,13 +152,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -144,18 +167,19 @@ CONFIG_CMD_MTEST=y
# CONFIG_CMD_MTEST_ALTERNATIVE is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-CONFIG_CMD_NAND=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -164,39 +188,41 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_FEC_IMX=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
# CONFIG_DRIVER_CFI is not set
CONFIG_DRIVER_CFI_OLD=y
@@ -207,9 +233,11 @@ CONFIG_NAND_IMX_BOOT=y
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig
index b4fb2d9948..e82733f4e0 100644
--- a/arch/arm/configs/pcm037_defconfig
+++ b/arch/arm/configs/pcm037_defconfig
@@ -1,43 +1,80 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Thu Jul 3 09:29:45 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:49:38 2009
#
-CONFIG_ARCH_TEXT_BASE=0x87f00000
-CONFIG_BOARDINFO="Phytec phyCORE-i.MX31"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x87f00000
+CONFIG_BOARDINFO="Phytec phyCORE-i.MX31"
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
+# CONFIG_ARCH_IMX27 is not set
CONFIG_ARCH_IMX31=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 is not set
+# CONFIG_ARCH_IMX35 is not set
CONFIG_MACH_PCM037=y
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
#
-# Arm specific settings
+# Board specific settings
+#
+CONFIG_PCM037_SDRAM_BANK0_128MB=y
+# CONFIG_PCM037_SDRAM_BANK0_256MB is not set
+CONFIG_PCM037_SDRAM_BANK1_NONE=y
+# CONFIG_PCM037_SDRAM_BANK1_128MB is not set
+# CONFIG_PCM037_SDRAM_BANK1_256MB is not set
+
+#
+# i.MX specific settings
+#
+# CONFIG_AEABI is not set
+
+#
+# Arm specific settings
#
+CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x87f00000
@@ -48,10 +85,10 @@ CONFIG_STACK_SIZE=0x8000
CONFIG_MALLOC_SIZE=0x400000
# CONFIG_BROKEN is not set
# CONFIG_EXPERIMENTAL is not set
+CONFIG_MACH_HAS_LOWLEVEL_INIT=y
+CONFIG_MACH_DO_LOWLEVEL_INIT=y
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
@@ -59,9 +96,12 @@ CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
CONFIG_GLOB=y
CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
CONFIG_PARTITION=y
@@ -69,7 +109,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm037/env"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -77,11 +117,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm037/env"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -89,11 +129,12 @@ CONFIG_CMD_SAVEENV=y
CONFIG_CMD_LOADENV=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_HELP=y
CONFIG_CMD_READLINE=y
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -107,13 +148,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -121,67 +162,79 @@ CONFIG_CMD_CRC=y
# CONFIG_CMD_MTEST is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_TEST=y
+CONFIG_CMD_VERSION=y
+CONFIG_CMD_HELP=y
+CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
CONFIG_DRIVER_NET_SMC911X=y
CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=0
+# CONFIG_DRIVER_NET_SMC91111 is not set
#
-# SPI drivers
+# SPI drivers
#
CONFIG_SPI=y
# CONFIG_DRIVER_SPI_IMX is not set
# CONFIG_DRIVER_SPI_MC13783 is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# 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
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
+CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y
CONFIG_CRC32=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/pcm043_defconfig
index c4df354705..5563356077 100644
--- a/arch/arm/configs/pcm043_defconfig
+++ b/arch/arm/configs/pcm043_defconfig
@@ -1,61 +1,84 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc8
-# Fri Apr 17 13:27:24 2009
+# barebox version: 2009.12.0-pre
+# Fri Dec 18 16:42:27 2009
#
-CONFIG_ARCH_TEXT_BASE=0x87f00000
-CONFIG_BOARDINFO="Phytec phyCORE-i.MX35"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-# CONFIG_MACH_MX1ADS is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_IMX21ADS is not set
-# CONFIG_MACH_IMX27ADS is not set
-CONFIG_MACH_PCM043=y
-# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
-# CONFIG_MACH_PM9263 is not set
-# CONFIG_MACH_PCA100 is not set
#
-# Board specific settings
+# System Type
#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x87f00000
+CONFIG_BOARDINFO="Phytec phyCORE-i.MX35"
CONFIG_ARCH_HAS_FEC_IMX=y
+# CONFIG_ARCH_IMX_INTERNAL_BOOT is not set
+
+#
+# Freescale i.MX System-on-Chip
+#
+# CONFIG_ARCH_IMX1 is not set
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
+# CONFIG_ARCH_IMX27 is not set
+# CONFIG_ARCH_IMX31 is not set
CONFIG_ARCH_IMX35=y
+# CONFIG_MACH_FREESCALE_MX35_3STACK is not set
+CONFIG_MACH_PCM043=y
+
+#
+# Board specific settings
+#
+CONFIG_PCM043_DISPLAY_SHARP=y
+# CONFIG_PCM043_DISPLAY_TY090 is not set
#
-# i.MX specific settings
+# i.MX specific settings
#
# CONFIG_IMX_CLKO is not set
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
+CONFIG_HAVE_MMU=y
+# CONFIG_MMU is not set
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x87F00000
CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y
@@ -89,7 +112,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm043/env/"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -97,11 +120,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm043/env/"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -114,7 +137,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -128,13 +151,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -142,17 +165,19 @@ CONFIG_CMD_CRC=y
# CONFIG_CMD_MTEST is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -161,50 +186,59 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_FEC_IMX=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# 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
+CONFIG_NAND=y
+CONFIG_NAND_IMX=y
+CONFIG_NAND_IMX_BOOT=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig
index 18543453c6..cde5cbe66e 100644
--- a/arch/arm/configs/pm9263_defconfig
+++ b/arch/arm/configs/pm9263_defconfig
@@ -1,45 +1,67 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Tue Aug 26 09:41:29 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:50:15 2009
#
-CONFIG_ARCH_TEXT_BASE=0x23f00000
-CONFIG_BOARDINFO="Ronetix PM9263"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM926T=y
+
+#
+# System Type
+#
CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x23f00000
+CONFIG_BOARDINFO="Ronetix PM9263"
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91SAM9260 is not set
CONFIG_ARCH_AT91SAM9263=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 is not set
-# CONFIG_MACH_PCM037 is not set
-# CONFIG_MACH_OMAP is not set
-# CONFIG_MACH_AT91SAM9260EK is not set
+# CONFIG_MACH_AT91SAM9263EK is not set
+# CONFIG_MACH_MMCCPU is not set
CONFIG_MACH_PM9263=y
+# CONFIG_AEABI is not set
#
-# Arm specific settings
+# Arm specific settings
#
+CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
CONFIG_CMD_MEMORY=y
CONFIG_ENV_HANDLING=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
-# memory layout
+# memory layout
#
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x23f00000
@@ -74,7 +96,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pm9263/env/"
#
-# Debugging
+# Debugging
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_ENABLE_FLASH_NOISE is not set
@@ -82,11 +104,11 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pm9263/env/"
# CONFIG_ENABLE_DEVICE_NOISE is not set
#
-# Commands
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
@@ -99,7 +121,7 @@ CONFIG_CMD_TRUE=y
CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -113,13 +135,13 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
@@ -128,18 +150,19 @@ CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -148,39 +171,41 @@ CONFIG_CMD_TEST=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_DRIVER_SERIAL_ATMEL=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_MACB=y
#
-# SPI drivers
+# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
-# flash drivers
+# flash drivers
#
CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_NEW=y
@@ -196,9 +221,12 @@ CONFIG_NAND_ATMEL=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
CONFIG_FS_RAMFS=y
diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig
index d3d723f554..6638234be3 100644
--- a/arch/arm/configs/scb9328_defconfig
+++ b/arch/arm/configs/scb9328_defconfig
@@ -1,79 +1,139 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-git
-# Fri Oct 19 11:00:09 2007
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:50:25 2009
#
-CONFIG_ARCH_TEXT_BASE=0x08f80000
-CONFIG_BOARDINFO="Synertronixx scb9328"
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
CONFIG_ARM=y
-CONFIG_CPU_ARM920T=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S3C24xx is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+
+#
+# processor features
+#
+CONFIG_ARCH_TEXT_BASE=0x08f80000
+CONFIG_BOARDINFO="Synertronixx scb9328"
+
+#
+# Freescale i.MX System-on-Chip
+#
CONFIG_ARCH_IMX1=y
+# CONFIG_ARCH_IMX21 is not set
+# CONFIG_ARCH_IMX25 is not set
+# CONFIG_ARCH_IMX27 is not set
+# CONFIG_ARCH_IMX31 is not set
+# CONFIG_ARCH_IMX35 is not set
# CONFIG_MACH_MX1ADS is not set
CONFIG_MACH_SCB9328=y
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_ECO920 is not set
-# CONFIG_MACH_NXDB500 is not set
-# CONFIG_MACH_PCM037 is not set
+
+#
+# Board specific settings
+#
+
+#
+# i.MX specific settings
+#
+# CONFIG_AEABI is not set
#
# Arm specific settings
#
+CONFIG_CMD_ARM_CPUINFO=y
CONFIG_CMDLINE_TAG=y
CONFIG_SETUP_MEMORY_TAGS=y
# CONFIG_INITRD_TAG is not set
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_GREGORIAN_CALENDER=y
CONFIG_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
+CONFIG_CMD_MEMORY=y
+CONFIG_GENERIC_GPIO=y
#
-# General Settings
+# General Settings
+#
+CONFIG_LOCALVERSION_AUTO=y
+
#
+# memory layout
+#
+CONFIG_HAVE_MMU=y
+# CONFIG_MMU is not set
+CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0x08f80000
+CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y
+CONFIG_MEMORY_LAYOUT_DEFAULT=y
+# CONFIG_MEMORY_LAYOUT_FIXED is not set
+CONFIG_STACK_SIZE=0x8000
+CONFIG_MALLOC_SIZE=0x400000
# CONFIG_BROKEN is not set
# CONFIG_EXPERIMENTAL is not set
+CONFIG_MACH_HAS_LOWLEVEL_INIT=y
+CONFIG_MACH_DO_LOWLEVEL_INIT=y
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
-CONFIG_CMDLINE_EDITING=y
-# CONFIG_AUTO_COMPLETE is not set
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_CMDLINE_EDITING=y
+# CONFIG_AUTO_COMPLETE is not set
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
+# CONFIG_PARTITION is not set
CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="board/scb9328/env"
#
-# Debugging
+# 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
+# Commands
#
#
-# scripting
+# scripting
#
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ENVIRONMENT=y
-CONFIG_CMD_HELP=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_READLINE is not set
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
-# file commands
+# file commands
#
CONFIG_CMD_LS=y
CONFIG_CMD_RM=y
@@ -87,73 +147,95 @@ CONFIG_CMD_MOUNT=y
CONFIG_CMD_UMOUNT=y
#
-# console
+# console
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
#
-# memory
+# memory
#
+# CONFIG_CMD_LOADB is not set
CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MEMORY=y
# CONFIG_CMD_CRC is not set
# CONFIG_CMD_MTEST is not set
#
-# flash
+# flash
#
CONFIG_CMD_FLASH=y
#
-# booting
+# booting
#
CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_ZLIB is not set
# CONFIG_CMD_BOOTM_BZLIB is not set
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTU=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_TEST=y
+CONFIG_CMD_VERSION=y
+CONFIG_CMD_HELP=y
+CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_GPIO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
#
-# Drivers
+# Drivers
#
#
-# serial drivers
+# serial drivers
#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
CONFIG_DRIVER_SERIAL_IMX=y
+# CONFIG_DRIVER_SERIAL_NS16550 is not set
CONFIG_HAS_DM9000=y
CONFIG_MIIPHY=y
#
-# Network drivers
+# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_DM9000=y
#
-# flash drivers
+# SPI drivers
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_IMX is not set
+# CONFIG_DRIVER_SPI_MC13783 is not set
+# CONFIG_I2C 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
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
-# Filesystem support
+# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
+CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y
CONFIG_CRC32=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/arm/mach-imx/include/mach/imx-ipu-fb.h b/arch/arm/mach-imx/include/mach/imx-ipu-fb.h
index c0cc883959..53c6d2652b 100644
--- a/arch/arm/mach-imx/include/mach/imx-ipu-fb.h
+++ b/arch/arm/mach-imx/include/mach/imx-ipu-fb.h
@@ -25,7 +25,7 @@
* struct mx3fb_platform_data - mx3fb platform data
*/
struct imx_ipu_fb_platform_data {
- struct fb_videomode *mode;
+ const struct fb_videomode *mode;
unsigned char bpp;
void __iomem *framebuffer;
};
diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig
index 16bf2c2852..fd4ff66456 100644
--- a/arch/blackfin/configs/ipe337_defconfig
+++ b/arch/blackfin/configs/ipe337_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Thu Jul 3 10:25:25 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:53:16 2009
#
CONFIG_BLACKFIN=y
CONFIG_BF561=y
@@ -22,6 +22,7 @@ CONFIG_ENV_HANDLING=y
#
# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
# memory layout
@@ -37,8 +38,6 @@ CONFIG_MALLOC_SIZE=0x400000
# CONFIG_EXPERIMENTAL is not set
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
-CONFIG_CMDLINE_EDITING=y
-# CONFIG_AUTO_COMPLETE is not set
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
@@ -46,9 +45,12 @@ CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_GLOB is not set
CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_CMDLINE_EDITING=y
+# CONFIG_AUTO_COMPLETE is not set
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
CONFIG_PARTITION=y
@@ -76,8 +78,9 @@ CONFIG_CMD_SAVEENV=y
CONFIG_CMD_LOADENV=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_HELP=y
CONFIG_CMD_READLINE=y
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
# file commands
@@ -111,7 +114,6 @@ CONFIG_CMD_CRC=y
# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
# booting
@@ -125,11 +127,12 @@ CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_TEST=y
+CONFIG_CMD_VERSION=y
+CONFIG_CMD_HELP=y
+CONFIG_CMD_DEVINFO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
@@ -150,12 +153,14 @@ CONFIG_MIIPHY=y
#
CONFIG_DRIVER_NET_SMC911X=y
CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=1
+# CONFIG_DRIVER_NET_SMC91111 is not set
#
# SPI drivers
#
CONFIG_SPI=y
# CONFIG_DRIVER_SPI_MC13783 is not set
+# CONFIG_I2C is not set
#
# flash drivers
@@ -165,10 +170,16 @@ CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_OLD=y
CONFIG_CFI_BUFFER_WRITE=y
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
# Filesystem support
#
# CONFIG_FS_CRAMFS is not set
+CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y
CONFIG_ZLIB=y
CONFIG_CRC32=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig
index a03e7aaf61..efdfb52f72 100644
--- a/arch/ppc/configs/pcm030_defconfig
+++ b/arch/ppc/configs/pcm030_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc5-git
-# Thu Jul 3 09:49:23 2008
+# barebox version: 2.0.0-rc10
+# Fri Dec 18 11:53:12 2009
#
CONFIG_BOARDINFO="Phytec Phycore mpc5200b tiny"
CONFIG_ARCH_TEXT_BASE=0x01000000
@@ -28,6 +28,7 @@ CONFIG_CMD_MEMORY=y
#
# General Settings
#
+CONFIG_LOCALVERSION_AUTO=y
#
# memory layout
@@ -44,8 +45,6 @@ CONFIG_MALLOC_SIZE=0x400000
# CONFIG_RELOCATABLE is not set
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
CONFIG_LONGHELP=y
CONFIG_CBSIZE=1024
CONFIG_MAXARGS=16
@@ -53,9 +52,12 @@ CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
CONFIG_GLOB=y
CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
+CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
CONFIG_EARLY_CONSOLE_BAUDRATE=115200
CONFIG_OF_FLAT_TREE=y
@@ -83,8 +85,9 @@ CONFIG_CMD_SLEEP=y
# 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
+CONFIG_CMD_TRUE=y
+CONFIG_CMD_FALSE=y
#
# file commands
@@ -118,7 +121,6 @@ CONFIG_CMD_MEMINFO=y
# flash
#
CONFIG_CMD_FLASH=y
-# CONFIG_CMD_NAND is not set
#
# booting
@@ -133,11 +135,12 @@ CONFIG_CMD_GO=y
# CONFIG_CMD_PARTITION is not set
CONFIG_CMD_TEST=y
# CONFIG_CMD_REGINFO is not set
+CONFIG_CMD_VERSION=y
+CONFIG_CMD_HELP=y
+CONFIG_CMD_DEVINFO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
@@ -157,6 +160,7 @@ CONFIG_MIIPHY=y
# Network drivers
#
# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_MPC5200=y
#
@@ -164,6 +168,7 @@ CONFIG_DRIVER_NET_MPC5200=y
#
CONFIG_SPI=y
# CONFIG_DRIVER_SPI_MC13783 is not set
+# CONFIG_I2C is not set
#
# flash drivers
@@ -174,11 +179,17 @@ CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_OLD=y
# CONFIG_CFI_BUFFER_WRITE is not set
# CONFIG_NAND is not set
+# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_VIDEO is not set
#
# Filesystem support
#
CONFIG_FS_CRAMFS=y
+CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y
CONFIG_ZLIB=y
CONFIG_BZLIB=y
CONFIG_CRC32=y
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig
index 8757fd016d..adcb07e49b 100644
--- a/arch/sandbox/configs/sandbox_defconfig
+++ b/arch/sandbox/configs/sandbox_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# barebox version: 2.0.0-rc10
-# Mon Oct 12 14:15:55 2009
+# Fri Dec 18 11:53:08 2009
#
CONFIG_ARCH_TEXT_BASE=0x00000000
CONFIG_BOARDINFO="sandbox"
@@ -114,10 +114,8 @@ CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
CONFIG_NET=y
-CONFIG_NET_BOOTP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
@@ -143,6 +141,7 @@ CONFIG_DRIVER_NET_TAP=y
# SPI drivers
#
# CONFIG_SPI is not set
+# CONFIG_I2C is not set
#
# flash drivers
@@ -152,10 +151,6 @@ CONFIG_DRIVER_NET_TAP=y
# CONFIG_NAND is not set
# CONFIG_USB is not set
# CONFIG_USB_GADGET is not set
-
-#
-# Video drivers
-#
# CONFIG_VIDEO is not set
#
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c
index 3a528fa365..5590e55901 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/board/freescale-mx25-3-stack/3stack.c
@@ -34,7 +34,7 @@
#include <mach/imx-nand.h>
#include <fec.h>
#include <nand.h>
-#include <mach/imx25-flash-header.h>
+#include <mach/imx-flash-header.h>
#include <mach/iomux-mx25.h>
extern unsigned long _stext;
@@ -44,43 +44,41 @@ void __naked __flash_header_start go(void)
__asm__ __volatile__("b _start\n");
}
-struct mx25_dcd_entry __dcd_entry dcd_entry[] = {
+struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = {
{ .ptr_type = 4, .addr = 0xb8002050, .val = 0x0000d843, },
{ .ptr_type = 4, .addr = 0xb8002054, .val = 0x22252521, },
{ .ptr_type = 4, .addr = 0xb8002058, .val = 0x22220a00, },
{ .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, },
{ .ptr_type = 4, .addr = 0xb8001000, .val = 0x92100000, },
- { .ptr_type = 1, .addr = 0x80000400, .val = 0x12344321, },
+ { .ptr_type = 1, .addr = 0x80000400, .val = 0x21, },
{ .ptr_type = 4, .addr = 0xb8001000, .val = 0xa2100000, },
{ .ptr_type = 4, .addr = 0x80000000, .val = 0x12344321, },
{ .ptr_type = 4, .addr = 0x80000000, .val = 0x12344321, },
{ .ptr_type = 4, .addr = 0xb8001000, .val = 0xb2100000, },
- { .ptr_type = 1, .addr = 0x80000033, .val = 0x000000da, },
- { .ptr_type = 1, .addr = 0x81000000, .val = 0x000000ff, },
+ { .ptr_type = 1, .addr = 0x80000033, .val = 0xda, },
+ { .ptr_type = 1, .addr = 0x81000000, .val = 0xff, },
{ .ptr_type = 4, .addr = 0xb8001000, .val = 0x82216880, },
{ .ptr_type = 4, .addr = 0xb8001004, .val = 0x00295729, },
{ .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, },
};
-struct mx25_nand_flash_header __flash_header mx25_3ds_header = {
- .flash_header = {
- .app_code_jump_vector = &_stext,
- .app_code_barker = APP_CODE_BARKER,
- .app_code_csf = NULL,
- .dcd_ptr_ptr = &mx25_3ds_header.flash_header.dcd,
- .super_root_key = NULL,
- .dcd = &mx25_3ds_header.dcd_header,
- .app_dest = (void *)TEXT_BASE,
- },
- .dcd_header = {
- .barker = DCD_BARKER,
- .block_len = sizeof (dcd_entry),
- },
+#define APP_DEST 0x80000000
+
+struct imx_flash_header __flash_header_0x400 mx25_3ds_header = {
+ .app_code_jump_vector = APP_DEST + 0x1000,
+ .app_code_barker = APP_CODE_BARKER,
+ .app_code_csf = 0,
+ .dcd_ptr_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd),
+ .super_root_key = 0,
+ .dcd = APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd_barker),
+ .app_dest = APP_DEST,
+ .dcd_barker = DCD_BARKER,
+ .dcd_block_len = sizeof (dcd_entry),
};
extern unsigned long __bss_start;
-unsigned long __image_len barebox_len = 0x40000;
+unsigned long __image_len_0x400 barebox_len = 0x40000;
static struct fec_platform_data fec_info = {
.xcv_type = RMII,
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index c9416fec15..269e7743fc 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -3,6 +3,7 @@
#include <driver.h>
#include <asm/cpu/cdefBF561.h>
#include <partition.h>
+#include <fs.h>
static struct device_d cfi_dev = {
.name = "cfi_flash",
diff --git a/board/netx/netx.c b/board/netx/netx.c
index 5276d59753..f187820ecd 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -71,7 +71,7 @@ static int netx_devices_init(void) {
register_device(&cfi_dev);
register_device(&sdram_dev);
register_device(&netx_eth_dev0);
-// register_device(&netx_eth_dev1);
+ register_device(&netx_eth_dev1);
devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0");
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index 8a15da47f7..aee40c6c2b 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -25,6 +25,7 @@
#include <common.h>
#include <init.h>
#include <driver.h>
+#include <fs.h>
#include <environment.h>
#include <usb/isp1504.h>
#include <mach/imx-regs.h>
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index d93ef80c95..0e7f6d3bf3 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -113,7 +113,7 @@ static const struct fb_videomode pcm043_fb_mode = {
.flag = 0,
};
#else
-static struct fb_videomode pcm043_fb_mode = {
+static const struct fb_videomode pcm043_fb_mode = {
/* 240x320 @ 60 Hz */
.name = "TX090",
.refresh = 60,
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 6b86352e6a..356c4b8bcd 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -67,9 +67,7 @@ static struct device_d dm9000_dev = {
static int scb9328_devices_init(void) {
- /* adjust chipselects */
- GPR(0) = 0x00800000;
- GIUS(0) = 0x0043fffe;
+ imx_gpio_mode(PA23_PF_CS5);
/* CS3 becomes CS3 by clearing reset default bit 1 in FMCR */
FMCR = 0x1;
diff --git a/commands/edit.c b/commands/edit.c
index 6503edfc88..d292a5231b 100644
--- a/commands/edit.c
+++ b/commands/edit.c
@@ -394,7 +394,7 @@ static int do_edit(cmd_tbl_t * cmdtp, int argc, char *argv[])
int lastscrcol;
int i;
int linepos;
- char c;
+ int c;
if (argc != 2)
return COMMAND_ERROR_USAGE;
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index 5fe288f023..5811e276e3 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -32,7 +32,7 @@
#define DVR_VER "2.0"
-#define nfc_is_v21() (cpu_is_mx25() || cpu_is_mx35())
+#define nfc_is_v21() (cpu_is_mx25() || cpu_is_mx35() || cpu_is_mx21())
#define nfc_is_v1() (cpu_is_mx31() || cpu_is_mx27())
/*
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h
index 991dd5b9f4..3e9d2b4e92 100644
--- a/include/i2c/i2c.h
+++ b/include/i2c/i2c.h
@@ -110,7 +110,15 @@ struct i2c_board_info {
#define I2C_BOARD_INFO(dev_type, dev_addr) \
.type = dev_type, .addr = (dev_addr)
+#ifdef CONFIG_I2C
extern int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned n);
+#else
+static inline int i2c_register_board_info(int busnum,
+ struct i2c_board_info const *info, unsigned n)
+{
+ return 0;
+}
+#endif
extern int i2c_add_numbered_adapter(struct i2c_adapter *adapter);
extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num);
diff --git a/include/readkey.h b/include/readkey.h
index d27f0b4e97..919af6421b 100644
--- a/include/readkey.h
+++ b/include/readkey.h
@@ -3,26 +3,26 @@
#define CTL_CH(c) ((c) - 'a' + 1)
-// Misc. non-Ascii keys
-#define KEY_UP CTL_CH('p') // cursor key Up
-#define KEY_DOWN CTL_CH('n') // cursor key Down
-#define KEY_RIGHT CTL_CH('f') // Cursor Key Right
-#define KEY_LEFT CTL_CH('b') // cursor key Left
-#define KEY_HOME CTL_CH('a') // Cursor Key Home
+/* Misc. non-Ascii keys */
+#define KEY_UP CTL_CH('p') /* cursor key Up */
+#define KEY_DOWN CTL_CH('n') /* cursor key Down */
+#define KEY_RIGHT CTL_CH('f') /* Cursor Key Right */
+#define KEY_LEFT CTL_CH('b') /* cursor key Left */
+#define KEY_HOME CTL_CH('a') /* Cursor Key Home */
#define KEY_ERASE_TO_EOL CTL_CH('k')
#define KEY_REFRESH_TO_EOL CTL_CH('e')
#define KEY_ERASE_LINE CTL_CH('x')
#define KEY_INSERT CTL_CH('o')
#define KEY_CLEAR_SCREEN CTL_CH('l')
-#define KEY_DEL7 (char)127
-#define KEY_END (char)133 // Cursor Key End
-#define KEY_PAGEUP (char)135 // Cursor Key Page Up
-#define KEY_PAGEDOWN (char)136 // Cursor Key Page Down
-#define KEY_DEL (char)137 // Cursor Key Del
+#define KEY_DEL7 127
+#define KEY_END 133 /* Cursor Key End */
+#define KEY_PAGEUP 135 /* Cursor Key Page Up */
+#define KEY_PAGEDOWN 136 /* Cursor Key Page Down */
+#define KEY_DEL 137 /* Cursor Key Del */
#define ANSI_CLEAR_SCREEN "\e[2J\e[;H"
-char read_key(void);
+int read_key(void);
#endif /* READKEY_H */
diff --git a/lib/readkey.c b/lib/readkey.c
index 5937fd0b2d..a42d1cb8ff 100644
--- a/lib/readkey.c
+++ b/lib/readkey.c
@@ -52,7 +52,7 @@ static const struct esc_cmds esccmds[] = {
{"[6~", KEY_PAGEDOWN},// Cursor Key Page Down
};
-char read_key(void)
+int read_key(void)
{
char c;
char esc[5];
@@ -70,7 +70,7 @@ char read_key(void)
}
}
esc[i] = 0;
- for (i = 0; i < 18; i++){
+ for (i = 0; i < ARRAY_SIZE(esccmds); i++){
if (!strcmp(esc, esccmds[i].seq))
return esccmds[i].val;
}
diff --git a/lib/readline.c b/lib/readline.c
index 750da3b59c..b82150e355 100644
--- a/lib/readline.c
+++ b/lib/readline.c
@@ -17,8 +17,8 @@
#define MAX_CMDBUF_SIZE 256
#define CTL_BACKSPACE ('\b')
-#define DEL ((char)255)
-#define DEL7 ((char)127)
+#define DEL 255
+#define DEL7 127
#define CREAD_HIST_CHAR ('!')
#define getcmd_putch(ch) putchar(ch)
@@ -178,7 +178,7 @@ int readline(const char *prompt, char *buf, int len)
unsigned long eol_num = 0;
unsigned long rlen;
unsigned long wlen;
- unsigned char ichar;
+ int ichar;
int insert = 1;
int rc = 0;
#ifdef CONFIG_AUTO_COMPLETE
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b04694f25f..6008305338 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -206,7 +206,9 @@ static char *number(char *buf, char *end, unsigned long long num, int base, int
return buf;
}
+#ifndef PAGE_SIZE
#define PAGE_SIZE 4096
+#endif
static char *string(char *buf, char *end, char *s, int field_width, int precision, int flags)
{