So sorry, this is the wrong branch, I will send a new one.
On Tue, 26 Sept 2023 at 13:07, Anthony Davies via lists.yoctoproject.org
<anthony.t.davies=gmail....@lists.yoctoproject.org> wrote:
> From: Anthony Davies <anthony.t.dav...@gmail.com>
>
> Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf
>
> Fixed bug where dtb couldnt be found when generating KERNEL_IMAGETYPE
> other then fitImage image due to KERNEL_DEVICETREE containing the dtb
> directory which is not available in the DEPLOY_DIR_IMAGE directory
> ---
> conf/machine/include/px30.inc | 2 +-
> conf/machine/include/rk3066.inc | 2 +-
> conf/machine/include/rk3188.inc | 2 +-
> conf/machine/include/rk3288.inc | 2 +-
> conf/machine/include/rk3328.inc | 2 +-
> conf/machine/include/rk3399.inc | 2 +-
> conf/machine/include/rockchip-defaults.inc | 2 +-
> conf/machine/include/rockchip-wic.inc | 6 +++++-
> 8 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc
> index a3727fb..badcbcd 100644
> --- a/conf/machine/include/px30.inc
> +++ b/conf/machine/include/px30.inc
> @@ -12,7 +12,7 @@ require conf/machine/include/rockchip-wic.inc
>
> KBUILD_DEFCONFIG ?= "defconfig"
> KERNEL_CLASSES = "kernel-fitimage"
> -KERNEL_IMAGETYPE = "fitImage"
> +KERNEL_IMAGETYPE ?= "fitImage"
>
> TFA_PLATFORM = "px30"
> TFA_BUILD_TARGET = "bl31"
> diff --git a/conf/machine/include/rk3066.inc
> b/conf/machine/include/rk3066.inc
> index fa97906..3510df2 100644
> --- a/conf/machine/include/rk3066.inc
> +++ b/conf/machine/include/rk3066.inc
> @@ -11,4 +11,4 @@ SERIAL_CONSOLES = "115200;ttyS2"
>
> KBUILD_DEFCONFIG = "multi_v7_defconfig"
> KERNEL_FEATURES:append:rk3066 = "
> bsp/rockchip/remove-non-rockchip-arch-arm.scc"
> -KERNEL_IMAGETYPE = "zImage"
> +KERNEL_IMAGETYPE ?= "zImage"
> diff --git a/conf/machine/include/rk3188.inc
> b/conf/machine/include/rk3188.inc
> index bc96a0c..830f908 100644
> --- a/conf/machine/include/rk3188.inc
> +++ b/conf/machine/include/rk3188.inc
> @@ -11,4 +11,4 @@ SERIAL_CONSOLES = "115200;ttyFIQ0"
>
> KBUILD_DEFCONFIG = "multi_v7_defconfig"
> KERNEL_FEATURES:append:rk3188 = "
> bsp/rockchip/remove-non-rockchip-arch-arm.scc"
> -KERNEL_IMAGETYPE = "zImage"
> +KERNEL_IMAGETYPE ?= "zImage"
> diff --git a/conf/machine/include/rk3288.inc
> b/conf/machine/include/rk3288.inc
> index b4c559d..e682c0b 100644
> --- a/conf/machine/include/rk3288.inc
> +++ b/conf/machine/include/rk3288.inc
> @@ -11,6 +11,6 @@ SERIAL_CONSOLES = "115200;ttyS2"
>
> KBUILD_DEFCONFIG ?= "multi_v7_defconfig"
> KERNEL_FEATURES:append:rk3288 = "
> bsp/rockchip/remove-non-rockchip-arch-arm.scc"
> -KERNEL_IMAGETYPE = "zImage"
> +KERNEL_IMAGETYPE ?= "zImage"
>
> UBOOT_SUFFIX ?= "bin"
> diff --git a/conf/machine/include/rk3328.inc
> b/conf/machine/include/rk3328.inc
> index f9f8792..6be777c 100644
> --- a/conf/machine/include/rk3328.inc
> +++ b/conf/machine/include/rk3328.inc
> @@ -13,7 +13,7 @@ require conf/machine/include/rockchip-wic.inc
> KBUILD_DEFCONFIG ?= "defconfig"
> KERNEL_FEATURES:append:rk3328 = "
> bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
> KERNEL_CLASSES = "kernel-fitimage"
> -KERNEL_IMAGETYPE = "fitImage"
> +KERNEL_IMAGETYPE ?= "fitImage"
>
> TFA_PLATFORM = "rk3328"
> TFA_BUILD_TARGET = "bl31"
> diff --git a/conf/machine/include/rk3399.inc
> b/conf/machine/include/rk3399.inc
> index 88c87af..5a3f439 100644
> --- a/conf/machine/include/rk3399.inc
> +++ b/conf/machine/include/rk3399.inc
> @@ -13,7 +13,7 @@ require conf/machine/include/rockchip-wic.inc
> KBUILD_DEFCONFIG ?= "defconfig"
> KERNEL_FEATURES:append:rk3399 = "
> bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
> KERNEL_CLASSES = "kernel-fitimage"
> -KERNEL_IMAGETYPE = "fitImage"
> +KERNEL_IMAGETYPE ?= "fitImage"
>
> TFA_PLATFORM = "rk3399"
> TFA_BUILD_TARGET = "bl31"
> diff --git a/conf/machine/include/rockchip-defaults.inc
> b/conf/machine/include/rockchip-defaults.inc
> index 3ce2e24..c5cf6c2 100644
> --- a/conf/machine/include/rockchip-defaults.inc
> +++ b/conf/machine/include/rockchip-defaults.inc
> @@ -1,7 +1,7 @@
> # meta-rockchip default settings
>
> # kernel
> -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> +PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
> KCONFIG_MODE ?= "alldefconfig"
>
> # xserver
> diff --git a/conf/machine/include/rockchip-wic.inc
> b/conf/machine/include/rockchip-wic.inc
> index 635288c..23ac9d9 100644
> --- a/conf/machine/include/rockchip-wic.inc
> +++ b/conf/machine/include/rockchip-wic.inc
> @@ -11,10 +11,14 @@ WKS_FILE_DEPENDS ?= " \
> virtual/bootloader \
> virtual/kernel \
> "
> +
> +KERNEL_DEVICETREE_BASENAME =
> "${@os.path.basename('${KERNEL_DEVICETREE}')}"
> +
> IMAGE_BOOT_FILES = " \
> ${KERNEL_IMAGETYPE} \
> - ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '',
> '${KERNEL_DEVICETREE}', d)} \
> + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '',
> '${KERNEL_DEVICETREE_BASENAME}', d)} \
> "
> +IMAGE_EFI_BOOT_FILES += ${IMAGE_BOOT_FILES}
>
> # use the first-defined <baud>;<device> pair in SERIAL_CONSOLES
> # for the console parameter in the wks files
> --
> 2.34.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61113): https://lists.yoctoproject.org/g/yocto/message/61113
Mute This Topic: https://lists.yoctoproject.org/mt/101589034/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
