diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
| commit | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (patch) | |
| tree | 0eab8d4a22e0bc795f15c3062500a420d801ef4c /arch/arm/mach-samsung | |
| parent | 8f9d4007c53cefc513619b83b5b81b146423b11b (diff) | |
| parent | 338b6e7edc054523e2cc0dec77ab3aa1716a385f (diff) | |
| download | barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.gz barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.xz | |
Merge branch 'for-next/boardinfo'
Conflicts:
arch/mips/boards/qemu-malta/init.c
commands/bootm.c
drivers/of/base.c
Diffstat (limited to 'arch/arm/mach-samsung')
| -rw-r--r-- | arch/arm/mach-samsung/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-samsung/Kconfig b/arch/arm/mach-samsung/Kconfig index a4dc3010e7..562b39227a 100644 --- a/arch/arm/mach-samsung/Kconfig +++ b/arch/arm/mach-samsung/Kconfig @@ -12,14 +12,6 @@ config ARCH_TEXT_BASE default 0x31fc0000 if MACH_A9M2410 default 0x23e00000 if MACH_TINY210 -config BOARDINFO - default "Mini 2440" if MACH_MINI2440 - default "Mini 6410" if MACH_MINI6410 - default "Tiny 6410" if MACH_TINY6410 - default "Digi A9M2440" if MACH_A9M2440 - default "Digi A9M2410" if MACH_A9M2410 - default "Tiny 210" if MACH_TINY210 - config ARCH_BAREBOX_MAX_BARE_INIT_SIZE hex default 0x1ff0 if ARCH_S5PCxx |