[PATCH master-next 1/2] ci/uefi-secureboot.yml: include ci/meta-secure-core.yml

[PATCH master-next 1/2] ci/uefi-secureboot.yml: include ci/meta-secure-core.yml

[Mikko Rapeli]

Needed for UEFI secure boot signing keys.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 ci/uefi-secureboot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/uefi-secureboot.yml b/ci/uefi-secureboot.yml
index 0684266f..f647f4b1 100644
--- a/ci/uefi-secureboot.yml
+++ b/ci/uefi-secureboot.yml
@@ -7,6 +7,7 @@ header:
   version: 14
   includes:
     - ci/meta-openembedded.yml
+    - ci/meta-secure-core.yml
 
 local_conf_header:
   uefi_secureboot: |
-- 
2.34.1

[PATCH master-next 2/2] qemuarm*-secureboot.conf: fix kernel serial consoles

[Mikko Rapeli]

Kernel boot serial console is not visible in runqemu stdout.
Fix this by setting SERIAL_CONSOLES to include ttyAMA0
and use that as KERNEL_CONSOLE in .wks file bootloader
configuration which assembles the kernel command line.
Now kernel boot log is again visible, incase there are problems
with it.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 meta-arm/conf/machine/qemuarm-secureboot.conf   | 3 +++
 meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/conf/machine/qemuarm-secureboot.conf
index f08b84fe..c01ca47a 100644
--- a/meta-arm/conf/machine/qemuarm-secureboot.conf
+++ b/meta-arm/conf/machine/qemuarm-secureboot.conf
@@ -21,3 +21,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
 
 MACHINE_FEATURES += "optee-ftpm"
+
+SERIAL_CONSOLES = "115200;ttyAMA0"
+KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}"
diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
index 78a39c03..2f8c093a 100644
--- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
+++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
@@ -22,3 +22,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
 
 MACHINE_FEATURES += "optee-ftpm"
+
+SERIAL_CONSOLES = "115200;ttyAMA0"
+KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}"
-- 
2.34.1

Re: [PATCH master-next 2/2] qemuarm*-secureboot.conf: fix kernel serial consoles

[Jon Mason]

On Fri, Oct 04, 2024 at 04:04:27PM +0300, Mikko Rapeli wrote:
> Kernel boot serial console is not visible in runqemu stdout.
> Fix this by setting SERIAL_CONSOLES to include ttyAMA0
> and use that as KERNEL_CONSOLE in .wks file bootloader
> configuration which assembles the kernel command line.
> Now kernel boot log is again visible, incase there are problems
> with it.
> 
> Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> ---
>  meta-arm/conf/machine/qemuarm-secureboot.conf   | 3 +++
>  meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/conf/machine/qemuarm-secureboot.conf
> index f08b84fe..c01ca47a 100644
> --- a/meta-arm/conf/machine/qemuarm-secureboot.conf
> +++ b/meta-arm/conf/machine/qemuarm-secureboot.conf
> @@ -21,3 +21,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
>  IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
>  
>  MACHINE_FEATURES += "optee-ftpm"
> +
> +SERIAL_CONSOLES = "115200;ttyAMA0"
> +KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}"
> diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
> index 78a39c03..2f8c093a 100644
> --- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
> +++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
> @@ -22,3 +22,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
>  IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
>  
>  MACHINE_FEATURES += "optee-ftpm"
> +
> +SERIAL_CONSOLES = "115200;ttyAMA0"
> +KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}"
> -- 
> 2.34.1
> 
> 

I'm not inclined to include this patch, and it should be unnecessary
soon (and I'll need to revert it then).  The patch that adds that
KERNEL_CONSOLE is in poky/oe-core master-next.  So, it should be very
soon.  The SERIAL_CONSOLES line should be unnecessary, and that should
be inherited from qemuarm/qemuarm64.

Thanks,
Jon

Re: [PATCH master-next 2/2] qemuarm*-secureboot.conf: fix kernel serial consoles

[Mikko Rapeli]

Hi,

On Fri, Oct 04, 2024 at 10:01:41AM -0400, Jon Mason wrote:
> On Fri, Oct 04, 2024 at 04:04:27PM +0300, Mikko Rapeli wrote:
> > Kernel boot serial console is not visible in runqemu stdout.
> > Fix this by setting SERIAL_CONSOLES to include ttyAMA0
> > and use that as KERNEL_CONSOLE in .wks file bootloader
> > configuration which assembles the kernel command line.
> > Now kernel boot log is again visible, incase there are problems
> > with it.
> > 
> > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> > ---
> >  meta-arm/conf/machine/qemuarm-secureboot.conf   | 3 +++
> >  meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++
> >  2 files changed, 6 insertions(+)
> > 
> > diff --git a/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/conf/machine/qemuarm-secureboot.conf
> > index f08b84fe..c01ca47a 100644
> > --- a/meta-arm/conf/machine/qemuarm-secureboot.conf
> > +++ b/meta-arm/conf/machine/qemuarm-secureboot.conf
> > @@ -21,3 +21,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
> >  IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
> >  
> >  MACHINE_FEATURES += "optee-ftpm"
> > +
> > +SERIAL_CONSOLES = "115200;ttyAMA0"
> > +KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}"
> > diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
> > index 78a39c03..2f8c093a 100644
> > --- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
> > +++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
> > @@ -22,3 +22,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a"
> >  IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
> >  
> >  MACHINE_FEATURES += "optee-ftpm"
> > +
> > +SERIAL_CONSOLES = "115200;ttyAMA0"
> > +KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}"
> > -- 
> > 2.34.1
> > 
> > 
> 
> I'm not inclined to include this patch, and it should be unnecessary
> soon (and I'll need to revert it then).  The patch that adds that
> KERNEL_CONSOLE is in poky/oe-core master-next.  So, it should be very
> soon.  The SERIAL_CONSOLES line should be unnecessary, and that should
> be inherited from qemuarm/qemuarm64.

Ok, I'll wait for the patches to oe-core/poky.

Cheers,

-Mikko