summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-08-03 09:28:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-08-03 09:28:35 +0200
commit4dd31547447cb8ef186208a217615d18d8bdbc2e (patch)
treec19253e39bf9bb25e7eb6496eb927c3dc1f9078f
parent6c1c56744af22c30a622a8d97729c88e5e41c93d (diff)
downloadbarebox-4dd31547447cb8ef186208a217615d18d8bdbc2e.tar.gz
barebox-4dd31547447cb8ef186208a217615d18d8bdbc2e.tar.xz
pca100: update defconfig
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/configs/pca100_defconfig30
1 files changed, 20 insertions, 10 deletions
diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig
index 52a5d93bb5..68f37d0473 100644
--- a/arch/arm/configs/pca100_defconfig
+++ b/arch/arm/configs/pca100_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# barebox version: 2.0.0-rc10
-# Fri Dec 18 11:49:29 2009
+# barebox version: 2010.07.0
+# Tue Aug 3 08:28:20 2010
#
# CONFIG_BOARD_LINKER_SCRIPT is not set
CONFIG_GENERIC_LINKER_SCRIPT=y
@@ -12,6 +12,7 @@ CONFIG_ARM=y
#
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_EP93XX is not set
CONFIG_ARCH_IMX=y
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_OMAP is not set
@@ -53,15 +54,12 @@ CONFIG_MACH_PCA100=y
# i.MX specific settings
#
CONFIG_IMX_CLKO=y
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
#
# 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
@@ -79,7 +77,7 @@ CONFIG_LOCALVERSION_AUTO=y
# memory layout
#
CONFIG_HAVE_MMU=y
-# CONFIG_MMU is not set
+CONFIG_MMU=y
CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
CONFIG_TEXT_BASE=0xa7f00000
CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y
@@ -100,6 +98,7 @@ CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
CONFIG_GLOB=y
CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_DYNAMIC_CRC_TABLE=y
@@ -156,6 +155,7 @@ CONFIG_CMD_UMOUNT=y
#
CONFIG_CMD_CLEAR=y
CONFIG_CMD_ECHO=y
+CONFIG_CMD_ECHO_E=y
#
# memory
@@ -180,6 +180,7 @@ CONFIG_CMD_BOOTM=y
# CONFIG_CMD_BOOTM_SHOW_TYPE is not set
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_BOOTU=y
+# CONFIG_CMD_LINUX16 is not set
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
@@ -189,12 +190,15 @@ CONFIG_CMD_VERSION=y
CONFIG_CMD_HELP=y
CONFIG_CMD_DEVINFO=y
CONFIG_CMD_GPIO=y
+# CONFIG_CMD_UNLZO is not set
CONFIG_NET=y
CONFIG_NET_DHCP=y
-# CONFIG_NET_RARP is not set
# CONFIG_NET_NFS is not set
CONFIG_NET_PING=y
CONFIG_NET_TFTP=y
+CONFIG_NET_TFTP_PUSH=y
+CONFIG_NET_NETCONSOLE=y
+# CONFIG_NET_RESOLV is not set
#
# Drivers
@@ -214,6 +218,8 @@ CONFIG_MIIPHY=y
# CONFIG_DRIVER_NET_SMC911X is not set
# CONFIG_DRIVER_NET_SMC91111 is not set
CONFIG_DRIVER_NET_FEC_IMX=y
+CONFIG_NET_USB=y
+CONFIG_NET_USB_ASIX=y
#
# SPI drivers
@@ -225,14 +231,17 @@ CONFIG_DRIVER_NET_FEC_IMX=y
# flash drivers
#
# CONFIG_DRIVER_CFI is not set
-CONFIG_DRIVER_CFI_OLD=y
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_ATA is not set
+CONFIG_USB=y
+CONFIG_USB_EHCI=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ISP1504=y
# CONFIG_USB_GADGET is not set
# CONFIG_VIDEO is not set
@@ -244,3 +253,4 @@ CONFIG_FS_RAMFS=y
CONFIG_FS_DEVFS=y
CONFIG_CRC32=y
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+CONFIG_PROCESS_ESCAPE_SEQUENCE=y