[meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3

[meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3

[anthony.t.davies]

From: Anthony Davies <anthony.t.davies@gmail.com>

Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf

Signed-off-by: Anthony Davies <anthony.t.davies@gmail.com>
---
 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 +-
 6 files changed, 6 insertions(+), 6 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"
-- 
2.34.1

Re: [yocto] [meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3

[Quentin Schulz]

Hi Anthony,

On 10/3/23 02:43, Anthony Davies via lists.yoctoproject.org wrote:
> [You don't often get email from anthony.t.davies=gmail.com@lists.yoctoproject.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> From: Anthony Davies <anthony.t.davies@gmail.com>
> 
> Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf
> 
> Signed-off-by: Anthony Davies <anthony.t.davies@gmail.com>

Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>

Unrelated to this patch set, KERNEL_IMAGETYPE actually defaults to 
zImage so we could just avoid doing it again in rk3066, rk3188, rk3328.

Also, for newer versions of patch series, please use:
git format-patch -v3
or
git send-email -v3

and it should create a mail with:
[PATCH v3] in there
because with the current subject being
Allow KERNEL_IMAGETYPE override v3
this would be the commit title inside the git repo and this is the kind 
of information we don't necessarily need in the git repo :) (but thanks 
for thinknig about adding it, it makes it easier to follow which patch 
mail is the latest version :) ).

Cheers,
Quentin

Re: [yocto] [meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3

[Trevor Woerner]

On Tue 2023-10-03 @ 12:17:13 PM, Quentin Schulz wrote:
> Hi Anthony,
> 
> On 10/3/23 02:43, Anthony Davies via lists.yoctoproject.org wrote:
> > [You don't often get email from anthony.t.davies=gmail.com@lists.yoctoproject.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> > 
> > From: Anthony Davies <anthony.t.davies@gmail.com>
> > 
> > Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf
> > 
> > Signed-off-by: Anthony Davies <anthony.t.davies@gmail.com>
> 
> Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> 
> Unrelated to this patch set, KERNEL_IMAGETYPE actually defaults to zImage so
> we could just avoid doing it again in rk3066, rk3188, rk3328.
> 
> Also, for newer versions of patch series, please use:
> git format-patch -v3
> or
> git send-email -v3
> 
> and it should create a mail with:
> [PATCH v3] in there
> because with the current subject being
> Allow KERNEL_IMAGETYPE override v3
> this would be the commit title inside the git repo and this is the kind of
> information we don't necessarily need in the git repo :) (but thanks for
> thinknig about adding it, it makes it easier to follow which patch mail is
> the latest version :) ).

Would "git send-email -v3" also add the "meta-rockchip"?
I usually just do:

	$ git format-patch --subject-prefix="meta-rockchip][PATCH v3" ...
	$ git send-email <patch>

I'll fix the commit messages up so don't worry about sending a v4. Thanks for
your patches! It's nice to not be the only one thinking about this layer.

Best regards,
	Trevor

Re: [yocto] [meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3

[Quentin Schulz]

Hi Trevor,

On 10/3/23 16:03, Trevor Woerner wrote:
> On Tue 2023-10-03 @ 12:17:13 PM, Quentin Schulz wrote:
>> Hi Anthony,
>>
>> On 10/3/23 02:43, Anthony Davies via lists.yoctoproject.org wrote:
>>> [You don't often get email from anthony.t.davies=gmail.com@lists.yoctoproject.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>>>
>>> From: Anthony Davies <anthony.t.davies@gmail.com>
>>>
>>> Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf
>>>
>>> Signed-off-by: Anthony Davies <anthony.t.davies@gmail.com>
>>
>> Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>>
>> Unrelated to this patch set, KERNEL_IMAGETYPE actually defaults to zImage so
>> we could just avoid doing it again in rk3066, rk3188, rk3328.
>>
>> Also, for newer versions of patch series, please use:
>> git format-patch -v3
>> or
>> git send-email -v3
>>
>> and it should create a mail with:
>> [PATCH v3] in there
>> because with the current subject being
>> Allow KERNEL_IMAGETYPE override v3
>> this would be the commit title inside the git repo and this is the kind of
>> information we don't necessarily need in the git repo :) (but thanks for
>> thinknig about adding it, it makes it easier to follow which patch mail is
>> the latest version :) ).
> 
> Would "git send-email -v3" also add the "meta-rockchip"?

I assume anything you can pass to git-format-patch can be passed to 
git-send-email, so git send-email --subject-prefix="meta-rockchip][PATCH 
v3" probably would work just as fine? However these parameters only work 
if you pass a gitrev and not a patch

c.f. https://git-scm.com/docs/git-send-email#_description
"""
Patches can be specified as files, directories (which will send all 
files in the directory), or directly as a revision list. In the last 
case, any format accepted by git-format-patch[1] can be passed to git 
send-email, as well as options understood by git-format-patch[1].
"""

Cheers,
Quentin

Re: [meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3

[Trevor Woerner]

On Tue 2023-10-03 @ 11:43:08 AM, anthony.t.davies@gmail.com wrote:
> From: Anthony Davies <anthony.t.davies@gmail.com>
> 
> Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf
> 
> Signed-off-by: Anthony Davies <anthony.t.davies@gmail.com>
> ---
>  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 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)

Applied, with a couple tweaks, to meta-rockchip, master branch.
Thanks!