]> git.ipfire.org Git - people/ms/u-boot.git/commit
ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 19 Mar 2015 10:42:56 +0000 (19:42 +0900)
committerTom Rini <trini@konsulko.com>
Sat, 28 Mar 2015 13:03:09 +0000 (09:03 -0400)
commitddf6bd4876a1838bdf3202b34f5a36f165c279b1
treef21be52675252fd4e942130a3336556b9b970a6a
parent326a682358c16afcf2c7a9617e9811e72a1f0929
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>
17 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/cpu/arm1176/Makefile
arch/arm/cpu/arm1176/bcm2835/Kconfig [deleted file]
arch/arm/cpu/armv7/Makefile
arch/arm/cpu/armv7/bcm2835/Makefile [deleted file]
arch/arm/mach-bcm283x/Kconfig [new file with mode: 0644]
arch/arm/mach-bcm283x/Makefile [moved from arch/arm/cpu/arm1176/bcm2835/Makefile with 72% similarity]
arch/arm/mach-bcm283x/init.c [moved from arch/arm/cpu/arm1176/bcm2835/init.c with 100% similarity]
arch/arm/mach-bcm283x/lowlevel_init.S [moved from arch/arm/cpu/arm1176/bcm2835/lowlevel_init.S with 100% similarity]
arch/arm/mach-bcm283x/mbox.c [moved from arch/arm/cpu/arm1176/bcm2835/mbox.c with 100% similarity]
arch/arm/mach-bcm283x/reset.c [moved from arch/arm/cpu/arm1176/bcm2835/reset.c with 100% similarity]
arch/arm/mach-bcm283x/timer.c [moved from arch/arm/cpu/arm1176/bcm2835/timer.c with 100% similarity]
board/raspberrypi/rpi/Kconfig [deleted file]
board/raspberrypi/rpi_2/Kconfig [deleted file]
configs/rpi_2_defconfig
configs/rpi_defconfig