Compare commits

..

17 Commits

Author SHA1 Message Date
Alexandre Bard 07877a86ee Update meta-vcu3-bsp with changes for kirkstone
id:400566
2024-03-18 21:26:48 +01:00
Alexandre Bard 94d8d947d0 Update local.conf to be compatible with kirkstone
id:400566
2024-03-05 18:49:43 +01:00
Alexandre Bard c4d5f8601c Remove template from meta-netmodule-distro 2024-03-04 17:05:36 +01:00
Alexandre Bard fa057bd159 Update external layers to kirkstone
id:400566
2024-03-04 15:36:26 +01:00
Alexandre Bard 76c63e3b39 Remove meta-netmodule* layers
So that everything is in meta-vcu3-bsp layer for the upgrade to
kirkstone.

id:400566
2024-03-04 15:22:13 +01:00
Stefan Eichenberger 3887f060df meta-vcu3-bsp: update to latest version 2024-01-09 12:22:42 +01:00
Lucien Mueller 4818e3ee98 meta-vcu3-bsp: update to latest version 2023-12-05 13:43:22 +01:00
Stefan Eichenberger c5c870c03d meta-vcu3-bsp: update to latest version 2023-10-25 16:10:21 +02:00
Stefan Eichenberger 9768a5d8ae meta-vcu3-bsp: update to latest version 2023-10-25 15:39:41 +02:00
Stefan Eichenberger 778b441e1f meta-vcu3-bsp: update to latest version 2023-09-21 16:13:22 +02:00
Stefan Eichenberger eae0e80018 meta-vcu3-bsp: update to latest version 2023-08-29 09:11:52 +02:00
Stefan Eichenberger b3d44917d5 machine_select: add Stellantis B2 support 2023-08-17 15:33:37 +02:00
Stefan Eichenberger 42a1e24841 meta-vcu3-bsp: update to latest version 2023-08-17 15:33:24 +02:00
Stefan Eichenberger e7dea0da35 meta-vcu3-bsp: update to bsp36
Update meta-vcu3 to BSP36 from NXP.
2023-06-20 14:33:59 +02:00
Stefan Eichenberger 208588ee31 meta-vcu3-bsp: update to latest version 2023-05-16 15:37:04 +02:00
Stefan Eichenberger 11e765818b meta-vcu3-bsp: update to latest version 2023-02-09 17:30:03 +01:00
Stefan Eichenberger 5db4f85a7e machine_select: Add stellantis vcu3
Add the Stellantis version of the VCU3
2023-02-09 17:29:23 +01:00
17 changed files with 75 additions and 90 deletions

21
.gitmodules vendored
View File

@ -1,30 +1,19 @@
[submodule "bitbake"]
path = bitbake
url = git://git.openembedded.org/bitbake.git
branch = 1.46
branch = 2.0
[submodule "openembedded-core"]
path = openembedded-core
url = git://git.openembedded.org/openembedded-core
branch = dunfell
branch = kirkstone
[submodule "meta-openembedded"]
path = meta-openembedded
url = git://git.openembedded.org/meta-openembedded
branch = dunfell
branch = kirkstone
[submodule "meta-updater"]
path = meta-updater
url = https://github.com/advancedtelematic/meta-updater.git
branch = dunfell
[submodule "meta-netmodule-bsp"]
path = meta-netmodule-bsp
url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-bsp.git
branch = develop-procv22
[submodule "meta-netmodule-distro"]
path = meta-netmodule-distro
url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-distro.git
branch = develop
[submodule "meta-netmodule-wlan"]
path = meta-netmodule-wlan
url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-wlan.git
url = https://github.com/uptane/meta-updater.git
branch = kirkstone
[submodule "meta-vcu3-bsp"]
path = meta-vcu3-bsp
url = git@gitlab.com:netmodule/procv_v2x/meta-vcu3-bsp.git

@ -1 +1 @@
Subproject commit 0784db7dd0fef6f0621ad8d74372f44e87fef950
Subproject commit 40fd5f4eef7460ca67f32cfce8e229e67e1ff607

