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-ep93xx | |
| 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-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/Kconfig | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index 90859d501d..91f6c8ec47 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig @@ -45,9 +45,6 @@ endchoice if MACH_EDB9301 -config BOARDINFO - default "Cirrus Logic EDB9301" - config ARCH_TEXT_BASE hex default 0x05700000 @@ -115,9 +112,6 @@ endchoice if MACH_EDB9302 -config BOARDINFO - default "Cirrus Logic EDB9302" - config ARCH_TEXT_BASE hex default 0x05700000 @@ -162,9 +156,6 @@ endif if MACH_EDB9302A -config BOARDINFO - default "Cirrus Logic EDB9302A" - config ARCH_TEXT_BASE hex default 0xc5700000 @@ -232,9 +223,6 @@ endchoice if MACH_EDB9307 -config BOARDINFO - default "Cirrus Logic EDB9307" - config ARCH_TEXT_BASE hex default 0x01f00000 @@ -263,9 +251,6 @@ endif if MACH_EDB9307A -config BOARDINFO - default "Cirrus Logic EDB9307A" - config ARCH_TEXT_BASE hex default 0xc1f00000 @@ -311,9 +296,6 @@ endchoice if MACH_EDB9312 -config BOARDINFO - default "Cirrus Logic EDB9312" - config ARCH_TEXT_BASE hex default 0x01f00000 @@ -365,9 +347,6 @@ endchoice if MACH_EDB9315 -config BOARDINFO - default "Cirrus Logic EDB9315" - config ARCH_TEXT_BASE hex default 0x01f00000 @@ -396,9 +375,6 @@ endif if MACH_EDB9315A -config BOARDINFO - default "Cirrus Logic EDB9315A" - config ARCH_TEXT_BASE hex default 0xc1f00000 |