From 018047a08e295418e4871f675fdc9693528f54b6 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 16 Nov 2023 06:52:49 +0300 Subject: [PATCH 1/6] initramfs-firmware-*-image: move to recipes-bsp/images Move firmware image recipes close to the rest of firmware recipes, recipes-bsp. Signed-off-by: Dmitry Baryshkov --- {recipes-test => recipes-bsp}/images/initramfs-firmware-image.bb | 0 .../images/initramfs-firmware-nexus-image.bb | 0 .../images/initramfs-firmware-rb12-image.bb | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {recipes-test => recipes-bsp}/images/initramfs-firmware-image.bb (100%) rename {recipes-test => recipes-bsp}/images/initramfs-firmware-nexus-image.bb (100%) rename {recipes-test => recipes-bsp}/images/initramfs-firmware-rb12-image.bb (100%) diff --git a/recipes-test/images/initramfs-firmware-image.bb b/recipes-bsp/images/initramfs-firmware-image.bb similarity index 100% rename from recipes-test/images/initramfs-firmware-image.bb rename to recipes-bsp/images/initramfs-firmware-image.bb diff --git a/recipes-test/images/initramfs-firmware-nexus-image.bb b/recipes-bsp/images/initramfs-firmware-nexus-image.bb similarity index 100% rename from recipes-test/images/initramfs-firmware-nexus-image.bb rename to recipes-bsp/images/initramfs-firmware-nexus-image.bb diff --git a/recipes-test/images/initramfs-firmware-rb12-image.bb b/recipes-bsp/images/initramfs-firmware-rb12-image.bb similarity index 100% rename from recipes-test/images/initramfs-firmware-rb12-image.bb rename to recipes-bsp/images/initramfs-firmware-rb12-image.bb From 5a4b7c70bff5c0d1890f7f159ac8f85f114cb7b0 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 16 Nov 2023 07:08:36 +0300 Subject: [PATCH 2/6] initramfs-firmware-image: extract common code Extract the common part of the firmware image recipes, simplifying creation of other initramfs-firmware-foo images. Signed-off-by: Dmitry Baryshkov --- recipes-bsp/images/initramfs-firmware-image.bb | 17 +---------------- recipes-bsp/images/initramfs-firmware-image.inc | 16 ++++++++++++++++ .../images/initramfs-firmware-nexus-image.bb | 17 +---------------- .../images/initramfs-firmware-rb12-image.bb | 17 +---------------- 4 files changed, 19 insertions(+), 48 deletions(-) create mode 100644 recipes-bsp/images/initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-image.bb b/recipes-bsp/images/initramfs-firmware-image.bb index e3fb61ba7..61b2e95c3 100644 --- a/recipes-bsp/images/initramfs-firmware-image.bb +++ b/recipes-bsp/images/initramfs-firmware-image.bb @@ -1,10 +1,5 @@ DESCRIPTION = "Tiny ramdisk image with firmware files" -# We do not use kernel image or kernel modules in the image, so remove the -# dependency on the kernel -KERNELDEPMODDEPEND = "" -KERNEL_DEPLOY_DEPEND = "" - # Do not install anything by default PACKAGE_INSTALL = "" @@ -31,14 +26,4 @@ PACKAGE_INSTALL:qcom-armv7a = " \ firmware-qcom-nexus7-2013 \ " -IMAGE_LINGUAS = "" -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" - -# Inhibit installing /init -IMAGE_BUILDING_DEBUGFS = "true" +require initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-image.inc b/recipes-bsp/images/initramfs-firmware-image.inc new file mode 100644 index 000000000..c8b05c363 --- /dev/null +++ b/recipes-bsp/images/initramfs-firmware-image.inc @@ -0,0 +1,16 @@ +# We do not use kernel image or kernel modules in the image, so remove the +# dependency on the kernel +KERNELDEPMODDEPEND = "" +KERNEL_DEPLOY_DEPEND = "" + +IMAGE_LINGUAS = "" +LICENSE = "MIT" + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit core-image + +IMAGE_ROOTFS_SIZE = "8192" +IMAGE_ROOTFS_EXTRA_SPACE = "0" + +# Inhibit installing /init +IMAGE_BUILDING_DEBUGFS = "true" diff --git a/recipes-bsp/images/initramfs-firmware-nexus-image.bb b/recipes-bsp/images/initramfs-firmware-nexus-image.bb index f47b26e58..668d99334 100644 --- a/recipes-bsp/images/initramfs-firmware-nexus-image.bb +++ b/recipes-bsp/images/initramfs-firmware-nexus-image.bb @@ -1,10 +1,5 @@ DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware files" -# We do not use kernel image or kernel modules in the image, so remove the -# dependency on the kernel -KERNELDEPMODDEPEND = "" -KERNEL_DEPLOY_DEPEND = "" - # Firmware support for newer Nexus and Pixel devices depends on simg2img, which # is provided by the meta-oe only. So they are split into the bbappend in # dynamic-layers/openembedded-layer. @@ -26,14 +21,4 @@ PACKAGE_INSTALL += " \ firmware-qcom-pixel5a-5g \ " -IMAGE_LINGUAS = "" -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" - -# Inhibit installing /init -IMAGE_BUILDING_DEBUGFS = "true" +require initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-rb12-image.bb b/recipes-bsp/images/initramfs-firmware-rb12-image.bb index 10379093c..30c793a01 100644 --- a/recipes-bsp/images/initramfs-firmware-rb12-image.bb +++ b/recipes-bsp/images/initramfs-firmware-rb12-image.bb @@ -1,10 +1,5 @@ DESCRIPTION = "Tiny ramdisk image with RB1/RB2 devices firmware files" -# We do not use kernel image or kernel modules in the image, so remove the -# dependency on the kernel -KERNELDEPMODDEPEND = "" -KERNEL_DEPLOY_DEPEND = "" - PACKAGE_INSTALL += " \ packagegroup-firmware-rb1 \ packagegroup-firmware-rb2 \ @@ -16,14 +11,4 @@ BAD_RECOMMENDATIONS = " \ linux-firmware-qcom-venus-6.0 \ " -IMAGE_LINGUAS = "" -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" - -# Inhibit installing /init -IMAGE_BUILDING_DEBUGFS = "true" +require initramfs-firmware-image.inc From 97b6ac387d99adaeb7ae23f8957b5e5bdd1c3558 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 19 Nov 2023 23:43:34 +0300 Subject: [PATCH 3/6] initramfs-firmware-db8074-image: create board-specific initramfs Add initramfs holding firmware for Dragonboard APQ8074 board. Signed-off-by: Dmitry Baryshkov --- recipes-bsp/images/initramfs-firmware-db8074-image.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 recipes-bsp/images/initramfs-firmware-db8074-image.bb diff --git a/recipes-bsp/images/initramfs-firmware-db8074-image.bb b/recipes-bsp/images/initramfs-firmware-db8074-image.bb new file mode 100644 index 000000000..c531a2316 --- /dev/null +++ b/recipes-bsp/images/initramfs-firmware-db8074-image.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Tiny ramdisk image with Dragonboard APQ8074 firmware files" + +PACKAGE_INSTALL += " \ + packagegroup-firmware-dragonboard-apq8074 \ +" + +require initramfs-firmware-image.inc From 58b49bbae1171ccbcf3097e4d6d1fe3c413c0de3 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 19 Nov 2023 23:43:34 +0300 Subject: [PATCH 4/6] initramfs-firmware-ifc6560-image: create board-specific initramfs Add minimal initramfs holding firmware for Inforce IFC6560 board. Due to space limitations this firmware is mostly limited to Adreno firmware, leaving all DSP and venus to be bootstrapped from rootfs. Signed-off-by: Dmitry Baryshkov --- .../images/initramfs-firmware-ifc6560-image.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes-bsp/images/initramfs-firmware-ifc6560-image.bb diff --git a/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb b/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb new file mode 100644 index 000000000..c667b7779 --- /dev/null +++ b/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware files" + +PACKAGE_INSTALL += " \ + packagegroup-firmware-ifc6560 \ +" + +BAD_RECOMMENDATIONS = "\ + linux-firmware-qcom-sda660-audio \ + linux-firmware-qcom-sda660-compute \ + linux-firmware-qcom-sda660-modem \ + linux-firmware-qcom-sda660-venus \ + linux-firmware-qca \ + linux-firmware-ath10k \ +" + +require initramfs-firmware-image.inc From be64ece0da704d49c102ca771bc20aa58ee225db Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 19 Nov 2023 23:43:34 +0300 Subject: [PATCH 5/6] initramfs-firmware-sm8150-hdk-image: create board-specific initramfs Add initramfs holding firmware for SM8150-HDK (aka HDK855) board. Signed-off-by: Dmitry Baryshkov --- .../images/initramfs-firmware-sm8150-hdk-image.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb diff --git a/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb new file mode 100644 index 000000000..3ffcbe712 --- /dev/null +++ b/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Tiny ramdisk image with SM8150 HDK devices firmware files" + +PACKAGE_INSTALL += " \ + packagegroup-firmware-sm8150-hdk \ +" + +BAD_RECOMMENDATIONS = " \ + linux-firmware-qcom-sm8150-sensors \ +" + +require initramfs-firmware-image.inc From 454d38d69896361435dcf89e7ffcacb6c35c8a81 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 19 Nov 2023 23:43:34 +0300 Subject: [PATCH 6/6] initramfs-firmware-sm8350-hdk-image: create board-specific initramfs Add initramfs holding firmware for SM8350-HDK (aka HDK888) board. Signed-off-by: Dmitry Baryshkov --- .../images/initramfs-firmware-sm8350-hdk-image.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb diff --git a/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb new file mode 100644 index 000000000..587012e3c --- /dev/null +++ b/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Tiny ramdisk image with SM8350 HDK devices firmware files" + +PACKAGE_INSTALL += " \ + packagegroup-firmware-sm8350-hdk \ +" + +BAD_RECOMMENDATIONS = " \ + linux-firmware-qcom-sm8350-sensors \ +" + +require initramfs-firmware-image.inc