View File

@ -9,9 +9,6 @@ YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
BBLAYERS ?= " \
${YOCTOROOT}/openembedded-core/meta \
${YOCTOROOT}/meta-netmodule-wlan \
${YOCTOROOT}/meta-netmodule-bsp \
${YOCTOROOT}/meta-netmodule-distro \
${YOCTOROOT}/meta-openembedded/meta-python \
${YOCTOROOT}/meta-openembedded/meta-oe \
${YOCTOROOT}/meta-openembedded/meta-networking \

View File

@ -1,23 +1,23 @@
BB_NUMBER_THREADS ?= "4"
PARALLEL_MAKE ?= "-j 4"
PACKAGE_CLASSES ?= "package_rpm"
USER_CLASSES ?= "buildstats image-mklibs image-prelink"
USER_CLASSES ?= "buildstats"
PATCHRESOLVE = "noop"
BB_DISKMON_DIRS = "\
STOPTASKS,${TMPDIR},1G,100K \
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
STOPTASKS,/tmp,100M,100K \
ABORT,${TMPDIR},100M,1K \
ABORT,${DL_DIR},100M,1K \
ABORT,${SSTATE_DIR},100M,1K \
ABORT,/tmp,10M,1K"
HALT,${TMPDIR},100M,1K \
HALT,${DL_DIR},100M,1K \
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
ASSUME_PROVIDED += "libsdl-native"
CONF_VERSION = "1"
EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
CONF_VERSION = "2"
EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
ERROR_QA_remove += "version-going-backwards"
#WARN_QA_append += "version-going-backwards"
ERROR_QA:remove = "version-going-backwards"
#WARN_QA:append = "version-going-backwards"
#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
#PRSERV_HOST = "localhost:0"
@ -29,7 +29,7 @@ LICENSE_CREATE_PACKAGE = "1"
YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
PREMIRRORS_prepend = "\
PREMIRRORS:prepend = "\
git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
@ -37,4 +37,3 @@ PREMIRRORS_prepend = "\
require distro_version.inc
require public-mirrors.inc
require proprietary-dev-tools.inc

View File

@ -1,6 +0,0 @@
# These tools are not publicly available be usually included
# in the development image
IMAGE_INSTALL_remove += "\
battery-test \
"

View File

@ -1,31 +1,31 @@
# Changing internal SRC_URI to public
## Bootloaders
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"
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=5.10/standard/base;protocol=ssh"
SRC_URI_pn-linux-netmodule = "${KERNEL_SRC}"
SRC_URI_pn-linux-netmodule-initramfs = "${KERNEL_SRC}"
SRC_URI:pn-linux-netmodule = "${KERNEL_SRC}"
SRC_URI:pn-linux-netmodule-initramfs = "${KERNEL_SRC}"
KERNEL_HW23_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=git;branch=4.14/nxp/nmhw23;protocol=ssh"
SRC_URI_pn-linux-netmodule_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
SRC_URI_pn-linux-netmodule-initramfs_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
SRC_URI:pn-linux-netmodule_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
SRC_URI:pn-linux-netmodule-initramfs_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
# 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"
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"
# Removing AUTOREV from uneeded recipes pointing to internal repos
## distro layer
SRCREV_pn-battery-test = "0"
SRCREV:pn-battery-test = "0"
## bsp layer
SRCREV_pn-dt-overlay = "0"
SRCREV:pn-dt-overlay = "0"

View File

