From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH 03/10] v7a: rpi2: move rpi-firmware directory to top-level workspace
Date: Fri, 30 Sep 2022 18:21:52 +0200 [thread overview]
Message-ID: <20220930162159.814389-4-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20220930162159.814389-1-a.fatoum@pengutronix.de>
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>
---
configs/platform-v7a/rules/image-rpi2.make | 2 +-
.../rpi-firmware => rpi-firmware}/LICENCE.broadcom | 0
.../rpi-firmware => rpi-firmware}/bootcode.bin | Bin
.../rpi-firmware => rpi-firmware}/config.txt | 0
.../rpi-firmware => rpi-firmware}/fixup.dat | Bin
.../rpi-firmware => rpi-firmware}/fixup_cd.dat | Bin
.../rpi-firmware => rpi-firmware}/fixup_db.dat | Bin
.../rpi-firmware => rpi-firmware}/fixup_x.dat | Bin
.../rpi-firmware => rpi-firmware}/start.elf | Bin
.../rpi-firmware => rpi-firmware}/start_cd.elf | Bin
.../rpi-firmware => rpi-firmware}/start_db.elf | Bin
.../rpi-firmware => rpi-firmware}/start_x.elf | Bin
12 files changed, 1 insertion(+), 1 deletion(-)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/LICENCE.broadcom (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/bootcode.bin (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/config.txt (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/fixup.dat (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/fixup_cd.dat (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/fixup_db.dat (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/fixup_x.dat (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/start.elf (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/start_cd.elf (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/start_db.elf (100%)
rename {configs/platform-v7a/rpi-firmware => rpi-firmware}/start_x.elf (100%)
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
index db5cbc1d2ea6..e74edd19c1d9 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
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/LICENCE.broadcom
rename to rpi-firmware/LICENCE.broadcom
diff --git a/configs/platform-v7a/rpi-firmware/bootcode.bin b/rpi-firmware/bootcode.bin
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/bootcode.bin
rename to rpi-firmware/bootcode.bin
diff --git a/configs/platform-v7a/rpi-firmware/config.txt b/rpi-firmware/config.txt
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/config.txt
rename to rpi-firmware/config.txt
diff --git a/configs/platform-v7a/rpi-firmware/fixup.dat b/rpi-firmware/fixup.dat
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/fixup.dat
rename to rpi-firmware/fixup.dat
diff --git a/configs/platform-v7a/rpi-firmware/fixup_cd.dat b/rpi-firmware/fixup_cd.dat
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/fixup_cd.dat
rename to rpi-firmware/fixup_cd.dat
diff --git a/configs/platform-v7a/rpi-firmware/fixup_db.dat b/rpi-firmware/fixup_db.dat
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/fixup_db.dat
rename to rpi-firmware/fixup_db.dat
diff --git a/configs/platform-v7a/rpi-firmware/fixup_x.dat b/rpi-firmware/fixup_x.dat
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/fixup_x.dat
rename to rpi-firmware/fixup_x.dat
diff --git a/configs/platform-v7a/rpi-firmware/start.elf b/rpi-firmware/start.elf
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/start.elf
rename to rpi-firmware/start.elf
diff --git a/configs/platform-v7a/rpi-firmware/start_cd.elf b/rpi-firmware/start_cd.elf
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/start_cd.elf
rename to rpi-firmware/start_cd.elf
diff --git a/configs/platform-v7a/rpi-firmware/start_db.elf b/rpi-firmware/start_db.elf
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/start_db.elf
rename to rpi-firmware/start_db.elf
diff --git a/configs/platform-v7a/rpi-firmware/start_x.elf b/rpi-firmware/start_x.elf
similarity index 100%
rename from configs/platform-v7a/rpi-firmware/start_x.elf
rename to rpi-firmware/start_x.elf
--
2.30.2
next prev parent reply other threads:[~2022-09-30 16:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 16:21 [DistroKit] [PATCH 00/10] v7a: add Raspberry Pi 4 32-bit support Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 01/10] v7a: barebox: version bump v2022.06.0 → v2022.09.0 Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 02/10] v7a: barebox: switch to new broken-cd device parameter Ahmad Fatoum
2022-09-30 16:21 ` Ahmad Fatoum [this message]
2022-09-30 16:21 ` [DistroKit] [PATCH 04/10] rpi-firmware: Update firmware to v1.20220331 for Rpi4 support Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 05/10] barebox: deploy new barebox-raspberry-pi.img Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 06/10] v7a: kernel: configure for 32-bit Raspberry Pi 4 support Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 07/10] v7a: dts: build Raspberry Pi 4 device trees Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 08/10] v7a: rpi4: add boot loader spec support Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 09/10] v7a: rpi4: place DT into /boot for VideoCore consumption Ahmad Fatoum
2022-09-30 16:21 ` [DistroKit] [PATCH 10/10] v7a: barebox: enable of_diff command Ahmad Fatoum
2022-09-30 16:55 ` [DistroKit] [PATCH 00/10] v7a: add Raspberry Pi 4 32-bit support Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220930162159.814389-4-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox