| Message ID | OS3PR01MB59767EDA1F2EA8ADD1569ED8C6449@OS3PR01MB5976.jpnprd01.prod.outlook.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [isar-cip-core] iwg20m: remove fixed PREFERRED_VERSION for linux_cip | expand |
On 12.09.22 14:16, Hung Tran wrote: > From: Hung Tran <hung.tran.jy@renesas.com> > > iwg20m had PREFERRED_VERSION for linux_cip as 4.4.% > Due to this setting, Gitlab CI always build linux_cip > version 4.4 for any iwg20m build targets. > > This setting is old, and not necessary anymore. > Remove it to allow building suitable linux_cip versions for > each build target (4.19 for buster and 5.10 for bullseye) > > Signed-off-by: Hung Tran <hung.tran.jy@renesas.com> > --- > conf/machine/iwg20m.conf | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf > index d997a02..f5d5dda 100644 > --- a/conf/machine/iwg20m.conf > +++ b/conf/machine/iwg20m.conf > @@ -14,13 +14,9 @@ IMAGE_FSTYPES ?= "wic" > MACHINE_SERIAL = "ttySC0" > BAUDRATE_TTY = "115200" > > -# kernel version > -PREFERRED_VERSION_linux-cip ?= "4.4.%" > -PREFERRED_VERSION_linux-cip-rt ?= "4.4.%" > +# Setting for kernel and boot > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig" > - > -# Boot partition files > +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/renesas_shmobile_defconfig" > DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb" > KERNEL_IMAGE="zImage" > IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}" Thanks, applied. Jan
diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf index d997a02..f5d5dda 100644 --- a/conf/machine/iwg20m.conf +++ b/conf/machine/iwg20m.conf @@ -14,13 +14,9 @@ IMAGE_FSTYPES ?= "wic" MACHINE_SERIAL = "ttySC0" BAUDRATE_TTY = "115200" -# kernel version -PREFERRED_VERSION_linux-cip ?= "4.4.%" -PREFERRED_VERSION_linux-cip-rt ?= "4.4.%" +# Setting for kernel and boot USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig" - -# Boot partition files +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/renesas_shmobile_defconfig" DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb" KERNEL_IMAGE="zImage" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"