From fe84ebf0214cfc1766fb467268f056bed32a08ab Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 4 Apr 2016 20:00:41 -0600 Subject: 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 Signed-off-by: Stephen Warren Reviewed-by: Tom Rini --- board/raspberrypi/rpi/MAINTAINERS | 2 +- board/raspberrypi/rpi_2/MAINTAINERS | 6 ------ board/raspberrypi/rpi_2/Makefile | 7 ------- board/raspberrypi/rpi_3/MAINTAINERS | 6 ------ board/raspberrypi/rpi_3/Makefile | 7 ------- board/raspberrypi/rpi_3_32b/MAINTAINERS | 6 ------ board/raspberrypi/rpi_3_32b/Makefile | 7 ------- 7 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 board/raspberrypi/rpi_2/MAINTAINERS delete mode 100644 board/raspberrypi/rpi_2/Makefile delete mode 100644 board/raspberrypi/rpi_3/MAINTAINERS delete mode 100644 board/raspberrypi/rpi_3/Makefile delete mode 100644 board/raspberrypi/rpi_3_32b/MAINTAINERS delete mode 100644 board/raspberrypi/rpi_3_32b/Makefile (limited to 'board/raspberrypi') diff --git a/board/raspberrypi/rpi/MAINTAINERS b/board/raspberrypi/rpi/MAINTAINERS index 6dcb7bd24e..98c3758a94 100644 --- a/board/raspberrypi/rpi/MAINTAINERS +++ b/board/raspberrypi/rpi/MAINTAINERS @@ -3,4 +3,4 @@ M: Stephen Warren S: Maintained F: board/raspberrypi/rpi/ F: include/configs/rpi.h -F: configs/rpi_defconfig +F: configs/rpi_*defconfig diff --git a/board/raspberrypi/rpi_2/MAINTAINERS b/board/raspberrypi/rpi_2/MAINTAINERS deleted file mode 100644 index 85a480c9d1..0000000000 --- a/board/raspberrypi/rpi_2/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -RPI_2 BOARD -M: Stephen Warren -S: Maintained -F: board/raspberrypi/rpi_2/ -F: include/configs/rpi_2.h -F: configs/rpi_2_defconfig diff --git a/board/raspberrypi/rpi_2/Makefile b/board/raspberrypi/rpi_2/Makefile deleted file mode 100644 index d82cd21f4c..0000000000 --- a/board/raspberrypi/rpi_2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2012,2015 Stephen Warren -# -# SPDX-License-Identifier: GPL-2.0 -# - -obj-y := ../rpi/rpi.o diff --git a/board/raspberrypi/rpi_3/MAINTAINERS b/board/raspberrypi/rpi_3/MAINTAINERS deleted file mode 100644 index 26ecd99e16..0000000000 --- a/board/raspberrypi/rpi_3/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -RPI_3_BOARD -M: Stephen Warren -S: Maintained -F: board/raspberrypi/rpi_3/ -F: include/configs/rpi_3.h -F: configs/rpi_3_defconfig diff --git a/board/raspberrypi/rpi_3/Makefile b/board/raspberrypi/rpi_3/Makefile deleted file mode 100644 index 78e287487c..0000000000 --- a/board/raspberrypi/rpi_3/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2012-2016 Stephen Warren -# -# SPDX-License-Identifier: GPL-2.0 -# - -obj-y := ../rpi/rpi.o diff --git a/board/raspberrypi/rpi_3_32b/MAINTAINERS b/board/raspberrypi/rpi_3_32b/MAINTAINERS deleted file mode 100644 index bc9df87f03..0000000000 --- a/board/raspberrypi/rpi_3_32b/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -RPI_3_32B BOARD -M: Stephen Warren -S: Maintained -F: board/raspberrypi/rpi_3_32b/ -F: include/configs/rpi_3_32b.h -F: configs/rpi_3_32b_defconfig diff --git a/board/raspberrypi/rpi_3_32b/Makefile b/board/raspberrypi/rpi_3_32b/Makefile deleted file mode 100644 index 78e287487c..0000000000 --- a/board/raspberrypi/rpi_3_32b/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2012-2016 Stephen Warren -# -# SPDX-License-Identifier: GPL-2.0 -# - -obj-y := ../rpi/rpi.o -- cgit v1.2.1