summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-19 19:42:56 +0900
committerTom Rini <trini@konsulko.com>2015-03-28 09:03:09 -0400
commitddf6bd4876a1838bdf3202b34f5a36f165c279b1 (patch)
treef21be52675252fd4e942130a3336556b9b970a6a /configs
parent326a682358c16afcf2c7a9617e9811e72a1f0929 (diff)
downloadtalos-obmc-uboot-ddf6bd4876a1838bdf3202b34f5a36f165c279b1.tar.gz
talos-obmc-uboot-ddf6bd4876a1838bdf3202b34f5a36f165c279b1.zip
ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
BCM2835 (used on Raspberry Pi) and BCM2836 (used on Raspberry Pi 2) are similar enough. One of the biggest differences is the ARM processor. It is reasonable to collect the source files into a single place, arch/arm/mach-bcm283x/. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'configs')
-rw-r--r--configs/rpi_2_defconfig1
-rw-r--r--configs/rpi_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 3075321551..965fcaeaa7 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI_2=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 9379cf00d4..8de1d9f74e 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI=y
OpenPOWER on IntegriCloud