summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/usb_a9g20_128mib_defconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:14 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:14 +0200
commit649f558483f9959c0ac4123da8c7b647d9808be5 (patch)
treedc899119f1ca43afc580de0e6a944030e80ecff8 /arch/arm/configs/usb_a9g20_128mib_defconfig
parent3a997060d523ea73aa9182a503f5707b27d600f6 (diff)
parent5be55211463dc72b2872b14d09190c103e63c145 (diff)
downloadbarebox-649f558483f9959c0ac4123da8c7b647d9808be5.tar.gz
barebox-649f558483f9959c0ac4123da8c7b647d9808be5.tar.xz
Merge branch 'for-next/defconfig'
Diffstat (limited to 'arch/arm/configs/usb_a9g20_128mib_defconfig')
-rw-r--r--arch/arm/configs/usb_a9g20_128mib_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/usb_a9g20_128mib_defconfig b/arch/arm/configs/usb_a9g20_128mib_defconfig
index c25d7dec57..6b02342f9f 100644
--- a/arch/arm/configs/usb_a9g20_128mib_defconfig
+++ b/arch/arm/configs/usb_a9g20_128mib_defconfig
@@ -1,12 +1,13 @@
CONFIG_ARCH_AT91SAM9G20=y
CONFIG_MACH_USB_A9G20=y
+CONFIG_AT91_HAVE_SRAM_128M=y
CONFIG_AEABI=y
# CONFIG_CMD_ARM_CPUINFO is not set
-CONFIG_AT91_HAVE_SRAM_128M=y
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_MMU=y
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
CONFIG_EXPERIMENTAL=y
+CONFIG_MALLOC_TLSF=y
CONFIG_PROMPT="USB-9G20:"
CONFIG_LONGHELP=y
CONFIG_GLOB=y