@ -1,29 +1,29 @@
# bootloader and similar parts
SRCREV_pn-u-boot-imx8-nmhw23 = "5cdce0ed934bd2c536412687fda4fa8d7b8fc2c1"
SRCREV_pn-u-boot-am335x-nrhw20-v1 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV_pn-u-boot-am335x-nmhw24 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV_pn-u-boot-am335x-nmhw21 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV_pn-u-boot-am335x-hw25 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV_pn-imx-boot = "dd0234001713623c79be92b60fa88bc07b07f24f"
SRCREV_pn-imx-atf = "413e93e10ee4838e9a68b190f1468722f6385e0e"
SRCREV_pn-bootloader-config = "c673f5ea95ac128e1f28072af9e3d6737a64ca31"
SRCREV:pn-u-boot-imx8-nmhw23 = "5cdce0ed934bd2c536412687fda4fa8d7b8fc2c1"
SRCREV:pn-u-boot-am335x-nrhw20-v1 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV:pn-u-boot-am335x-nmhw24 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV:pn-u-boot-am335x-nmhw21 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV:pn-u-boot-am335x-hw25 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
SRCREV:pn-imx-boot = "dd0234001713623c79be92b60fa88bc07b07f24f"
SRCREV:pn-imx-atf = "413e93e10ee4838e9a68b190f1468722f6385e0e"
SRCREV:pn-bootloader-config = "c673f5ea95ac128e1f28072af9e3d6737a64ca31"
# common parts
SRCREV_pn-glibc = "f84949f1c4bbf20e6a1d9a5859cf012cde060ede"
SRCREV_pn-gnss-mgr = "f48c652849be55625bd430b6fa9aa282cbd2a735"
SRCREV_pn-gpsd = "7c962c4a38caf807c5be1ee008163a33a42e1d26"
SRCREV_pn-json2textlog = "8dd3c4896bfe1d738594c19377dcf089a51f2271"
SRCREV_pn-libnmapp = "2efe9683f3500b070f90a744a191a87716d70597"
SRCREV_pn-libnmapp-native = "2efe9683f3500b070f90a744a191a87716d70597"
SRCREV_pn-modemmanager = "35ef2f387bf53f0601901a5f08ab0f6bf57105c4"
SRCREV_pn-nmhw-fwupdate = "3fdaacd31b48d77ae3f3404975fd14bc1d638e60"
SRCREV_pn-nmubxlib = "67bf3ae1a20b34806b678d4ca6eb31fa491642a1"
SRCREV_pn-scripts-nm = "9391209e44f1e47030a180b05e4af19b11ee03a8"
SRCREV_pn-speedtest-cli = "42e96b13dda2afabbcec2622612d13495a415caa"
SRCREV_pn-ssc-broker-driver = "e6c704fe4f8a92004b2b1c3b80c28459549a9f9c"
SRCREV_pn-ssc-extmod-driver = "5fe9df71b7c4489f7b016eb820f53a06e22b4ae2"
SRCREV_pn-ssc-sysstate-driver = "1a7f52a4bfc2e2d5fb4f90e2e2086865196afbc3"
SRCREV_pn-sys-mon = "9391209e44f1e47030a180b05e4af19b11ee03a8"
SRCREV_pn-sys-mon-native = "9391209e44f1e47030a180b05e4af19b11ee03a8"
SRCREV_pn-udev-rules-nmhw = "ff36bf86011c2d224695c2121a3adb7160dc2b3f"
SRCREV_pn-wlconf-bin = "cf9bfca0a80f02eb4a4245ab0144f8e956e24b95"
SRCREV_pn-wwan-config = "17c5e33adb2dbfe3675e5999a881b1092e86d40c"
SRCREV:pn-glibc = "f84949f1c4bbf20e6a1d9a5859cf012cde060ede"
SRCREV:pn-gnss-mgr = "f48c652849be55625bd430b6fa9aa282cbd2a735"
SRCREV:pn-gpsd = "7c962c4a38caf807c5be1ee008163a33a42e1d26"
SRCREV:pn-json2textlog = "8dd3c4896bfe1d738594c19377dcf089a51f2271"
SRCREV:pn-libnmapp = "2efe9683f3500b070f90a744a191a87716d70597"
SRCREV:pn-libnmapp-native = "2efe9683f3500b070f90a744a191a87716d70597"
SRCREV:pn-modemmanager = "35ef2f387bf53f0601901a5f08ab0f6bf57105c4"
SRCREV:pn-nmhw-fwupdate = "3fdaacd31b48d77ae3f3404975fd14bc1d638e60"
SRCREV:pn-nmubxlib = "67bf3ae1a20b34806b678d4ca6eb31fa491642a1"
SRCREV:pn-scripts-nm = "9391209e44f1e47030a180b05e4af19b11ee03a8"
SRCREV:pn-speedtest-cli = "42e96b13dda2afabbcec2622612d13495a415caa"
SRCREV:pn-ssc-broker-driver = "e6c704fe4f8a92004b2b1c3b80c28459549a9f9c"
SRCREV:pn-ssc-extmod-driver = "5fe9df71b7c4489f7b016eb820f53a06e22b4ae2"
SRCREV:pn-ssc-sysstate-driver = "1a7f52a4bfc2e2d5fb4f90e2e2086865196afbc3"
SRCREV:pn-sys-mon = "9391209e44f1e47030a180b05e4af19b11ee03a8"
SRCREV:pn-sys-mon-native = "9391209e44f1e47030a180b05e4af19b11ee03a8"
SRCREV:pn-udev-rules-nmhw = "ff36bf86011c2d224695c2121a3adb7160dc2b3f"
SRCREV:pn-wlconf-bin = "cf9bfca0a80f02eb4a4245ab0144f8e956e24b95"
SRCREV:pn-wwan-config = "17c5e33adb2dbfe3675e5999a881b1092e86d40c"

