meta-netmodule-bsp: use vcu3-llce-can branch

.gitmodules

@@ -16,7 +16,7 @@
 	branch = dunfell
 [submodule "meta-netmodule-bsp"]
 	path = meta-netmodule-bsp
-	url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-bsp.git
+	url = git@gitlab.com:netmodule/procv_v2x/meta-netmodule-bsp.git
 	branch = develop-procv22
 [submodule "meta-netmodule-distro"]
 	path = meta-netmodule-distro
@@ -25,6 +25,3 @@
 [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

README.md

@@ -11,11 +11,14 @@ git submodule init
 git submodule update
 ```
 
+### Copy PFE firmware
+Please make sure that you copy the PFE firmware with the right version meta-netmodule-bsp/recipes-kernel/pfe/pfe_<version> to meta-netmodule-bsp/recipes-kernel/pfe/pfe/. You need to copy the class and util firmware files. This is necessary because the firmware is currently only available under NDA.
+
 ## Selecting hardware target
 The hardware target can be selected by sourcing the machine_select script:
 ```
 source machine_select
-9  # Selecting VCU3
+9  # Selecting ProCV2.2
 ```
 
 ## Building an image
@@ -51,3 +54,79 @@ It can be build with the following commands:
 source env.image-ostree
 bitbake netmodule-linux-image-dev
 ```
+
+## Usage
+
+### 1000BaseT1
+
+The PFE driver comes up automatically. However, it does by default rely on autoneg. This doesn't seem to work with the Göpel Media Converter EasyCON. Therefore, a reset is required. Currently pfe0 shares the reset signal with eth0. That's why the following works:
+```
+brginup.sh enable-pfe
+ifconfig eth0 down
+ifconfig eth0 up
+```
+Now the 1000BaseT1 PHY works in default mode.
+
+### Modem
+The modem is disabled by default. However, it is possible to enable it with the following command:
+```
+bringup.sh enable-modem
+```
+
+To use adb you have to do the following:
+```
+echo 0x2c7c >> ~/.android/adb_usb.ini
+adb shell
+```
+
+### Wifi
+Enable the Wifi module (make sure you enable the modem first):
+```
+bringup.sh enable-wifi
+```
+
+### ADCs
+Read out the SPI ADCs:
+```
+bringup.sh read-adc
+```
+
+### IMU
+To enable the IMU you can call enable-imu.sh:
+```
+bringup.sh enable-imu.sh
+```
+
+To communicate with the imu you can use test-imu.sh:
+```
+# Read/Write
+bringup.sh read-write-imu /dev/spidev1.0 1 2020
+# Read
+bringup.sh read-write-imu /dev/spidev1.0 1
+```
+
+### Secure Element
+To enable the secure elelment call enable-secure-element:
+```
+bringup.sh enable-secure-element
+```
+There is no helper for the secure element available yet. You can use spidev_test to communicate with it:
+```
+spidev_test --help
+```
+
+### V2X
+Enable the V2X and load a firmware (make sure you enable the modem first):
+```
+bringup.sh enable-v2x <path to fw>
+```
+
+### GPIOS
+Set gpio:
+```
+bringup.sh set-gpio <gpio> <value>
+```
+Get gpio:
+```
+bringup.sh get-gpio <gpio>
+```

bitbake

@@ -1 +1 @@
-Subproject commit 0784db7dd0fef6f0621ad8d74372f44e87fef950
+Subproject commit 017a39ed05d065bf28fd38f91bcde8a098300551

build/conf/bblayers.conf

@@ -17,5 +17,4 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-openembedded/meta-networking \
   ${YOCTOROOT}/meta-openembedded/meta-filesystems \
   ${YOCTOROOT}/meta-updater \
-  ${YOCTOROOT}/meta-vcu3-bsp \
   "

build/conf/distro_version.inc

@@ -1 +1 @@
-DISTRO_VERSION = "1.5.2"
+DISTRO_VERSION = "1.2.4"

build/conf/local.conf

@@ -36,5 +36,6 @@ PREMIRRORS_prepend = "\
    https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
 
 require distro_version.inc
+require release_revisions.inc
 require public-mirrors.inc
 require proprietary-dev-tools.inc

build/conf/public-mirrors.inc

@@ -1,12 +1,19 @@
 # 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;"
+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-armada = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2017.11/standard/armada-385;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-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"
+KERNEL_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=git;branch=4.19/standard/base;protocol=ssh"
 SRC_URI_pn-linux-netmodule = "${KERNEL_SRC}"
 SRC_URI_pn-linux-netmodule-initramfs = "${KERNEL_SRC}"
 
@@ -14,10 +21,12 @@ 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}"
 
-# tools
+# sys-mon
-SRC_URI_pn-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-scripts-nm = "git://gitlab.com/netmodule/tools/features.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-json2textlog = "git://gitlab.com/netmodule/tools/json2textlog.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-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"
 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"

machine_select

@@ -14,10 +14,10 @@ HW23="hw23 - VCU2"
 HW24="hw24 - NB800 facelift"
 HW25="hw25 - TC Router"
 HW26="hw26 - NG800"
-VCU3="ZF - VCU3"
+ProCV2X="ProCV2X - ZF ProCV2X"
 
 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" "$ProCV2X"
 do
     case $opt in
         "$HW16")
@@ -52,8 +52,8 @@ do
             MACHINE=am335x-hw26
             break
             ;;
-        "$VCU3")
+        "$ProCV2X")
-            MACHINE=s32g274a-vcu3
+            MACHINE=s32g274a-procv22
             break
             ;;
         *) echo "invalid option $opt";;

meta-netmodule-bsp

@@ -1 +1 @@
-Subproject commit 87cf99189df44ae290407cd40d2e8a76a8c1c14d
+Subproject commit 5e4566b521048c58b6b4ad5e8102ca2280447761

meta-netmodule-distro

@@ -1 +1 @@
-Subproject commit 6c6702a8cfa7832153439da5d159fe40533cacb7
+Subproject commit 719b0a2fdeb6ca1ddb1eafc335368808f3339a67

meta-netmodule-wlan

@@ -1 +1 @@
-Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696
+Subproject commit ab04a2ac667067516f51ddbd3ac499986a606813

meta-openembedded

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

meta-updater

@@ -1 +1 @@
-Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d
+Subproject commit 5d49b28570ed030924ed5d45fbced24d3cb6e588

meta-vcu3-bsp

@@ -1 +0,0 @@
-Subproject commit 728aed98b3a83a4c72f7d0264b2437dc3dc74036

openembedded-core

@@ -1 +1 @@
-Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb
+Subproject commit 2cc9e06807026b86038db88c2175c626feadc0be