]> git.kernelconcepts.de Git - karo-tx-uboot.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)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 1 Sep 2015 12:34:19 +0000 (14:34 +0200)
commitb440afc8f4cb4818d52563748c09bdb46660efc7
treeee866ddf622689fe07e3d89c0cf3e7016faebdc6
parent971e7758e9d53d64f98c1db1ce0a01d5513d9e6a
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