View File

@ -1 +1 @@
../meta-netmodule-distro/conf
meta/conf

View File

@ -15,7 +15,6 @@ echo Building for machine $MACHINE, distro: $DISTRO
OSTREE_OSNAME=nm-linux
BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE_TYPE DISTRO_OSTREE DISTRO_TYPE"
BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONSMACHINE_TYPE DISTRO_OSTREE DISTRO_TYPE"
TEMPLATECONF="../meta-netmodule-distro/conf"
. ./openembedded-core/oe-init-build-env

View File

@ -15,9 +15,11 @@ HW24="hw24 - NB800 facelift"
HW25="hw25 - TC Router"
HW26="hw26 - NG800"
VCU3="ZF - VCU3"
VCU3_ST="ZF - VCU3 Stellantis"
VCU3_ST_B2="ZF - VCU3 Stellantis B2"
set -a
select opt in "$HW16" "$HW18" "$HW20" "$HW21" "$HW23" "$HW24" "$HW25" "$HW26" "$VCU3"
select opt in "$HW16" "$HW18" "$HW20" "$HW21" "$HW23" "$HW24" "$HW25" "$HW26" "$VCU3" "$VCU3_ST" "$VCU3_ST_B2";
do
case $opt in
"$HW16")
@ -56,6 +58,14 @@ do
MACHINE=s32g274a-vcu3
break
;;
"$VCU3_ST")
MACHINE=s32g274a-vcu3-stellantis
break
;;
"$VCU3_ST_B2")
MACHINE=s32g274a-vcu3-stellantis-b2
break
;;
*) echo "invalid option $opt";;
esac
done

@ -1 +0,0 @@
Subproject commit 87cf99189df44ae290407cd40d2e8a76a8c1c14d

@ -1 +0,0 @@
Subproject commit 6c6702a8cfa7832153439da5d159fe40533cacb7

@ -1 +0,0 @@
Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696

@ -1 +1 @@
Subproject commit 8ff12bfffcf0840d5518788a53d88d708ad3aae0
Subproject commit fda737ec0cc1d2a5217548a560074a8e4d5ec580

@ -1 +1 @@
Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d
Subproject commit f49e4acae1fad18ad43d29cb3a43300bb708fa65

@ -1 +1 @@
Subproject commit 728aed98b3a83a4c72f7d0264b2437dc3dc74036
Subproject commit 151e0bab53c9522101d065a44953666060b52689

@ -1 +1 @@
Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb
Subproject commit cca0971a7d92d823cc0c2b16cf14a7b2ed8ecb61