rpi: remove redundant board files
authorStephen Warren <swarren@wwwdotorg.org>
Tue, 5 Apr 2016 02:00:41 +0000 (20:00 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 12 Apr 2016 00:48:23 +0000 (20:48 -0400)
commitfe84ebf0214cfc1766fb467268f056bed32a08ab
treeb0ebc1cca9ea5591f2cfde31a747bff26e8eeb91
parent9082517a85930740f59966fcf13293c38792afe8
rpi: remove redundant board files

Now that rpi_*defconfig and Kconfig (rather than the config header file)
provide the identity of the build, we don't need to separate config
headers and board directories for each RPi variant. Set CONFIG_SYS_BOARD
and CONFIG_SYS_CONFIG_NAME so that we can get rid of the duplication. This
requires a tiny number of extra ifdefs in the config header.

The only disadvantage of this approach is that the $board/$board_name
environment variables aren't as descriptive as they used to be. This isn't
really an issue because those only exist to allow scripts to create DTB
filenames at runtime. However, the RPi board code already sets $fdtfile to
something more accurate based on FW-reported board ID anyway.

While at it, unify some Kconfig select options, and add a MAINTAINERS
entry for bcm283x too.

Partially-suggested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
15 files changed:
MAINTAINERS
arch/arm/mach-bcm283x/Kconfig
arch/arm/mach-bcm283x/Makefile
board/raspberrypi/rpi/MAINTAINERS
board/raspberrypi/rpi_2/MAINTAINERS [deleted file]
board/raspberrypi/rpi_2/Makefile [deleted file]
board/raspberrypi/rpi_3/MAINTAINERS [deleted file]
board/raspberrypi/rpi_3/Makefile [deleted file]
board/raspberrypi/rpi_3_32b/MAINTAINERS [deleted file]
board/raspberrypi/rpi_3_32b/Makefile [deleted file]
include/configs/rpi-common.h [deleted file]
include/configs/rpi.h
include/configs/rpi_2.h [deleted file]
include/configs/rpi_3.h [deleted file]
include/configs/rpi_3_32b.h [deleted file]