[meta-ti][RESEND 1/2] beaglebone: make kernel machine-specific package

[meta-ti][RESEND 1/2] beaglebone: make kernel machine-specific package

[Vivien Didelot]

Require kernel image and device tree as machine-specific packages with
MACHINE_ESSENTIAL_EXTRA_RDEPENDS instead of appending IMAGE_INSTALL.

This binds the packages to the packagegroup-core-boot package group,
allowing one to skip their installation, e.g. for container trees.

This patch reflects commit d4cbe0e43393 [1] from meta-yocto-bsp
("beaglebone-yocto: move kernel and dtb to packagegroup-core-boot").

[1] https://git.yoctoproject.org/meta-yocto/commit/?id=d4cbe0e43393ec70e98caf006372b5311597d377

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
---
 conf/machine/beaglebone.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index dcb14cc9..fe3127bb 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -13,7 +13,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 
 SERIAL_CONSOLES = "115200;ttyS0"
 
-IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
 
 # Refine the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_BOARDS = "bbbAM335x"
-- 
2.35.0

[meta-ti][RESEND 2/2] ti33x: move screen feature to machine configs

[Vivien Didelot]

The AM335x SoC has a built-in 16bit/24bit RGB LCD controller, and
the BeagleBone Black uses an external chip to convert this to HDMI.

But the SoC does not have a video output port per-se, thus the "screen"
machine feature does not belong to its configuration but rather to
the machine configurations.

Move the feature (and the MACHINE_GUI_CLASS definition) out of
ti33x.inc into am335x-evm.conf and beaglebone.conf respectively.

At the same time, drop the irrelevant comments regarding the external
screen, since MACHINE_GUI_CLASS is unlikely used and the BeagleBone
Black has a micro HDMI port, not a DVI port.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
---
 conf/machine/am335x-evm.conf   | 2 +-
 conf/machine/beaglebone.conf   | 2 +-
 conf/machine/include/ti33x.inc | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf
index 469c4d37..09bd3934 100644
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/am335x-evm.conf
@@ -5,7 +5,7 @@
 require conf/machine/include/ti33x.inc
 
 MACHINE_GUI_CLASS = "smallscreen"
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "screen touchscreen"
 
 IMAGE_FSTYPES += "ubifs ubi"
 
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index fe3127bb..a079ff7b 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -8,8 +8,8 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
                     am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
                     am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb"
 
-# Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_FEATURES += "screen"
 
 SERIAL_CONSOLES = "115200;ttyS0"
 
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index 197cac19..c0e925f9 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -13,9 +13,6 @@ XSERVER = "xserver-xorg \
            xf86-video-fbdev \
            xf86-input-keyboard"
 
-# Default to external video, change to smallscreen for built-in LCD
-MACHINE_GUI_CLASS = "bigscreen"
-
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r22"
 
@@ -62,7 +59,7 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
 
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am335x"
-- 
2.35.0

Re: [meta-ti][RESEND 1/2] beaglebone: make kernel machine-specific package

[Vivien Didelot]

Hi Denys,

On Mon, 14 Feb 2022 17:15:16 -0500 Denys Dmytriyenko <denis@denix.org> wrote:
> "make kernel machine-specific package" doesn't reflect the actual change, plus 
> kernel is already a machine-specific package - PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
> Your original commit for beaglebone-yocto in meta-yocto-bsp is correct though.
> 
> I can take these patches into my new WIP master tree with this minor update.

Indeed using "machine-specific package" when I meant moving the kernel
artifacts into packagegroup-core-boot was confusing. Thanks for rewording!


	Vivien

Re: [meta-ti][RESEND 1/2] beaglebone: make kernel machine-specific package

[Denys Dmytriyenko]

"make kernel machine-specific package" doesn't reflect the actual change, plus 
kernel is already a machine-specific package - PACKAGE_ARCH = "${MACHINE_ARCH}"

Your original commit for beaglebone-yocto in meta-yocto-bsp is correct though.

I can take these patches into my new WIP master tree with this minor update.


On Sat, Jan 29, 2022 at 02:33:19PM -0500, Vivien Didelot wrote:
> Require kernel image and device tree as machine-specific packages with
> MACHINE_ESSENTIAL_EXTRA_RDEPENDS instead of appending IMAGE_INSTALL.
> 
> This binds the packages to the packagegroup-core-boot package group,
> allowing one to skip their installation, e.g. for container trees.
> 
> This patch reflects commit d4cbe0e43393 [1] from meta-yocto-bsp
> ("beaglebone-yocto: move kernel and dtb to packagegroup-core-boot").
> 
> [1] https://git.yoctoproject.org/meta-yocto/commit/?id=d4cbe0e43393ec70e98caf006372b5311597d377
> 
> Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
> ---
>  conf/machine/beaglebone.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
> index dcb14cc9..fe3127bb 100644
> --- a/conf/machine/beaglebone.conf
> +++ b/conf/machine/beaglebone.conf
> @@ -13,7 +13,7 @@ MACHINE_GUI_CLASS = "bigscreen"
>  
>  SERIAL_CONSOLES = "115200;ttyS0"
>  
> -IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage"
> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
>  
>  # Refine the list of device targets for ti-pdk class recipes
>  TI_PDK_LIMIT_BOARDS = "bbbAM335x"
> -- 
> 2.35.0
>