From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 30 Jun 2023 14:09:06 +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 1qFCvz-009akF-O9 for lore@lore.pengutronix.de; Fri, 30 Jun 2023 14:09:06 +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 1qFCvx-00060I-BM; Fri, 30 Jun 2023 14:09:05 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qFCvm-000601-Lv for distrokit@pengutronix.de; Fri, 30 Jun 2023 14:08:55 +0200 Received: from adahl by ada.ifak-system.com with local (Exim 4.94.2) (envelope-from ) id 1qFCvf-00Dj5y-3Z for distrokit@pengutronix.de; Fri, 30 Jun 2023 14:08:47 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=default; t=1688126933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0dBj7NM6S+2kuXLlKVB1x43u93yFZtIvVcSgwDfZ0s=; b=Wt+Kugz3D0BPfpgi2rEgmK7KVw/PfkM15WN+txduNI1FZ9ye2uBZqL6hKwGbyWijDqhv1O 9Tkg++MTC6TmqEiGh2L1BSxRDcFsTjMwSZn+1TOFCrf8dwyxx9e5qC975NAtin1TTsMfqp UPXQQoaMXVXN1Iig5h+qItSIgBHUVHUyjq4V4M9hmeAqq1j9fs/e0w8AxgWPdTXfy1DYyy aUNaDYMyikrpMli5PCDPvMETMy851KP9sJULyztADSJ9hrPae7cbOfB2+kWfJdDwcSsOAa a7Z4nbDEDY/RufqM6rnOsFsfTROq962EkY8VI+bXYsdeD38/pXTr8CP1oGojYw== From: Alexander Dahl To: distrokit@pengutronix.de Date: Fri, 30 Jun 2023 14:08:47 +0200 Message-Id: <20230630120847.3271567-1-ada@thorsis.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer 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 When DistroKit was used as a base layer, the firmware was not in '$(PTXDIST_WORKSPACE)/rpi-firmware' but in '$(PTXDIST_WORKSPACE)/base/rpi-firmware' or '$(PTXDIST_WORKSPACE)/base/base/rpi-firmware' … so we just need to look for it in all layers. Otherwise no firmware is put to the FAT partition of the SD card image and the device does not boot at all. Fixes: 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace") Signed-off-by: Alexander Dahl --- configs/platform-v7a/rules/image-rpi2.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make index e74edd1..22f1158 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 := $(PTXDIST_WORKSPACE)/rpi-firmware +IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware) IMAGE_RPI2_DATA := \ $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \ $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \ base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644 -- 2.30.2