From 572e91d6f77710ed307823cfc0e99ad048e4b09b Mon Sep 17 00:00:00 2001 From: Stefan Eichenberger Date: Thu, 17 Nov 2022 14:29:22 +0100 Subject: [PATCH] yocto-bsp: update to newer version Update the Yocto BSP to a newer version. This involves also splitting some recipes from meta-netmodule-bsp layer into meta-vcu3-bsp. This allows us to update the other layers independently of meta-vcu3-bsp. Further this release improves building an sdk with: bitbake -c populate_sdk netmodule-linux-image Also building a fit image is supported again when sourcing the env.image-minimal. --- .gitmodules | 5 ++++- bitbake | 2 +- build/conf/bblayers.conf | 1 + build/conf/distro_version.inc | 2 +- build/conf/public-mirrors.inc | 23 +++++++---------------- machine_select | 8 ++++---- meta-netmodule-bsp | 2 +- meta-netmodule-distro | 2 +- meta-netmodule-wlan | 2 +- meta-openembedded | 2 +- meta-updater | 2 +- meta-vcu3-bsp | 1 + openembedded-core | 2 +- 13 files changed, 25 insertions(+), 29 deletions(-) create mode 160000 meta-vcu3-bsp diff --git a/.gitmodules b/.gitmodules index 095cb11..5d7ddf6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,7 +16,7 @@ branch = dunfell [submodule "meta-netmodule-bsp"] path = meta-netmodule-bsp - url = git@gitlab.com:netmodule/procv_v2x/meta-netmodule-bsp.git + url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-bsp.git branch = develop-procv22 [submodule "meta-netmodule-distro"] path = meta-netmodule-distro @@ -25,3 +25,6 @@ [submodule "meta-netmodule-wlan"] path = meta-netmodule-wlan url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-wlan.git +[submodule "meta-vcu3-bsp"] + path = meta-vcu3-bsp + url = git@gitlab.com:netmodule/procv_v2x/meta-vcu3-bsp.git diff --git a/bitbake b/bitbake index 017a39e..0784db7 160000 --- a/bitbake +++ b/bitbake @@ -1 +1 @@ -Subproject commit 017a39ed05d065bf28fd38f91bcde8a098300551 +Subproject commit 0784db7dd0fef6f0621ad8d74372f44e87fef950 diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 8076340..d1e2b37 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -17,4 +17,5 @@ BBLAYERS ?= " \ ${YOCTOROOT}/meta-openembedded/meta-networking \ ${YOCTOROOT}/meta-openembedded/meta-filesystems \ ${YOCTOROOT}/meta-updater \ + ${YOCTOROOT}/meta-vcu3-bsp \ " diff --git a/build/conf/distro_version.inc b/build/conf/distro_version.inc index d4e0d1b..50e425c 100644 --- a/build/conf/distro_version.inc +++ b/build/conf/distro_version.inc @@ -1 +1 @@ -DISTRO_VERSION = "1.2.4" +DISTRO_VERSION = "1.5.2" diff --git a/build/conf/public-mirrors.inc b/build/conf/public-mirrors.inc index 4f838b9..c094be4 100644 --- a/build/conf/public-mirrors.inc +++ b/build/conf/public-mirrors.inc @@ -1,19 +1,12 @@ # Changing internal SRC_URI to public ## Bootloaders -UBOOT_TI_SRC = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2016.05/standard/am335x;protocol=ssh;" -SRC_URI_pn-u-boot-am335x-nrhw16-v2 = "${UBOOT_TI_SRC}" -SRC_URI_pn-u-boot-am335x-nrhw20-v1 = "${UBOOT_TI_SRC}" -SRC_URI_pn-u-boot-am335x-nmhw21 = "${UBOOT_TI_SRC}" -SRC_URI_pn-u-boot-am335x-nmhw24 = "${UBOOT_TI_SRC}" -SRC_URI_pn-u-boot-am335x-hw25 = "${UBOOT_TI_SRC}" - -SRC_URI_pn-u-boot-armada-385-nrhw18-v2 = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2017.11/standard/armada-385;protocol=ssh;" - +SRC_URI_pn-u-boot-ti33x = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2016.05/standard/am335x;protocol=ssh;" +SRC_URI_pn-u-boot-armada = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2017.11/standard/armada-385;protocol=ssh;" SRC_URI_pn-u-boot-imx8-nmhw23 = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2018.03/imx/imx8-nmhw23;protocol=ssh" ## Kernel -KERNEL_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=git;branch=4.19/standard/base;protocol=ssh" +KERNEL_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=git;branch=5.10/standard/base;protocol=ssh" SRC_URI_pn-linux-netmodule = "${KERNEL_SRC}" SRC_URI_pn-linux-netmodule-initramfs = "${KERNEL_SRC}" @@ -21,12 +14,10 @@ KERNEL_HW23_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=gi SRC_URI_pn-linux-netmodule_imx8-nmhw23 = "${KERNEL_HW23_SRC}" SRC_URI_pn-linux-netmodule-initramfs_imx8-nmhw23 = "${KERNEL_HW23_SRC}" -# sys-mon -SRC_URI_pn-scripts-nm = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh" -SRC_URI_pn-json2textlog = "git://gitlab.com/netmodule/tools/json2textlog.git;user=git;branch=develop;protocol=ssh" -SRC_URI_pn-sys-mon = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh" -SRC_URI_pn-sys-mon-native = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh" -SRC_URI_pn-nativesdk-sys-mon = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh" +# tools +SRC_URI_pn-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh" +SRC_URI_pn-sys-mon-native = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh" +SRC_URI_pn-nativesdk-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh" SRC_URI_pn-libnmapp = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh" SRC_URI_pn-libnmapp-native = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh" SRC_URI_pn-nativesdk-libnmapp = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh" diff --git a/machine_select b/machine_select index f92a775..258bde0 100755 --- a/machine_select +++ b/machine_select @@ -14,10 +14,10 @@ HW23="hw23 - VCU2" HW24="hw24 - NB800 facelift" HW25="hw25 - TC Router" HW26="hw26 - NG800" -ProCV2X="ProCV2X - ZF ProCV2X" +VCU3="ZF - VCU3" set -a -select opt in "$HW16" "$HW18" "$HW20" "$HW21" "$HW23" "$HW24" "$HW25" "$HW26" "$ProCV2X" +select opt in "$HW16" "$HW18" "$HW20" "$HW21" "$HW23" "$HW24" "$HW25" "$HW26" "$VCU3" do case $opt in "$HW16") @@ -52,8 +52,8 @@ do MACHINE=am335x-hw26 break ;; - "$ProCV2X") - MACHINE=s32g274a-procv22 + "$VCU3") + MACHINE=s32g274a-vcu3 break ;; *) echo "invalid option $opt";; diff --git a/meta-netmodule-bsp b/meta-netmodule-bsp index 5307f0a..87cf991 160000 --- a/meta-netmodule-bsp +++ b/meta-netmodule-bsp @@ -1 +1 @@ -Subproject commit 5307f0a4f2a92a34af35dd89554c6d787becaa0f +Subproject commit 87cf99189df44ae290407cd40d2e8a76a8c1c14d diff --git a/meta-netmodule-distro b/meta-netmodule-distro index 719b0a2..6c6702a 160000 --- a/meta-netmodule-distro +++ b/meta-netmodule-distro @@ -1 +1 @@ -Subproject commit 719b0a2fdeb6ca1ddb1eafc335368808f3339a67 +Subproject commit 6c6702a8cfa7832153439da5d159fe40533cacb7 diff --git a/meta-netmodule-wlan b/meta-netmodule-wlan index ab04a2a..afeb746 160000 --- a/meta-netmodule-wlan +++ b/meta-netmodule-wlan @@ -1 +1 @@ -Subproject commit ab04a2ac667067516f51ddbd3ac499986a606813 +Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696 diff --git a/meta-openembedded b/meta-openembedded index c1a5068..8ff12bf 160000 --- a/meta-openembedded +++ b/meta-openembedded @@ -1 +1 @@ -Subproject commit c1a50683225b0bf10f8d7a18280acefa7469ecc2 +Subproject commit 8ff12bfffcf0840d5518788a53d88d708ad3aae0 diff --git a/meta-updater b/meta-updater index 5d49b28..f2f5ca0 160000 --- a/meta-updater +++ b/meta-updater @@ -1 +1 @@ -Subproject commit 5d49b28570ed030924ed5d45fbced24d3cb6e588 +Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d diff --git a/meta-vcu3-bsp b/meta-vcu3-bsp new file mode 160000 index 0000000..3917755 --- /dev/null +++ b/meta-vcu3-bsp @@ -0,0 +1 @@ +Subproject commit 3917755bb24a87873b667292d86caddc5663b043 diff --git a/openembedded-core b/openembedded-core index 2cc9e06..8e81d38 160000 --- a/openembedded-core +++ b/openembedded-core @@ -1 +1 @@ -Subproject commit 2cc9e06807026b86038db88c2175c626feadc0be +Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb