From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 30 Sep 2022 18:22:14 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oeImE-001ZEy-0d for lore@lore.pengutronix.de; Fri, 30 Sep 2022 18:22:14 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oeImC-0006FX-Sh; Fri, 30 Sep 2022 18:22:12 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oeIm1-0006ES-Hs; Fri, 30 Sep 2022 18:22:01 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oeIm2-003pq5-BO; Fri, 30 Sep 2022 18:22:00 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oeIm0-003SHI-0z; Fri, 30 Sep 2022 18:22:00 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Fri, 30 Sep 2022 18:21:52 +0200 Message-Id: <20220930162159.814389-4-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220930162159.814389-1-a.fatoum@pengutronix.de> References: <20220930162159.814389-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 03/10] v7a: rpi2: move rpi-firmware directory to top-level workspace X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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