diff options
| author | Oleksij Rempel <o.rempel@pengutronix.de> | 2022-04-26 10:38:21 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2022-04-26 15:23:37 +0200 |
| commit | 17e0620b641f671a91a4e439e2789a87b9124d41 (patch) | |
| tree | eed77846af3cf990a4e20630500d35a27437ef4a /configs/platform-v7a/platforms | |
| parent | f586445a24ac00dd841deb6b2d8e365a99d9f870 (diff) | |
| download | DistroKit-17e0620b641f671a91a4e439e2789a87b9124d41.tar.gz DistroKit-17e0620b641f671a91a4e439e2789a87b9124d41.tar.xz | |
v7a: rpi: unify rpi{2, 3, cm3}.hdimg into common rpi.hdimg
barebox has had the ability to generate an extra image that's bootable
like a kernel for a while now. With small adjustment, we can let the
videocore use this image and pass it the appropriate device tree
depending on the board used. Moving this decision into the VideoCore
allows us to use the same image for both Raspberry Pi 2, Rasperry Pi 3
and Raspberry Pi CM3.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.pengutronix.de/20220426083821.1829442-3-a.fatoum@pengutronix.de
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/platforms')
| -rw-r--r-- | configs/platform-v7a/platforms/barebox-rpi2.in | 4 | ||||
| -rw-r--r-- | configs/platform-v7a/platforms/image-rpi2.in | 4 | ||||
| -rw-r--r-- | configs/platform-v7a/platforms/image-rpi3.in | 12 | ||||
| -rw-r--r-- | configs/platform-v7a/platforms/image-rpicm3.in | 12 |
4 files changed, 4 insertions, 28 deletions
diff --git a/configs/platform-v7a/platforms/barebox-rpi2.in b/configs/platform-v7a/platforms/barebox-rpi2.in index d62acd3..82ef1c5 100644 --- a/configs/platform-v7a/platforms/barebox-rpi2.in +++ b/configs/platform-v7a/platforms/barebox-rpi2.in @@ -2,7 +2,7 @@ menuconfig BAREBOX_RPI2 tristate - prompt "Barebox (rpi2)" + prompt "Barebox (rpi2/3/CM3)" select BAREBOX_COMMON help - Raspberry Pi 2 support for barebox. + Raspberry Pi 2, 3, CM3 support for barebox. diff --git a/configs/platform-v7a/platforms/image-rpi2.in b/configs/platform-v7a/platforms/image-rpi2.in index c1ad7c9..cf14b80 100644 --- a/configs/platform-v7a/platforms/image-rpi2.in +++ b/configs/platform-v7a/platforms/image-rpi2.in @@ -7,6 +7,6 @@ config IMAGE_RPI2 select HOST_MTOOLS select IMAGE_ROOT_EXT select BAREBOX_RPI2 - prompt "Generate images/rpi2.hdimg" + prompt "Generate images/rpi.hdimg" help - SD card image for the Raspberry Pi 2 + SD card image for the Raspberry Pi 2, 3 and CM3 diff --git a/configs/platform-v7a/platforms/image-rpi3.in b/configs/platform-v7a/platforms/image-rpi3.in deleted file mode 100644 index 022de98..0000000 --- a/configs/platform-v7a/platforms/image-rpi3.in +++ /dev/null @@ -1,12 +0,0 @@ -## SECTION=image - -config IMAGE_RPI3 - tristate - select HOST_GENIMAGE - select HOST_DOSFSTOOLS - select HOST_MTOOLS - select IMAGE_ROOT_EXT - select BAREBOX_RPI2 - prompt "Generate images/rpi3.hdimg" - help - SD card image for the Raspberry Pi 3 diff --git a/configs/platform-v7a/platforms/image-rpicm3.in b/configs/platform-v7a/platforms/image-rpicm3.in deleted file mode 100644 index 5cecf9a..0000000 --- a/configs/platform-v7a/platforms/image-rpicm3.in +++ /dev/null @@ -1,12 +0,0 @@ -## SECTION=image - -config IMAGE_RPICM3 - tristate - select HOST_GENIMAGE - select HOST_DOSFSTOOLS - select HOST_MTOOLS - select IMAGE_ROOT_EXT - select BAREBOX_RPI2 - prompt "Generate images/rpiCM3.hdimg" - help - SD card image for the Raspberry Pi Compute Module 3 |