From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 Feb 2023 20:36:25 +0100 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 1pQZC6-003QMH-S4 for lore@lore.pengutronix.de; Fri, 10 Feb 2023 20:36:25 +0100 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 1pQZC2-0006DS-5m; Fri, 10 Feb 2023 20:36:22 +0100 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 1pQZBx-00062y-0G for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:17 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pQZBv-0043f0-3r for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:16 +0100 Received: from mfe by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pQZBu-008zkb-GA for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:14 +0100 From: Marco Felsch To: distrokit@pengutronix.de Date: Fri, 10 Feb 2023 20:36:03 +0100 Message-Id: <20230210193612.2143905-6-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210193612.2143905-1-m.felsch@pengutronix.de> References: <20230210193612.2143905-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 05/14] v8a: firmware-imx: fix destition path 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: , 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 linux firmware search path is /lib/firmware, so adapt it accordingly. Add the /usr prefix since DistroKit already applied the /usr merge. Signed-off-by: Marco Felsch --- configs/platform-v8a/rules/barebox-imx8m.make | 2 +- configs/platform-v8a/rules/firmware-imx.make | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make index c96c10d..0d88f46 100644 --- a/configs/platform-v8a/rules/barebox-imx8m.make +++ b/configs/platform-v8a/rules/barebox-imx8m.make @@ -67,7 +67,7 @@ $(STATEDIR)/barebox-imx8m.prepare: $(BAREBOX_IMX8M_CONFIG) @for i in lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \ lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin ; do \ - cp $(PTXCONF_SYSROOT_TARGET)/firmware/ddr/synopsys/$$i $(BAREBOX_IMX8M_DIR)/firmware/; \ + cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/ddr/synopsys/$$i $(BAREBOX_IMX8M_DIR)/firmware/; \ done @for i in m p q; do \ diff --git a/configs/platform-v8a/rules/firmware-imx.make b/configs/platform-v8a/rules/firmware-imx.make index 829bc13..fbdd93a 100644 --- a/configs/platform-v8a/rules/firmware-imx.make +++ b/configs/platform-v8a/rules/firmware-imx.make @@ -46,11 +46,11 @@ ifdef PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8 @$(foreach f, lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \ lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin, \ install -v -D -m644 $(FIRMWARE_IMX_PKGDIR)/firmware/ddr/synopsys/$(f) \ - $(PTXCONF_SYSROOT_TARGET)/firmware/ddr/synopsys/$(f);) + $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/ddr/synopsys/$(f);) @$(foreach f, signed_dp_imx8m.bin signed_hdmi_imx8m.bin, \ install -v -D -m644 $(FIRMWARE_IMX_PKGDIR)/firmware/hdmi/cadence/$(f) \ - $(PTXCONF_SYSROOT_TARGET)/firmware/hdmi/cadence/$(f);) + $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/hdmi/cadence/$(f);) endif @$(call touch) @@ -75,7 +75,7 @@ $(STATEDIR)/firmware-imx.targetinstall: @$(call install_fixup, firmware-imx,DESCRIPTION,missing) @for f in $(FIRMWARE_IMX_INSTALL-y); do \ $(call install_copy, firmware-imx, 0, 0, 0644, \ - $(FIRMWARE_IMX_PKGDIR)/firmware/vpu/$$f, /lib/firmware/$$f); \ + $(FIRMWARE_IMX_PKGDIR)/firmware/vpu/$$f, /usr/lib/firmware/$$f); \ done @$(call install_finish, firmware-imx) -- 2.30.2