diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-03 09:31:38 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-03 09:31:38 +0200 |
commit | 139ec08127825f2fdc4d0386d26f1fad9f745c2c (patch) | |
tree | 65e0aa4d72f548dd1e8771fc80e918dcbc5365ec /arch/arm/mach-omap/Kconfig | |
parent | 68d0d31d41d9034a6246991ee1d486dc805ff479 (diff) | |
parent | 6f354bc067482fbe78e9148c3a1501188b18f22d (diff) | |
download | barebox-139ec08127825f2fdc4d0386d26f1fad9f745c2c.tar.gz barebox-139ec08127825f2fdc4d0386d26f1fad9f745c2c.tar.xz |
Merge branch 'next'
Diffstat (limited to 'arch/arm/mach-omap/Kconfig')
-rw-r--r-- | arch/arm/mach-omap/Kconfig | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index 99b9f9d973..158639ec59 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -39,20 +39,6 @@ config ARCH_OMAP3 endchoice -config OMAP_CONFIG_STACKSIZE - prompt "STACKSIZE" - hex - default 0x00020000 - help - Select the Stack Size when defaults are used - -config OMAP_MALLOC_LEN - prompt "MALLOC LENGTH" - hex - default 0x00001000 - help - Select the Malloc Length when defaults are used - ### Generic Clock configurations to be enabled by Mach - invisible to enable. config OMAP_CLOCK_UART bool @@ -97,6 +83,6 @@ config GPMC NAND, OneNAND etc. # Get the board specific configurations -source board/omap/Kconfig +source arch/arm/boards/omap/Kconfig endmenu |