[meta-rockchip][PATCH v2] override syntax fixup


Trevor Woerner
 

The _virtual notation is not an override. These syntax "fixes" need to be
reverted.

In the case of the kernel override, when it was added, the rock-pi-e needed
the latest kernel (linux-yocto-dev) but now the default linux-yocto kernel
will suffice. So this mistake actually switched the rock-pi-e from
linux-yocto-dev back to linux-yocto inadvertently but at a time when
linux-yocto-dev was no longer required.

In the case of the bootloader overrides, u-boot was always the default, so
these overrides were always redundant.

Therefore, in the end, simply removing these overrides is the best way
forward (considering these aren't doing anything, and the builds are working
fine regardless).

Signed-off-by: Trevor Woerner <twoerner@...>
---
conf/machine/include/rk3288.inc | 1 -
conf/machine/include/rk3328.inc | 2 --
conf/machine/include/rk3399.inc | 2 --
conf/machine/include/rockchip-defaults.inc | 1 -
conf/machine/rock-pi-e.conf | 2 --
5 files changed, 8 deletions(-)

diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
index 5b84e94..1d4a0e3 100644
--- a/conf/machine/include/rk3288.inc
+++ b/conf/machine/include/rk3288.inc
@@ -12,5 +12,4 @@ SERIAL_CONSOLES = "115200;ttyS2"
KBUILD_DEFCONFIG ?= "multi_v7_defconfig"
KERNEL_IMAGETYPE = "zImage"

-PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
UBOOT_SUFFIX ?= "bin"
diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc
index 0f3a730..acc9afd 100644
--- a/conf/machine/include/rk3328.inc
+++ b/conf/machine/include/rk3328.inc
@@ -19,5 +19,3 @@ TFA_BUILD_TARGET = "bl31"

UBOOT_SUFFIX ?= "itb"
UBOOT_ENTRYPOINT ?= "0x06000000"
-
-PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc
index 09c87c0..1e6c3b6 100644
--- a/conf/machine/include/rk3399.inc
+++ b/conf/machine/include/rk3399.inc
@@ -19,5 +19,3 @@ TFA_BUILD_TARGET = "bl31"

UBOOT_SUFFIX ?= "itb"
UBOOT_ENTRYPOINT ?= "0x06000000"
-
-PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc
index 455cca8..ca94249 100644
--- a/conf/machine/include/rockchip-defaults.inc
+++ b/conf/machine/include/rockchip-defaults.inc
@@ -5,7 +5,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
KCONFIG_MODE ?= "alldefconfig"

# xserver
-PREFERRED_PROVIDER:virtual/xserver = "xserver-xorg"
XSERVER = " \
xserver-xorg \
xserver-xorg-utils \
diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf
index 7f49c9f..0e2856f 100644
--- a/conf/machine/rock-pi-e.conf
+++ b/conf/machine/rock-pi-e.conf
@@ -7,9 +7,7 @@ require conf/machine/include/rk3328.inc

MACHINEOVERRIDES =. "rock-pi-e:"

-PREFERRED_PROVIDER:virtual/kernel = "linux-yocto-dev"
KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb"
MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"

-PREFERRED_PROVIDER:virtual/bootloader = "u-boot"
UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig"
--
2.34.1.75.gabe6bb3905


Khem Raj
 



On Sat, Dec 11, 2021 at 5:56 AM Trevor Woerner <twoerner@...> wrote:
The _virtual notation is not an override. These syntax "fixes" need to be
reverted.

Looks good 


In the case of the kernel override, when it was added, the rock-pi-e needed
the latest kernel (linux-yocto-dev) but now the default linux-yocto kernel
will suffice. So this mistake actually switched the rock-pi-e from
linux-yocto-dev back to linux-yocto inadvertently but at a time when
linux-yocto-dev was no longer required.

In the case of the bootloader overrides, u-boot was always the default, so
these overrides were always redundant.

Therefore, in the end, simply removing these overrides is the best way
forward (considering these aren't doing anything, and the builds are working
fine regardless).

Signed-off-by: Trevor Woerner <twoerner@...>
---
 conf/machine/include/rk3288.inc            | 1 -
 conf/machine/include/rk3328.inc            | 2 --
 conf/machine/include/rk3399.inc            | 2 --
 conf/machine/include/rockchip-defaults.inc | 1 -
 conf/machine/rock-pi-e.conf                | 2 --
 5 files changed, 8 deletions(-)

diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
index 5b84e94..1d4a0e3 100644
--- a/conf/machine/include/rk3288.inc
+++ b/conf/machine/include/rk3288.inc
@@ -12,5 +12,4 @@ SERIAL_CONSOLES = "115200;ttyS2"
 KBUILD_DEFCONFIG ?= "multi_v7_defconfig"
 KERNEL_IMAGETYPE = "zImage"

-PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
 UBOOT_SUFFIX ?= "bin"
diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc
index 0f3a730..acc9afd 100644
--- a/conf/machine/include/rk3328.inc
+++ b/conf/machine/include/rk3328.inc
@@ -19,5 +19,3 @@ TFA_BUILD_TARGET = "bl31"

 UBOOT_SUFFIX ?= "itb"
 UBOOT_ENTRYPOINT ?= "0x06000000"
-
-PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc
index 09c87c0..1e6c3b6 100644
--- a/conf/machine/include/rk3399.inc
+++ b/conf/machine/include/rk3399.inc
@@ -19,5 +19,3 @@ TFA_BUILD_TARGET = "bl31"

 UBOOT_SUFFIX ?= "itb"
 UBOOT_ENTRYPOINT ?= "0x06000000"
-
-PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc
index 455cca8..ca94249 100644
--- a/conf/machine/include/rockchip-defaults.inc
+++ b/conf/machine/include/rockchip-defaults.inc
@@ -5,7 +5,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 KCONFIG_MODE ?= "alldefconfig"

 # xserver
-PREFERRED_PROVIDER:virtual/xserver = "xserver-xorg"
 XSERVER = " \
        xserver-xorg \
        xserver-xorg-utils \
diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf
index 7f49c9f..0e2856f 100644
--- a/conf/machine/rock-pi-e.conf
+++ b/conf/machine/rock-pi-e.conf
@@ -7,9 +7,7 @@ require conf/machine/include/rk3328.inc

 MACHINEOVERRIDES =. "rock-pi-e:"

-PREFERRED_PROVIDER:virtual/kernel = "linux-yocto-dev"
 KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"

-PREFERRED_PROVIDER:virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig"
--
2.34.1.75.gabe6bb3905





Trevor Woerner
 

On Sat 2021-12-11 @ 08:55:43 AM, Trevor Woerner wrote:
The _virtual notation is not an override. These syntax "fixes" need to be
reverted.

In the case of the kernel override, when it was added, the rock-pi-e needed
the latest kernel (linux-yocto-dev) but now the default linux-yocto kernel
will suffice. So this mistake actually switched the rock-pi-e from
linux-yocto-dev back to linux-yocto inadvertently but at a time when
linux-yocto-dev was no longer required.

In the case of the bootloader overrides, u-boot was always the default, so
these overrides were always redundant.

Therefore, in the end, simply removing these overrides is the best way
forward (considering these aren't doing anything, and the builds are working
fine regardless).

Signed-off-by: Trevor Woerner <twoerner@...>
---
conf/machine/include/rk3288.inc | 1 -
conf/machine/include/rk3328.inc | 2 --
conf/machine/include/rk3399.inc | 2 --
conf/machine/include/rockchip-defaults.inc | 1 -
conf/machine/rock-pi-e.conf | 2 --
5 files changed, 8 deletions(-)
Applied to meta-rockchip, master.