summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2016-04-04 20:00:41 -0600
committerTom Rini <trini@konsulko.com>2016-04-11 20:48:23 -0400
commitfe84ebf0214cfc1766fb467268f056bed32a08ab (patch)
treeb0ebc1cca9ea5591f2cfde31a747bff26e8eeb91 /board
parent9082517a85930740f59966fcf13293c38792afe8 (diff)
downloadu-boot-imx-fe84ebf0214cfc1766fb467268f056bed32a08ab.zip
u-boot-imx-fe84ebf0214cfc1766fb467268f056bed32a08ab.tar.gz
u-boot-imx-fe84ebf0214cfc1766fb467268f056bed32a08ab.tar.bz2
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>
Diffstat (limited to 'board')
-rw-r--r--board/raspberrypi/rpi/MAINTAINERS2
-rw-r--r--board/raspberrypi/rpi_2/MAINTAINERS6
-rw-r--r--board/raspberrypi/rpi_2/Makefile7
-rw-r--r--board/raspberrypi/rpi_3/MAINTAINERS6
-rw-r--r--board/raspberrypi/rpi_3/Makefile7
-rw-r--r--board/raspberrypi/rpi_3_32b/MAINTAINERS6
-rw-r--r--board/raspberrypi/rpi_3_32b/Makefile7
7 files changed, 1 insertions, 40 deletions
diff --git a/board/raspberrypi/rpi/MAINTAINERS b/board/raspberrypi/rpi/MAINTAINERS
index 6dcb7bd..98c3758 100644
--- a/board/raspberrypi/rpi/MAINTAINERS
+++ b/board/raspberrypi/rpi/MAINTAINERS
@@ -3,4 +3,4 @@ M: Stephen Warren <swarren@wwwdotorg.org>
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 85a480c..0000000
--- a/board/raspberrypi/rpi_2/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-RPI_2 BOARD
-M: Stephen Warren <swarren@wwwdotorg.org>
-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 d82cd21..0000000
--- 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 26ecd99..0000000
--- a/board/raspberrypi/rpi_3/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-RPI_3_BOARD
-M: Stephen Warren <swarren@wwwdotorg.org>
-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 78e2874..0000000
--- a/board/raspberrypi/rpi_3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2012-2016 Stephen Warren <swarren@wwwdotorg.org>
-#
-# 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 bc9df87..0000000
--- a/board/raspberrypi/rpi_3_32b/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-RPI_3_32B BOARD
-M: Stephen Warren <swarren@wwwdotorg.org>
-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 78e2874..0000000
--- a/board/raspberrypi/rpi_3_32b/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2012-2016 Stephen Warren <swarren@wwwdotorg.org>
-#
-# SPDX-License-Identifier: GPL-2.0
-#
-
-obj-y := ../rpi/rpi.o