diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-19 19:42:56 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-28 09:03:09 -0400 |
| commit | ddf6bd4876a1838bdf3202b34f5a36f165c279b1 (patch) | |
| tree | f21be52675252fd4e942130a3336556b9b970a6a /arch/arm/cpu/armv7/Makefile | |
| parent | 326a682358c16afcf2c7a9617e9811e72a1f0929 (diff) | |
| download | blackbird-obmc-uboot-ddf6bd4876a1838bdf3202b34f5a36f165c279b1.tar.gz blackbird-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 'arch/arm/cpu/armv7/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 1312a9db9e..21fc03b97e 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -39,7 +39,6 @@ endif obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/ obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/ -obj-$(CONFIG_BCM2835) += bcm2835/ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ |
