diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-09-30 18:21:52 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2022-09-30 18:53:56 +0200 |
commit | 4dbcbb49876993db8a163b996080c86ff8b223f3 (patch) | |
tree | bdb7ccdaf4ee1a7b2fa19155ee557ea2c55c7954 | |
parent | efd49c8f6cae16c64adb7019fed8c151c5c6e823 (diff) | |
download | DistroKit-4dbcbb49876993db8a163b996080c86ff8b223f3.tar.gz DistroKit-4dbcbb49876993db8a163b996080c86ff8b223f3.tar.xz |
v7a: rpi2: move rpi-firmware directory to top-level workspace
The Raspberry Pi 3 we already support can be operated in 64-bit mode as
well as the not-yet-supported Raspberry Pi 4. Instead of duplicating the
Raspberry Pi Firmware for both platforms, move it to a central location.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.pengutronix.de/20220930162159.814389-4-a.fatoum@pengutronix.de
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r-- | configs/platform-v7a/rules/image-rpi2.make | 2 | ||||
-rw-r--r-- | rpi-firmware/LICENCE.broadcom (renamed from configs/platform-v7a/rpi-firmware/LICENCE.broadcom) | 0 | ||||
-rw-r--r-- | rpi-firmware/bootcode.bin (renamed from configs/platform-v7a/rpi-firmware/bootcode.bin) | bin | 52296 -> 52296 bytes | |||
-rw-r--r-- | rpi-firmware/config.txt (renamed from configs/platform-v7a/rpi-firmware/config.txt) | 0 | ||||
-rw-r--r-- | rpi-firmware/fixup.dat (renamed from configs/platform-v7a/rpi-firmware/fixup.dat) | bin | 6736 -> 6736 bytes | |||
-rw-r--r-- | rpi-firmware/fixup_cd.dat (renamed from configs/platform-v7a/rpi-firmware/fixup_cd.dat) | bin | 2657 -> 2657 bytes | |||
-rw-r--r-- | rpi-firmware/fixup_db.dat (renamed from configs/platform-v7a/rpi-firmware/fixup_db.dat) | bin | 9808 -> 9808 bytes | |||
-rw-r--r-- | rpi-firmware/fixup_x.dat (renamed from configs/platform-v7a/rpi-firmware/fixup_x.dat) | bin | 9810 -> 9810 bytes | |||
-rw-r--r-- | rpi-firmware/start.elf (renamed from configs/platform-v7a/rpi-firmware/start.elf) | bin | 2877892 -> 2877892 bytes | |||
-rw-r--r-- | rpi-firmware/start_cd.elf (renamed from configs/platform-v7a/rpi-firmware/start_cd.elf) | bin | 685540 -> 685540 bytes | |||
-rw-r--r-- | rpi-firmware/start_db.elf (renamed from configs/platform-v7a/rpi-firmware/start_db.elf) | bin | 4854600 -> 4854600 bytes | |||
-rw-r--r-- | rpi-firmware/start_x.elf (renamed from configs/platform-v7a/rpi-firmware/start_x.elf) | bin | 3792104 -> 3792104 bytes |
12 files changed, 1 insertions, 1 deletions
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make index db5cbc1..e74edd1 100644 --- a/configs/platform-v7a/rules/image-rpi2.make +++ b/configs/platform-v7a/rules/image-rpi2.make @@ -19,7 +19,7 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2) IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz IMAGE_RPI2_CONFIG := rpi2.config -IMAGE_RPI2_DATA_DIR := $(call ptx/in-platformconfigdir, rpi-firmware) +IMAGE_RPI2_DATA_DIR := $(PTXDIST_WORKSPACE)/rpi-firmware IMAGE_RPI2_DATA := \ $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \ $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \ diff --git a/configs/platform-v7a/rpi-firmware/LICENCE.broadcom b/rpi-firmware/LICENCE.broadcom index 89b5c0c..89b5c0c 100644 --- a/configs/platform-v7a/rpi-firmware/LICENCE.broadcom +++ b/rpi-firmware/LICENCE.broadcom diff --git a/configs/platform-v7a/rpi-firmware/bootcode.bin b/rpi-firmware/bootcode.bin Binary files differindex 823a2e9..823a2e9 100644 --- a/configs/platform-v7a/rpi-firmware/bootcode.bin +++ b/rpi-firmware/bootcode.bin diff --git a/configs/platform-v7a/rpi-firmware/config.txt b/rpi-firmware/config.txt index d6ecc1e..d6ecc1e 100644 --- a/configs/platform-v7a/rpi-firmware/config.txt +++ b/rpi-firmware/config.txt diff --git a/configs/platform-v7a/rpi-firmware/fixup.dat b/rpi-firmware/fixup.dat Binary files differindex 3b58ed2..3b58ed2 100644 --- a/configs/platform-v7a/rpi-firmware/fixup.dat +++ b/rpi-firmware/fixup.dat diff --git a/configs/platform-v7a/rpi-firmware/fixup_cd.dat b/rpi-firmware/fixup_cd.dat Binary files differindex b427ef8..b427ef8 100644 --- a/configs/platform-v7a/rpi-firmware/fixup_cd.dat +++ b/rpi-firmware/fixup_cd.dat diff --git a/configs/platform-v7a/rpi-firmware/fixup_db.dat b/rpi-firmware/fixup_db.dat Binary files differindex d60791e..d60791e 100644 --- a/configs/platform-v7a/rpi-firmware/fixup_db.dat +++ b/rpi-firmware/fixup_db.dat diff --git a/configs/platform-v7a/rpi-firmware/fixup_x.dat b/rpi-firmware/fixup_x.dat Binary files differindex 49618df..49618df 100644 --- a/configs/platform-v7a/rpi-firmware/fixup_x.dat +++ b/rpi-firmware/fixup_x.dat diff --git a/configs/platform-v7a/rpi-firmware/start.elf b/rpi-firmware/start.elf Binary files differindex aae7d94..aae7d94 100644 --- a/configs/platform-v7a/rpi-firmware/start.elf +++ b/rpi-firmware/start.elf diff --git a/configs/platform-v7a/rpi-firmware/start_cd.elf b/rpi-firmware/start_cd.elf Binary files differindex 1a37edf..1a37edf 100644 --- a/configs/platform-v7a/rpi-firmware/start_cd.elf +++ b/rpi-firmware/start_cd.elf diff --git a/configs/platform-v7a/rpi-firmware/start_db.elf b/rpi-firmware/start_db.elf Binary files differindex 3ba0285..3ba0285 100644 --- a/configs/platform-v7a/rpi-firmware/start_db.elf +++ b/rpi-firmware/start_db.elf diff --git a/configs/platform-v7a/rpi-firmware/start_x.elf b/rpi-firmware/start_x.elf Binary files differindex eee54a2..eee54a2 100644 --- a/configs/platform-v7a/rpi-firmware/start_x.elf +++ b/rpi-firmware/start_x.elf |