From 3235d0f84dafa0a99313a9fb83df8a16ebdb3195 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 19 May 2022 17:22:34 +0200 Subject: Add AGL machine template for s32g274ardb2 aka goldbox This adds the machine template and tweaks to build an image that matches the s32g274ardb2 aka 'goldbox' . Bug-AGL: SPEC-4387 Signed-off-by: Jan-Simon Moeller Change-Id: I90cb5d109d4327147025fa81a70ef0c9adb0c78f Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27498 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/conf/include/agl_s32g274ardb2.inc | 29 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-s32_%.bbappend | 5 ++++ .../recipes-kernel/linux/linux-s32_5.%.bbappend | 1 + .../machine/s32g274ardb2/40_bblayers.conf.inc | 8 ++++++ templates/machine/s32g274ardb2/50_local.conf.inc | 3 +++ templates/machine/s32g274ardb2/50_setup.sh | 2 ++ .../s32g274ardb2/README_machine_s32g274ardb2.md | 6 +++++ 7 files changed, 54 insertions(+) create mode 100644 meta-agl-bsp/conf/include/agl_s32g274ardb2.inc create mode 100644 meta-agl-bsp/meta-alb/recipes-bsp/u-boot/u-boot-s32_%.bbappend create mode 100644 meta-agl-bsp/meta-alb/recipes-kernel/linux/linux-s32_5.%.bbappend create mode 100644 templates/machine/s32g274ardb2/40_bblayers.conf.inc create mode 100644 templates/machine/s32g274ardb2/50_local.conf.inc create mode 100644 templates/machine/s32g274ardb2/50_setup.sh create mode 100644 templates/machine/s32g274ardb2/README_machine_s32g274ardb2.md diff --git a/meta-agl-bsp/conf/include/agl_s32g274ardb2.inc b/meta-agl-bsp/conf/include/agl_s32g274ardb2.inc new file mode 100644 index 000000000..bd455f435 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_s32g274ardb2.inc @@ -0,0 +1,29 @@ +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT:remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + +# Disable the meta-freescale weston-init bbappend as it conflicts +# with AGL's. +BBMASK:append = " meta-freescale/recipes-graphics/wayland/weston-init" + +# do not replace or append YP core recipes at all +BBMASK:append = " meta-alb/dynamic-layers/core/" + +# Avoid needing meta-python2 +BBMASK:append = " meta-alb/dynamic-layers/freescale-layer/recipes-extended/vpp-core/vpp-core.bb" +BBMASK:append = " meta-alb/recipes-(connectivity|core|devtools|extended/xen|support/rng-tools)/" + +# Seems like it might be worthwhile to get dunfell version, but doesn't work?: +#BBMASK:append = " meta-alb/recipes-bsp/u-boot/u-boot.inc" + +PREFERRED_VERSION_rng-tools ?= "6%" + +# export? +RELEASE_BASE = "release/bsp32.0" + +# the label needs to be shorter than we would expand to by default !! +# Defaults to boot-${MACHINE} which happens to be more than 11 chars +BOOTDD_VOLUME_ID = "boots32g" + +AGL_DEFAULT_IMAGE_FSTYPES ?= "sdcard ext4 tar.xz" \ No newline at end of file diff --git a/meta-agl-bsp/meta-alb/recipes-bsp/u-boot/u-boot-s32_%.bbappend b/meta-agl-bsp/meta-alb/recipes-bsp/u-boot/u-boot-s32_%.bbappend new file mode 100644 index 000000000..465023c08 --- /dev/null +++ b/meta-agl-bsp/meta-alb/recipes-bsp/u-boot/u-boot-s32_%.bbappend @@ -0,0 +1,5 @@ +# Missing from the meta-alb u-boot.inc +inherit python3native + +DEPENDS:remove = "python-native" +DEPENDS:append = " python3-native" diff --git a/meta-agl-bsp/meta-alb/recipes-kernel/linux/linux-s32_5.%.bbappend b/meta-agl-bsp/meta-alb/recipes-kernel/linux/linux-s32_5.%.bbappend new file mode 100644 index 000000000..787ead1ba --- /dev/null +++ b/meta-agl-bsp/meta-alb/recipes-kernel/linux/linux-s32_5.%.bbappend @@ -0,0 +1 @@ +addtask merge_delta_config before do_kernel_localversion \ No newline at end of file diff --git a/templates/machine/s32g274ardb2/40_bblayers.conf.inc b/templates/machine/s32g274ardb2/40_bblayers.conf.inc new file mode 100644 index 000000000..c668d2792 --- /dev/null +++ b/templates/machine/s32g274ardb2/40_bblayers.conf.inc @@ -0,0 +1,8 @@ +# This must be parsed after qt5, etc. layers so that they are correctly +# recognized by meta-freescale/dynamic-layers +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-freescale \ + ${METADIR}/bsp/meta-alb \ + ${METADIR}/bsp/meta-linaro/meta-optee \ + ${METADIR}/external/meta-python2 \ + " diff --git a/templates/machine/s32g274ardb2/50_local.conf.inc b/templates/machine/s32g274ardb2/50_local.conf.inc new file mode 100644 index 000000000..3e15d4c99 --- /dev/null +++ b/templates/machine/s32g274ardb2/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "s32g274ardb2" +#see meta-agl/meta-agl-bsp/conf/include/agl_s32g233aevb.inc +require conf/include/agl_s32g274ardb2.inc diff --git a/templates/machine/s32g274ardb2/50_setup.sh b/templates/machine/s32g274ardb2/50_setup.sh new file mode 100644 index 000000000..eefd1eb7f --- /dev/null +++ b/templates/machine/s32g274ardb2/50_setup.sh @@ -0,0 +1,2 @@ +find_and_ack_eula $METADIR/bsp/meta-freescale EULA +export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/s32g274ardb2/README_machine_s32g274ardb2.md b/templates/machine/s32g274ardb2/README_machine_s32g274ardb2.md new file mode 100644 index 000000000..59d80627b --- /dev/null +++ b/templates/machine/s32g274ardb2/README_machine_s32g274ardb2.md @@ -0,0 +1,6 @@ +--- +description: S32G +authors: Scott Murray +--- + +### Machine s32g274ardb2 -- cgit 1.2.3-korg