diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:14 +0200 |
commit | 649f558483f9959c0ac4123da8c7b647d9808be5 (patch) | |
tree | dc899119f1ca43afc580de0e6a944030e80ecff8 /arch/arm/configs/usb_a9260_defconfig | |
parent | 3a997060d523ea73aa9182a503f5707b27d600f6 (diff) | |
parent | 5be55211463dc72b2872b14d09190c103e63c145 (diff) | |
download | barebox-649f558483f9959c0ac4123da8c7b647d9808be5.tar.gz barebox-649f558483f9959c0ac4123da8c7b647d9808be5.tar.xz |
Merge branch 'for-next/defconfig'
Diffstat (limited to 'arch/arm/configs/usb_a9260_defconfig')
-rw-r--r-- | arch/arm/configs/usb_a9260_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/usb_a9260_defconfig b/arch/arm/configs/usb_a9260_defconfig index 85e7878207..a9574c497e 100644 --- a/arch/arm/configs/usb_a9260_defconfig +++ b/arch/arm/configs/usb_a9260_defconfig @@ -6,6 +6,7 @@ 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 |