layers: meta-nwl-marvell-bsp: add initial layer and add Nitroc support

Add an initial Marvell BSP layer which supports Nitroc. It is different
from CoreOS for now because it uses a newer kernel, U-Boot and trusted
firmware.

Signed-off-by: Stefan Eichenberger <stefan.eichenberger@netmodule.com>

coreos

@@ -1 +1 @@
-Subproject commit fd9b3e0a0ff210f95a384dc884dcf848adcc478f
+Subproject commit 91cff2b07a0f0df9accc8a368beefaecbd5e558b

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw14.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW14 based routers like NB3800
 #@DESCRIPTION: Machine configuration for the NBHW14 based routers http://netmodule.com/en/products/iot-routers
 
-require include/armada.inc
+require conf/machine/include/armada.inc
 
 NRHW = "14"
 NM_MODELS = "3701 3711 3800"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw16.conf

@@ -2,12 +2,12 @@
 #@NAME: NRHW16 based routers like NB800
 #@DESCRIPTION: Machine configuration for the NBHW16 based routers http://netmodule.com/en/products/iot-routers
 
-require include/ti33x.inc
+require conf/machine/include/ti33x.inc
 
 NRHW = "16"
 NM_MODELS = "800"
 
 # WARNING: This file needs to be kept in sync with HW24. Therefor use the common include:
-require include/am335x-nrhw16-nrhw24.inc
+require conf/machine/include/am335x-nrhw16-nrhw24.inc
 
 UBOOT_MACHINE = "am335x_nbhw16_defconfig"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw17.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW14 based routers like NB2800
 #@DESCRIPTION: Machine configuration for the NBHW17 based routers http://netmodule.com/en/products/iot-routers
 
-require include/armada.inc
+require conf/machine/include/armada.inc
 
 NRHW = "17"
 NM_MODELS = "2800 2810"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw18.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW18 based routers like NB1800
 #@DESCRIPTION: Machine configuration for the NBHW18 based routers http://netmodule.com/en/products/iot-routers
 
-require include/armada.inc
+require conf/machine/include/armada.inc
 
 NRHW = "18"
 NM_MODELS = "1800 1810"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW16 based routers like NB800
 #@DESCRIPTION: Machine configuration for the NBHW16 based routers http://netmodule.com/en/products/iot-routers
 
-require include/ti33x.inc
+require conf/machine/include/ti33x.inc
 
 NRHW = "20"
 NM_MODELS = "1601 B-1601"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW22 based routers like NB650 / Phoenix Timeserver
 #@DESCRIPTION: Machine configuration for the NBHW22 based routers http://netmodule.com/en/products/iot-routers
 
-require include/ti33x.inc
+require conf/machine/include/ti33x.inc
 
 NRHW = "22"
 NM_MODELS = "650"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw24.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW24 based routers like NB800 facelift / NB800mk2 (or however you like to call it)
 #@DESCRIPTION: Machine configuration for the NBHW24 based routers http://netmodule.com/en/products/iot-routers
 
-require include/ti33x.inc
+require conf/machine/include/ti33x.inc
 
 NRHW = "24"
 NM_MODELS = "B-800"
@@ -10,5 +10,5 @@ NM_MODELS = "B-800"
 UBOOT_MACHINE = "am335x_nrhw24_defconfig"
 
 # WARNING: This file needs to be kept in sync with HW24. Therefor use the common include:
-require include/am335x-nrhw16-nrhw24.inc
+require conf/machine/include/am335x-nrhw16-nrhw24.inc
 

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf

@@ -2,7 +2,7 @@
 #@NAME: NRHW25 based routers like TC-Router
 #@DESCRIPTION: Machine configuration for the NBHW24 based routers http://netmodule.com/en/products/iot-routers
 
-require include/ti33x.inc
+require conf/machine/include/ti33x.inc
 
 NRHW = "25"
 NM_MODELS ?= "660 670"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf

@@ -2,7 +2,7 @@
 #@NAME: HW26 based routers like NG800
 #@DESCRIPTION: Machine configuration for the HW26 based routers http://netmodule.com/en/products/iot-routers
 
-require include/ti33x.inc
+require conf/machine/include/ti33x.inc
 
 NRHW = "26"
 NM_MODELS = "G-800"

layers/meta-nwl-distro/classes/nwl-image.bbclass

@@ -1,4 +1,6 @@
 # Base classe for all image based on NWL
+COREOS_IMAGE_GENERATE_SWU = "0"
+COREOS_IMAGE_GENERATE_INSTALLER = "0"
 
 inherit coreos-image
 

layers/meta-nwl-distro/conf/distro/nwl.conf

@@ -13,6 +13,14 @@ MAINTAINER = "Netmodule Software Teams"
 DISTRO_VERSION = "2023.03"
 DISTRO_CODENAME = "NWL 2023 Edition (DRAFT)"
 
+# Use by default the in-tree developers set of keys for Secure Boot
+COREOS_EFI_SECUREBOOT_KEYDIR ?= "${NWL_ROOT}/layers/meta-nwl-distro/files/keys"
+
+# CoreOS ensure that COREOS_EFI_SECUREBOOT_KEYDIR has a vardep on the
+# hash of each used keys. We don't have to depends on the full path
+# to NWL_ROOT in the hash of COREOS_EFI_SECUREBOOT_KEYDIR
+COREOS_EFI_SECUREBOOT_KEYDIR[vardepsexclude] = "NWL_ROOT"
+
 # Here you can override settings from the CoreOS distro or from
 # OpenEmbedded-core. But keep in mind that the CoreOS team doesn't support
 # all the features of OpenEmbedded-Core. We have added some checks for some
@@ -28,21 +36,10 @@ DISTRO_FEATURES:remove = "ptest virtualization"
 PACKAGECONFIG:pn-systemd = "usrmerge rfkill kmod timedated vconsole"
 # systemd-conf provides a packageconfig for a default dhcp client that we don't need
 PACKAGECONFIG:pn-systemd-conf = ""
-PACKAGECONFIG:pn-networkmanager = "systemd nss gnutls wifi bluez5 nmcli modemmanager"
+PACKAGECONFIG:pn-networkmanager = "systemd nss gnutls wifi bluez5 nmcli"
-# NetworkManager is starting dnsmasq when it needs it for AP mode
-SYSTEMD_AUTO_ENABLE:pn-dnsmasq = "disable"
-
 PACKAGECONFIG:pn-bluez5 = "systemd udev"
 
-# ModemManager is started by wwan-config
+# Wit busybox "less" the output of "nmcli c" does not show up properly
-SYSTEMD_AUTO_ENABLE:pn-modemmanager = "disable"
-PACKAGECONFIG:pn-modemmanager = "systemd qmi"
-EXTRA_OEMESON:pn-modemmanager = "-Dauto_features=disabled -Dplugin_generic=enabled"
-
-# Enable the python3 bindings for libgpiod
-PACKAGECONFIG:append:pn-libgpiod = " python3"
-
-# With busybox "less" the output of "nmcli c" does not show up properly
 RDEPENDS:networkmanager-nmcli += "less"
 
 

layers/meta-nwl-distro/files/keys/KEK.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBzCCAe+gAwIBAgIUMBZqg8KVjLqv+5xzlrr//O78ys0wDQYJKoZIhvcNAQEL
+BQAwEzERMA8GA1UEAwwIVEVTVF9LRUswHhcNMjMwNzI2MDg0MDU2WhcNMjQwNzI1
+MDg0MDU2WjATMREwDwYDVQQDDAhURVNUX0tFSzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALVZOmvAVYvmOjMITsZiGlKfeafohprnKyC/MEttlceBzwEu
+DSXbvXaGpoaT+SsDkutcJIMkfVte4EEM7m7tmzfJT10++++saG7wzFRfn4qCiz7s
+NVGp7lSQGwPKlqToHtEc3n62Ni9/t2opMbjAMh4MigYmmhgRb0EjubnxkQi02oXQ
+b6vAMsqxsWgHTHQIqMQrMpWP+rxwVB2/0u4GfUvyROIP77gUweINaiaZFNwg5j/M
+HbNpE/YIzvOO1iiut7fGuRq8nzKsRa6v/5sQxpQCiFhEeW+L2TBBLWcn38HkGhZQ
+HL1wrMwIFnxhts+c/iXX/04hX7XLaE2VP8WbZq8CAwEAAaNTMFEwHQYDVR0OBBYE
+FGd2nYmDABv3X2xX5ChFTBGAPT9NMB8GA1UdIwQYMBaAFGd2nYmDABv3X2xX5ChF
+TBGAPT9NMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAK+PrMYv
+/Riu59mNJBBg0IQ5Lg8njkZDJkTUNoPqfduxI8hShCVTazZTOUISrPCKvYWpti4r
+8OAuw/17vBcQzHa2ayJwaiKYL/xC94xxcMwZDsfIul/2TvMsUjh8Tbl6stVLhI5J
+Yga+ytHKkBvTw7whW7uqZAlynk1lkFlCuK5/rTD+WcZADat2kcXVw4ILUSP2QNIj
+HSW3q7YaerxUavPyUiYHTMmjMQtaqjvRv6AZaOFiPvl5/s0HIK2yfwGGyMbXgR/M
+70lqHtrgLORkAruWv35v16BBNaX1rQHholk+HIsjg1kTcjS5Tg9NAF1TAKH4G6LL
+YvNkqBtolbJKmjs=
+-----END CERTIFICATE-----

layers/meta-nwl-distro/files/keys/KEK.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1WTprwFWL5joz
+CE7GYhpSn3mn6Iaa5ysgvzBLbZXHgc8BLg0l2712hqaGk/krA5LrXCSDJH1bXuBB
+DO5u7Zs3yU9dPvvvrGhu8MxUX5+Kgos+7DVRqe5UkBsDypak6B7RHN5+tjYvf7dq
+KTG4wDIeDIoGJpoYEW9BI7m58ZEItNqF0G+rwDLKsbFoB0x0CKjEKzKVj/q8cFQd
+v9LuBn1L8kTiD++4FMHiDWommRTcIOY/zB2zaRP2CM7zjtYorre3xrkavJ8yrEWu
+r/+bEMaUAohYRHlvi9kwQS1nJ9/B5BoWUBy9cKzMCBZ8YbbPnP4l1/9OIV+1y2hN
+lT/Fm2avAgMBAAECggEAT5LwnJlPsEx8myn5Dvm7HSgXBMN2VQA8n2jlMyPJxjpC
+b/0aDdOnBhw9c+34NpSh4h6TcuwPCYnPExwuf4RJSKhP59WcTOW1CYEl15wB8JAp
+s5mIJ+ZNytNU10wM4B1ucEmfo7AmhJ8hBzc+Nxg2pZLQ+bP0h70WuVmIxHuoLU4X
+f+V3x0jl5Dgeh0L+j61b6jDYcQmVZmldugj+HxoyJPXZ3z3VcCBHzcX+JdA1YQtz
+9YwH6njxFUs6sTIWpavIphWy7oiulGhRj+8sU6cDpO932T0oLrvFVIPCM1yVSw+k
+h23wb8I20CN/qdjc8nk9uQ1kJfGhbEFCYq+QoQ6F+QKBgQD26N/yhslAVUH+tYQK
+gaQwYJMowj32b77WHIxnTSxmrCZ+Hjelpx57fuBilgvAJtlwxZpd8PJM8fUQff4S
+ob8YGrOg7qLzmtWLnx5VREYekLl6aHsOIlnaQLnsGUHEj6NQfn/2U4BRLv9G1zI+
+Y1SzwfX8QRFOFP9Q6tZXSd7A2wKBgQC8BnB/BmN2jqEgDF3eud+L6mAC5o7Jv/8X
+Xi1/w6OImzhm/poVb9pU5cFAZdzqJ9oIg78YAKERFHjfdLHtASZ1RF7DR2ysVxFC
+R5xPYMttmyfTE/umgIRLwkljMZ5ZTRNvPDkpT0n0BkXxs7D45XB7cEYPzgvUAhwb
+ezEKSc2fvQKBgFHBIgXn41NN56Ay8hmYe4kZMSDZ0DJ9Ja83nLXHs9/7OHOiBcLv
+5wP1Ks7558IkGvNgOpDIazJXG1HupeX9cIzGqpuq6IHIztSAR0bsaFtOiFujpLs1
+XJMLw4QNiN1Qwj6w5CXn2CEJcrU+JADMWwt6Obzgvp4gDbn5SCd26i7pAoGABpcP
+MFSP/eLH4PCuBZVsMWI4lUFxdb7F+RKy84xu2eXe1zVLPz8ZXupimJg5Yvecm7nK
+Y9P50ThveB2F8vGcYHXSAHQraervTuxlnR6eYqwSfEJyCobsnB8mJVTi4Oxjpv1s
+X3dI90WVBACxTjf0dk8cFYe6QGcGhywNLvghPd0CgYEAwHu7S16k/+5JL81QrJMS
+lGUxdJ7xgPZp6G2lnzHKrumUXsE7u9efB3t5RauDX51dLOqaJGzoTVF403Cx/Xps
+kWkWiN8r7g22gHvYWO43mvVyGZ+VUsu5D50gndaDdoCfWoHRZ6UbBPdhAztI/ePU
+kUM2jC74IiCINRyszkcfEUw=
+-----END PRIVATE KEY-----

layers/meta-nwl-distro/files/keys/PK.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBTCCAe2gAwIBAgIUaqd3t7MrDxsQCyBIp+ldFIexS+YwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVEVTVF9QSzAeFw0yMzA3MjYwODQwNTZaFw0yNDA3MjUw
+ODQwNTZaMBIxEDAOBgNVBAMMB1RFU1RfUEswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDio1QgioSSx8tzr2YfYFxwxMZvONXTBgyEo1qH9eVnDhd/nN66
+odj0JOWQ6ZxZ1thAA94M0k9uNM60AYd4IPJfIok//MQbICzKbpSp8sTePBui2dxx
+/Su3lkNim9ZkQ5hjbJHhogzF31DfSRhUej9mr5yzDjD+liGtvRKbLZ4RCEx3WeDn
+taS3YojRNBXoNKumr/e6m+qACh9lOswAgAFw0FvS6v5j3y2AzBhL76pBNJ2+phzv
+uDk2xFGz5Hwa2JnjdwbjFJTGMpHRoI8m9PCM9fTAXmgwTaXgP3/6d4HgxHyIyNMK
+oPkPUp26CxpXeP+x6XfHlcUZdE3Agg4TTmaBAgMBAAGjUzBRMB0GA1UdDgQWBBSh
+s2prPUwajZ++I9D8NqQprrUlPTAfBgNVHSMEGDAWgBShs2prPUwajZ++I9D8NqQp
+rrUlPTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBBhsVJzuy2
+BMJft7nzLjplh5234R03/YMieMG3ryOclPaAj8nuEkIRzgE3uJdS/121T2A5wReW
+Pg6o21bPGljXHHGFS6Xh2bav3WLWtB8G2HXQ5xum0sXcj58cNc3DGEq/ECDT+wcX
+Y2RL3RHMZflSndXtcGnqT+9PrgCKaNaxtrIoIWk8SI6p2LEcHbidDiEJ5JHvUr4r
+BWhLsgKmoGCDQsOPAz6ZXZPR34VF56BAVBLAJPymFiV5O/GGL99UfHhEXBO5kPt3
+ha1iPedOfxge+nRuGYxlGF0bcA7gZhPPzuy5rZSTZtXaNMWf8/Hteo18muX3aDqr
+ekkVlpgnXEeJ
+-----END CERTIFICATE-----

layers/meta-nwl-distro/files/keys/PK.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDio1QgioSSx8tz
+r2YfYFxwxMZvONXTBgyEo1qH9eVnDhd/nN66odj0JOWQ6ZxZ1thAA94M0k9uNM60
+AYd4IPJfIok//MQbICzKbpSp8sTePBui2dxx/Su3lkNim9ZkQ5hjbJHhogzF31Df
+SRhUej9mr5yzDjD+liGtvRKbLZ4RCEx3WeDntaS3YojRNBXoNKumr/e6m+qACh9l
+OswAgAFw0FvS6v5j3y2AzBhL76pBNJ2+phzvuDk2xFGz5Hwa2JnjdwbjFJTGMpHR
+oI8m9PCM9fTAXmgwTaXgP3/6d4HgxHyIyNMKoPkPUp26CxpXeP+x6XfHlcUZdE3A
+gg4TTmaBAgMBAAECggEAKzOAC03sNICCPzSNjmiTZmmT+8qFM9sA0t3CmY0dY/YT
+M5+m80N7tBo+ak+lnphuE1HJZ39FZdgKGNT7ykHZgZn3OKvJg/QvpYzLqNOehFBH
+4lSOCWp9hVrO0IKtLOKXr0gYTL7TmXpWk6F+0keVQ1ExWQ5Y94aNt+0FGXBqI4uq
+ENDH3UfFIIZjtoyO4xLa3FBqj19lNsj/RIGAo/H2RgOUAIoG8N6uHBszROd48w1H
+CUgdtCCL1YE2zoDcAcmFTUFI1KA6y5t7n248ZRkRlDZVeeGDSCcH9zFkiy41Vpct
+Ej7BPdCU/t6F3axqXahtkDAAuRKfWjytoVa8iekX0wKBgQD2k0oee/4qaIv5M0Xx
+ZNRcptMCkmX354XfFcWMgLchK1oloZNtLjvntgXmiK6jAGCR8yG1NWFwOB2vhgE0
+UuqU+Ah4JMJHivYVlqhUzFVASYt1XLIrxglHDVq05gfkMjUwVUavB90KPHXwLTJE
+/5iMvyBO7NCJxGXtnwsKw5fKhwKBgQDrTPRbibb1BSCDSCTZHoyVYxTFX5Tyuas3
+Wu2bRmTWo/RsZHhAumemlOIjX/6gRMn2SYAvH4j7V9+V4SFprrajEDQaACwYbRP8
+31yaUAUPbx4b1VgCY0XVS6CCExQOVQdT9YsQueNcmhZ2HU/aELN0InMSwyf+9F90
+vEGU79ZgtwKBgBcw+0OqvdkXRDMIE4gEx8R/HFGdm2GZsQmuboosgQzpmuz3KXqX
+YqMEh8GLEYHbQzn2+DCm+KcpYAFmRS66rb2dJo7GRk+cTlDxfpubLFmDkU5UjZ14
+Xt8D7ogdKpjX8BC/tIo53xxbW2xfk97Re3OhdlR2CZcrlbqnvs4gX2J5AoGBALeM
+oTVi2SCLLlCaj3v7E6lY0BQjOnqZkVEuEhnFMNYqsXl4akH75u0QSNNVh7gX0P/Z
+WC/qRp3ib1xocPsSug+7jRkXN06akDP7PS5262udv3vw0aWTMR9wzjWJkmSXuY6q
+BSA4EX7kCE99EBRIYORgFyn0qJd+o5PZYsM+0BlDAoGBALCEcSsZYWAX+k6/6EsA
+kax0KscOFHji62PSLuWJX7PdLyGeAFnIKfm6X/RKXTInH+1dLJI/BXPuxrKIQFjB
+CUrhmcwdSZ690mQLogT1tFAAt4+FfdGn8cnlPn9r8je/+6AR4sHUkbDTUJgBE3YG
+/OVVo+MW242kcym893qgkPS/
+-----END PRIVATE KEY-----

layers/meta-nwl-distro/files/keys/db.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBTCCAe2gAwIBAgIUL8w6OMWe5milePbOVue9IyI4pG4wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVEVTVF9kYjAeFw0yMzA3MjYwODQwNTZaFw0yNDA3MjUw
+ODQwNTZaMBIxEDAOBgNVBAMMB1RFU1RfZGIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCbGXtPx/xRCDHqPkUSC/g08eH4IQHW2ku7IJwGd3MOfB+hMLVN
+YSMNNx2ltFguPm+bh1rDsT+6Lq+RiXf++KXjzpy7ShRyBQ6Xjy5hfz0hR6CtDonG
+RpBmndgwl2yUVhpdgD0BZzhqO5OzmONqZpP968yIRts7Xl1zF2Z63/EiWdOY5m6Y
+WaE3inRr2W0GttJ55eqVFeBRTX2tASyrh+b1NvWlo52phs/EAb2CCE+cUC82S68Q
+tMsyvIGGNRiBr9tQ5x9rRtPIens8AK9/H9K8rG+ldXcAsop8C4SvQg+hBW8ViHEu
+9EQ1c9N3vA+KE3IP91jvRMP3HONxDWok4pjXAgMBAAGjUzBRMB0GA1UdDgQWBBRl
+oRIc0AjAlJG4xzJAYA3RqoPVAzAfBgNVHSMEGDAWgBRloRIc0AjAlJG4xzJAYA3R
+qoPVAzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBCnMDK+noa
+oYJZZ4H1dvqnjAk2C9Wy2UpeNbM6igFRQUgK6W/4WbUDeHktVB2/X5CqwYJxLC+Y
+S1qNVUiabS4MuuXfGCdvJIcPRUcnx1RIUQL2VpE7I9Z1LQ1qAvJt5Bx1eyKdy/+O
+wYMHQAAcd7lQuwnFLtOgHrOqHOtcp8jiltCoivEIyc+RyZrhq+w8xkZOvhIJ+Nxv
+lo41xQKcXHU1bVV7O0FEyFv7Sj+VRo/Os2Eesk1mEYDiqYfF2mEvFnY+tj8e7jxJ
+N9lRS7mb/5iBObZp6sv2y4afJfzAXDPEt7QVMDORjUqPHhIlkjCpE0/AIwbJVnvd
+5x4tiZjDcVZZ
+-----END CERTIFICATE-----

layers/meta-nwl-distro/files/keys/db.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCbGXtPx/xRCDHq
+PkUSC/g08eH4IQHW2ku7IJwGd3MOfB+hMLVNYSMNNx2ltFguPm+bh1rDsT+6Lq+R
+iXf++KXjzpy7ShRyBQ6Xjy5hfz0hR6CtDonGRpBmndgwl2yUVhpdgD0BZzhqO5Oz
+mONqZpP968yIRts7Xl1zF2Z63/EiWdOY5m6YWaE3inRr2W0GttJ55eqVFeBRTX2t
+ASyrh+b1NvWlo52phs/EAb2CCE+cUC82S68QtMsyvIGGNRiBr9tQ5x9rRtPIens8
+AK9/H9K8rG+ldXcAsop8C4SvQg+hBW8ViHEu9EQ1c9N3vA+KE3IP91jvRMP3HONx
+DWok4pjXAgMBAAECggEAORiyWnZmnnYD2hW+W5xobSU2aJ/OC4glJOgmSAMlKgnr
+ou1JcQj3XGAT2/J+G9gEQh8b/Lp9mU6id1NCB20FtM1UyWXGDQtricO98Upj+KJj
+thGKCqHjesNU2N6FrD3eStlwm9mh3Qm9n/oCjiLhDDMIAosDHeHpSPsuUMGsBVa0
+zDcmcpujgb/aHWw5Iy9yy2Po+M4X2faLljZWwwFvgBDhftlVRGyZOwuUc+TxL6/v
+HEmYGhsDiEle6XiqcV0hVt0obeic7yxQOPEahWbwLdLjrO+Wx1GaTsxbwfqLWU0g
+ut8Te8+8RJiZGdT2mbtbkGiXrN2CbcPfkCvuzDE/UQKBgQDaLtEus8s6tVo9lvh/
+phtb0mwY9dQ7gekrbjVmlHl1Yrtc4UTP4u1MwKu1B8t6Oe0s3i2iYtre2z1F6MmR
+cr1wweN4PNAZ5/6jwsTDDfUEAWPq+vriics5YmyCL9nLaBk4b7/3TZNpmBn/UuOu
+JpFeAhLC3QG9XubHF0mEcKPicwKBgQC1+4ng0jg3jQofTdx29yDND5q1ftbZHx5Q
+n9g4gR8Y9Gr8ETox3GVfiKTAIzaE53UfzEHpEmj756XdggxZIkNvHxWoIAsEEiwY
+nI3ztz9rIQfx+10FVY9VrgTZDDYlv9NMcUg6cEuGbH0lKiZoqRLyVcqGWgWTF2Qg
+gnll54RDDQKBgF3aK7M6Nd6gKhw6N9S5ACXEYyltfYjHfiRneOMSVRjQiqYOZMpD
+5C3S50ms+7Ms/cACJoEmot2gU0AiPaqqP6EkVhPfnOi36cpJutfoxg+eBXwL0CXo
+fhnGI8TwjnA37DlhoKLhpNqUSgKRhkzgXEGjBKz74oayLvVPKBmnVmfPAoGAditM
+MMzQ7GGNPR6WFjoK9p03XLtsT7jBOqFRCf/ubYnpHp0hKNdwjERylsFG2a5ig69i
+7TGjMlANiHS2B/sTxshsi6ui+5XBRIoEM0m+yJW+TwdmM9yHIp/JThd74a9aSb0V
+pbzdjgBMkyF3p2aCgxHqXKuACy+ZOPMAWYeoftECgYEAjKEUKfsZIZfgHicZYxbZ
+gVrIG/ifGKpzPdFYtR2Yq0F7/ECrKf4VRRpfVbs+KPOfaSYtlE400MecOgLsxK76
+LMaSsuJB/YURrUjjR7O5orupVAlIG8tblBiAwx5VAsFTfyw4WVcHP+AJ+kYUuCB0
+JriD7XK6yHORwPka9yD+SYg=
+-----END PRIVATE KEY-----

layers/meta-nwl-distro/recipes-connectivity/wwan-config/wwan-config.bb

@@ -1,69 +0,0 @@
-DESCRIPTION = "WWAN modems configuration tool"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-RDEPENDS:${PN} += " \
-    python3-pyserial \
-    libgpiod-python \
-    python3-setuptools \
-    python3-systemd \
-    lmsensors-sensors \
-    lmsensors-config-libsensors \
-    "
-
-DEPENDS = "python3-setuptools-scm-native"
-
-inherit gitpkgv systemd allarch
-
-
-# Package Version (built from tags)
-PKGV = "${GITPKGVTAG}"
-# Recipe Version
-PV = "1.0-git${SRCPV}"
-
-PR = "r1"
-
-SRCREV = "a943fa76d5385c3f9bc54023c6fcf8b7bf339fd1"
-SRC_URI = "git://gitlab.com/netmodule/tools/wwan-config.git;protocol=ssh;user=git;branch=master \
-           file://wwan-config@.service \
-           file://default.conf \
-           file://0001-Hotfixes-for-gemini.patch \
-           file://0002-hotfix-for-kirkstone.patch \
-           "
-
-S = "${WORKDIR}/git"
-
-inherit setuptools3_legacy
-
-# Should be set by machine.conf
-WWAN_NBR ??= "1"
-
-do_install:append() {
-    install -d ${D}/${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/wwan-config@.service ${D}/${systemd_unitdir}/system/
-
-    install -d ${D}/${sysconfdir}/wwan
-    if [ ! -z "${WWAN_NBR}" ] ; then
-        install -d ${D}${sysconfdir}/systemd/system/multi-user.target.requires/
-        for i in `seq 0 ${WWAN_NBR}`; do
-            if [ $i = ${WWAN_NBR} ]; then continue; fi
-
-            if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ] ; then
-                ln -sf ${systemd_unitdir}/system/wwan-config@.service \
-                    ${D}${sysconfdir}/systemd/system/multi-user.target.requires/wwan-config@wwan$i.service
-            fi
-
-            install -m 0644 ${WORKDIR}/default.conf ${D}${sysconfdir}/wwan/wwan$i.conf
-            if [ ! -z "${NM_WWAN_APN}" ]; then
-                sed -i 's/apn=/apn=${NM_WWAN_APN}/g' ${D}${sysconfdir}/wwan/wwan$i.conf
-            fi
-            if [ ! -z "${NM_WWAN_USER}" ]; then
-                sed -i 's/user=/user=${NM_WWAN_USER}/g' ${D}${sysconfdir}/wwan/wwan$i.conf
-            fi
-            if [ ! -z "${NM_WWAN_PASSWORD}" ]; then
-                sed -i 's/password=/password=${NM_WWAN_PASSWORD}/g' ${D}${sysconfdir}/wwan/wwan$i.conf
-            fi
-        done
-    fi
-}
-

layers/meta-nwl-distro/recipes-connectivity/wwan-config/wwan-config/0001-Hotfixes-for-gemini.patch

@@ -1,68 +0,0 @@
-From 3ffd1a9c0b42c32e720f05b36b6b837fb1ea8c46 Mon Sep 17 00:00:00 2001
-From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Thu, 22 Feb 2024 17:21:09 +0100
-Subject: [PATCH] Hotfixes for gemini
-
-- Handling HUB_RST and GSM_RST lines
-- Using GSM_EN instead of GSM_PWR
-- Using gpio line EXT_SUPPLY_EN0 instead of "kernel" supply
-
-Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
----
- wwan_config/modems/wwan_modem.py | 28 +++++++++++++++++++++++-----
- 1 file changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/wwan_config/modems/wwan_modem.py b/wwan_config/modems/wwan_modem.py
-index 710ec76..cc12a53 100755
---- a/wwan_config/modems/wwan_modem.py
-+++ b/wwan_config/modems/wwan_modem.py
-@@ -25,8 +25,24 @@ class WwanModem:
- 
-     def __init__(self, device_name):
-         self.name = device_name
--        self.pwr_line = gpiod.find_line('GSM_PWR')
-+
-+        # Start by disabling the power supply
-+        self.supply_line = gpiod.find_line('EXT_SUPPLY_EN0')
-+        self.supply_line.request(consumer=self.name, type=gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
-+
-+        # Release all RST lines
-+        self.hub_rst_line = gpiod.find_line('HUB_RST~')
-+        self.hub_rst_line.request(consumer=self.name, type=gpiod.LINE_REQ_DIR_OUT, default_vals=[1])
-+
-+        self.rst_line = gpiod.find_line('GSM_RST')
-+        self.rst_line.request(consumer=self.name, type=gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
-+
-+
-+        # Prepare the the PWR line for the pulse
-+        self.pwr_line = gpiod.find_line('GSM_EN')
-         self.pwr_line.request(consumer=self.name, type=gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
-+        time.sleep(1)
-+
- 
-         while True:
-             try:
-@@ -34,7 +50,11 @@ class WwanModem:
-                 break
-             except ModemNotPoweredException as e:
-                 logger.error("The modem did not power up, turning power off and on again")
--                self.power_down()
-+                try:
-+                    self.power_down()
-+                except PwrNotControllableException as e:
-+                    logger.error("The power cannot be controlled, not shutting down, the only we can do is wait...");
-+
-                 # Make sure the power is down long enough to avoid a glitch
-                 # With toby-l2 this down time must be at least 130ms
-                 time.sleep(1)
-@@ -158,9 +178,7 @@ class WwanModem:
-                 raise ModemNotPoweredException()
- 
-     def set_pwr_state(self, value):
--        state = "enabled" if value == 1 else "disabled"
--        with open("/sys/devices/platform/" + self.name + "-supply/state", "w") as supply_file:
--            supply_file.write(state + "\n")
-+        self.supply_line.set_value(value)
- 
-     def power_up(self):
-         logger.info("modem power up")

layers/meta-nwl-distro/recipes-connectivity/wwan-config/wwan-config/0002-hotfix-for-kirkstone.patch

@@ -1,26 +0,0 @@
-From a2b92fb896bdf2c5579676f05df4fcc7c488d94f Mon Sep 17 00:00:00 2001
-From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Thu, 22 Feb 2024 17:28:56 +0100
-Subject: [PATCH] hotfix for kirkstone
-
-With the upgrade from dunfell to kirkstone, setuptools-git-version does
-not exists anymore.
-
-Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 8009e49..88415ae 100755
---- a/setup.py
-+++ b/setup.py
-@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
- setup(
-     name='wwan_config',
-     version_format='{tag}.{commitcount}+{gitsha}',
--    setup_requires=['setuptools-git-version'],
-+    setup_requires=['setuptools-scm'],
-     description='WWAN modem configurator',
-     author='Alexandre Bard',
-     author_email='alexandre.bard@netmodule.com',

layers/meta-nwl-distro/recipes-connectivity/wwan-config/wwan-config/default.conf

@@ -1,51 +0,0 @@
-#
-# This file is part of wwan-config service
-#
-
-# Define a private APN to be used by the modem
-#  ! ONLY REQUIRED WHEN USING UBLOX TOBY-L2, will be ignored for other modems
-#
-# Required fields:
-#     apn:      Name of the access point
-#     user:     Username used to authenticate on APN
-#     password: Password used to authenticate on APN
-#
-
-
-[apn]
-apn=
-user=
-password=
-
-
-#
-# Select the SIM card to be used by the modem
-#
-# auto: The script will detect if a physical SIM card is
-#       present and switch to eSIM if it is not the case
-# sim1: Use the physical SIM card on the main board
-# m2m: Use the eSIM of the main board
-# ui-top: Use the SIM card that is on top of the User Interface
-# ui-btm: Use the SIM card that is on the bottom of the User Interface
-#
-
-[sim]
-SIM=auto
-
-
-#
-# ublox specific configurations:
-#
-# mode (+UBMCONF) :
-#  - Router : The modem will act as router and DHCP server.
-#  - Bridge : The modem will only act as a Bridge between the local and the GSM network.
-#
-# usb_profile (+UUSBCONF) :
-#  ! ONLY USED WITH TOBY-L2, will be ignored for other modems
-#  Select between different network/usb interfaces :
-#  - RNDIS
-#  - ECM
-#
-[ublox]
-mode=Bridge
-usb_profile=ECM

layers/meta-nwl-distro/recipes-connectivity/wwan-config/wwan-config/wwan-config@.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=WWAN configurator for device %I
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/wwan-config %I
-PIDFile=/run/%I.pid
-Restart=on-failure
-Nice=-20
-# Start time may include power cycles and start of ModemManager
-TimeoutStartSec=180
-# The default kill mode is killing the subprocesses created by the "os.system"
-# calls used to stop ModemManager when handling the kill signal.
-KillMode=mixed
-
-[Install]
-RequiredBy=multi-user.target
-

layers/meta-nwl-distro/recipes-core/images/nwl-test-image.bb

@@ -24,7 +24,6 @@ IMAGE_INSTALL:append = " \
 	packagegroup-core-full-cmdline \
 	swupdate-www \
 	nwl-tests \
-	packagegroup-nwl-test-tools \
 	"
 
 

layers/meta-nwl-distro/recipes-core/packagegroups/packagegroup-nwl-core.bb

@@ -1,7 +1,5 @@
 inherit packagegroup
 
-DESCRIPTION = "Base packages required for the NWL Distro"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 
@@ -23,7 +21,6 @@ RDEPENDS:${PN} = " \
 	coreutils \
 	ncurses-terminfo-base \
 	networkmanager-nmcli \
-	dnsmasq \
 	systemd-conf \
 	\
 	kernel-modules \

layers/meta-nwl-distro/recipes-core/packagegroups/packagegroup-nwl-test-tools.bb

@@ -1,24 +0,0 @@
-inherit packagegroup
-
-DESCRIPTION = "Common tools convenient for testing the features of NWL"
-
-
-RDEPENDS:${PN} = " \
-	hostapd \
-	\
-	gps-utils \
-	\
-	can-utils \
-	\
-	libgpiod-tools \
-	\
-	chrony \
-	minicom \
-	\
-	udev-rules-nmhw \
-	\
-	modemmanager \
-	wwan-config \
-	\
-	gnss-mgr \
-"

layers/meta-nwl-distro/recipes-core/udev/udev-rules-nmhw_git.bb

@@ -1,25 +0,0 @@
-# Copyright (C) 2019 Ramon Moesching <ramon.moesching@netmodule.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "udev rules for netmodule router and oem hardware"
-HOMEPAGE = "netmodule.com"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SECTION = "base"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://gitlab.com/netmodule/tools/udev-rules-nmhw;protocol=ssh;user=git;branch=master;"
-SRCREV = "e2fe34ea2d0c1ebd08d26bf90197b5625765e242"
-
-do_install () {
-    install -d ${D}${libdir}/udev/rules.d
-
-    if ls ${S}/machines/${MACHINE}/*.rules 1> /dev/null 2>&1 ; then
-       install -m 0644 ${S}/machines/${MACHINE}/*.rules ${D}${libdir}/udev/rules.d/
-       if [ -f ${S}/machines/${MACHINE}/*.sh ]; then
-           install -m 0755 ${S}/machines/${MACHINE}/*.sh ${D}${libdir}/udev/rules.d/
-       fi
-    fi
-}

layers/meta-nwl-distro/recipes-navigation/gnss-mgr/gnss-mgr.bb

@@ -1,51 +0,0 @@
-DESCRIPTION = "NetModule GNSS management tool"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404"
-
-RDEPENDS:${PN} += " \
-    python3-setuptools \
-    nmubxlib \
-    python3-systemd \
-    "
-
-DEPENDS = "python3-setuptools-scm-native"
-
-inherit setuptools3
-inherit gitpkgv
-
-inherit systemd
-SYSTEMD_SERVICE:${PN} = "gnss-mgr.service"
-
-inherit allarch
-
-# Package Version (built from tags)
-PKGV = "${GITPKGVTAG}"
-# Recipe Version
-PV = "1.0-git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://gitlab.com/netmodule/tools/gnssmgr.git;protocol=ssh;user=git;branch=master \
-           file://0001-setup.py-Make-compatible-with-kirkstone.patch \
-           file://0002-gnss-mgr.service-Hotfix-for-gemini.patch \
-           "
-SRCREV = "3d80bb4871ddc2e3e84553a86b767b419b96148f"
-S = "${WORKDIR}/git"
-
-PACKAGES =+ "${PN}-test"
-SUMMARY:${PN}-test = "Addon to gnss-mgr for testing purposes"
-FILES:${PN}-test = "${bindir}/gnss-config-reader"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/gnss
-    install -m 0644 ${S}/config/gnss-neom8.conf ${D}${sysconfdir}/gnss/gnss0.conf
-
-    install -d ${D}/${sbindir}/
-    install -m 0755 ${S}/systemd/gnss-mgr-service.py ${D}${sbindir}/gnss-mgr-service
-
-    install -d ${D}/${systemd_unitdir}/system/
-    install -m 0644 ${S}/systemd/gnss-mgr.service ${D}/${systemd_unitdir}/system/
-
-    # Test tool
-    install -d ${D}${bindir}/
-    install -m 0755 ${S}/testing/gnss-config-reader.py ${D}${bindir}/gnss-config-reader
-}

layers/meta-nwl-distro/recipes-navigation/gnss-mgr/gnss-mgr/0001-setup.py-Make-compatible-with-kirkstone.patch

@@ -1,23 +0,0 @@
-From e1dc9e6a5e683dd8ed09a319d06ef0be8d0022cb Mon Sep 17 00:00:00 2001
-From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Tue, 27 Feb 2024 11:33:39 +0100
-Subject: [PATCH] setup.py: Make compatible with kirkstone
-
-Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 8d3714e..cda325e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
- setup(
-     name='gnss_mgr',
-     version_format='{tag}.{commitcount}+{gitsha}',
--    setup_requires=['setuptools-git-version'],
-+    setup_requires=['setuptools-scm'],
-     description='GNSS Manager',
-     author='Marc Mattmüller',
-     author_email='marc.mattmueller@netmodule.com',

layers/meta-nwl-distro/recipes-navigation/gnss-mgr/gnss-mgr/0002-gnss-mgr.service-Hotfix-for-gemini.patch

@@ -1,34 +0,0 @@
-From 88eb6099cecfaa344dee3cacec54db0cd24f542f Mon Sep 17 00:00:00 2001
-From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Thu, 29 Feb 2024 15:03:02 +0100
-Subject: [PATCH] gnss-mgr.service: Hotfix for gemini
-
-Start the gnss receiver as part of the service startup because it is not
-started automatically.
-
-Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
----
- systemd/gnss-mgr.service | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/systemd/gnss-mgr.service b/systemd/gnss-mgr.service
-index 4694bee..2aa0a9b 100644
---- a/systemd/gnss-mgr.service
-+++ b/systemd/gnss-mgr.service
-@@ -1,13 +1,14 @@
- [Unit]
- Description=GNSS Manager
--Requires=dev-gnss0.device
--After=dev-gnss0.device
- 
- [Service]
- Type=oneshot
- RemainAfterExit=yes
-+ExecStartPre=/bin/sh -c 'gpioset $(gpiofind "GNSS_RST~")=1'
-+ExecStartPre=sleep 5
- ExecStart=/usr/sbin/gnss-mgr-service start
- ExecStop=/usr/sbin/gnss-mgr-service stop
-+ExecStopPost=/bin/sh -c 'gpioset $(gpiofind "GNSS_RST~")=0'
- ExecReload=/usr/sbin/gnss-mgr-service reload
- StandardOutput=null
- 

layers/meta-nwl-distro/recipes-navigation/gpsd/gpsd_%.bbappend

@@ -1,15 +0,0 @@
-
-TTY_DEVICE = "/dev/gnss0"
-USBAUTO_STATE = "false"
-
-do_install:append () {
-    sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default
-    sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default
-
-    sed -i "s/GPSD_OPTIONS=\"\(.*\)\"/GPSD_OPTIONS=\"\1 -s 115200\"/g" \
-            ${D}${sysconfdir}/default/gpsd.default
-}
-
-
-# Service is started by gnss-mgr
-SYSTEMD_AUTO_ENABLE = "disable"

layers/meta-nwl-distro/recipes-navigation/nmubxlib/nmubxlib.bb

@@ -1,24 +0,0 @@
-DESCRIPTION = "Library implementing UBX protocol for u-blox gnss modems"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=331a9220a74b05f133bf1ef09b6903b2"
-
-RDEPENDS:${PN} += " \
-    python3-setuptools \
-    "
-
-DEPENDS = "python3-setuptools-scm-native"
-
-inherit setuptools3
-inherit gitpkgv
-
-# Package Version (built from tags)
-PKGV = "${GITPKGVTAG}"
-# Recipe Version
-PV = "1.0-git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://gitlab.com/netmodule/tools/nmubxlib.git;protocol=ssh;user=git;branch=master"
-SRCREV = "7c22b57cdd169a6651cb0c17a215d1e448727bcb"
-S = "${WORKDIR}/git"
-
-

layers/meta-nwl-marvell-bsp/conf/machine/cn9131-nitroc.conf

@@ -17,7 +17,8 @@ require conf/machine/include/soc-family.inc
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 PREFERRED_VERSION_u-boot ?= "2020.10-marvell"
 
-# Set the configuration and device tree for Nitroc
+# All cn913x use the same defconfig for u-boot, but another devicetree by
+# settings UBOOT_BUILDENV_DEVICE_TREE in the machine configuration file
 UBOOT_MACHINE = "nitroc_defconfig"
 UBOOT_BUILDENV_DEVICE_TREE ??= "cn9131-nitroc-v1"
 
@@ -29,7 +30,10 @@ PREFERRED_VERSION_linux-netmodule ?= "v6.6.y%"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.9"
 
 KERNEL_IMAGETYPE = "Image"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
 KERNEL_DEFCONFIG ?= "nitroc_defconfig"
+
 KERNEL_DEVICETREE ?= "\
     marvell/cn9131-nitroc-v1.dtb \
     marvell/cn9131-nitroc-m12.dtb \
@@ -39,7 +43,7 @@ KERNEL_DEVICETREE ?= "\
 #  getty configuration
 # ******************************************************************************
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 APPEND += "console=ttyS0,115200"
 
@@ -53,6 +57,7 @@ WKS_FILE = "cn913x-sdcard.wks.in"
 COREOS_INSTALLER_WKS_FILE ?= "cn913x-sdcard-installer.wks"
 IMAGE_FSTYPES += "wic.xz wic.bmap"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " kernel-modules kernel-devicetree"
 COREOS_IMAGE_SWUPDATE_EXTRACLASSES += " coreos-image-swupdate-cn913x"
 
 # No watchdog available yet
@@ -61,10 +66,6 @@ require conf/machine/include/coreos-generic-features/efi.inc
 require conf/machine/include/coreos-generic-features/partitions.inc
 
 ### Device specific settings
-# Kernel modules are not essential for booting but are needed for most things
-MACHINE_EXTRA_RDEPENDS += "kernel-modules"
-# Device trees are included in the unified kernel and not needed in the rootfs
-# MACHINE_EXTRA_RDEPENDS += "kernel-devicetree"
 # Needed for phy firmware
 MACHINE_EXTRA_RDEPENDS += "linux-firmware-ath11k"
 MACHINE_EXTRA_RDEPENDS += "linux-firmware-ath10k"

layers/meta-nwl-marvell-bsp/recipes-bsp/binaries-marvell/binaries-marvell_git.bb

@@ -1,4 +1,13 @@
-DESCRIPTION = "Marvell binaries like the system controller firmware"
+# Recipe created by recipetool
+# This is the basis of a recipe and may need further editing in order to be fully functional.
+# (Feel free to remove these comments when editing.)
+
+# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
+# your responsibility to verify that the values are complete and correct.
+#
+# The following license files were not able to be identified and are
+# represented as "Unknown" below, you will need to check them yourself:
+#   drivers/snps/fw/snps_license.txt
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README.md;md5=bbdf038ac62317d3a12a067c50dadc61"
 

layers/meta-nwl-marvell-bsp/recipes-bsp/mv-ddr-marvell/mv-ddr-marvell_git.bb

@@ -1,4 +1,13 @@
-DESCRIPTION = "Marvell DDR training library"
+# Recipe created by recipetool
+# This is the basis of a recipe and may need further editing in order to be fully functional.
+# (Feel free to remove these comments when editing.)
+
+# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
+# your responsibility to verify that the values are complete and correct.
+#
+# The following license files were not able to be identified and are
+# represented as "Unknown" below, you will need to check them yourself:
+#   drivers/snps/fw/snps_license.txt
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Makefile;md5=9993156c815673120e02a7c8e00a8cc3"
 

layers/meta-nwl-marvell-bsp/recipes-bsp/u-boot/u-boot_2020.10-marvell.bb

@@ -12,7 +12,12 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 PE = "1"
 
-SRCREV = "3534f6601c53362407bc6b3bf0af85908c38b81c"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse
+SRCREV = "c11f5649c2053684dc8f6658228cf3e9baf47422"
+
+# Patch from https://github.com/SolidRun/cn913x_build
+# Git SHA: f33e2aeb01c7ee061be7b053035ae87ce30fce4a
 SRC_URI = "git://git@bitbucket.gad.local:7999/nm-nsp/netmodule-u-boot.git;protocol=ssh;user=git;branch=sdk11.23.08-v2020.10-nitroc"
 
 S = "${WORKDIR}/git"

layers/meta-nwl-marvell-bsp/recipes-kernel/linux/linux-nitroc_git.bb

@@ -1,4 +1,4 @@
-DESCRIPTION = "Linux kernel for the Nitroc hardware"
+DESCRIPTION = "Linux kernel for various NetModule hardware"
 COMPATIBLE_MACHINE = "cn9131-nitroc"
 
 inherit kernel
@@ -68,4 +68,38 @@ kernel_do_install() {
 	install -d ${D}${sysconfdir}/modprobe.d
 }
 
+# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
+do_kernel_version_sanity_check() {
+	if [ "x${KERNEL_VERSION_SANITY_SKIP}" = "x1" ]; then
+		exit 0
+	fi
+
+	# The Makefile determines the kernel version shown at runtime
+	# Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile
+	VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//)
+	PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
+	SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
+	EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//)
+
+	# Build a string for regex and a plain version string
+	reg="^${VERSION}\.${PATCHLEVEL}"
+	vers="${VERSION}.${PATCHLEVEL}"
+	if [ -n "${SUBLEVEL}" ]; then
+		# Ignoring a SUBLEVEL of zero is fine
+		if [ "${SUBLEVEL}" = "0" ]; then
+			reg="${reg}(\.${SUBLEVEL})?"
+		else
+			reg="${reg}\.${SUBLEVEL}"
+			vers="${vers}.${SUBLEVEL}"
+		fi
+	fi
+	vers="${vers}${EXTRAVERSION}"
+	reg="${reg}${EXTRAVERSION}"
+
+	if [ -z `echo ${PV} | grep -E "${reg}"` ]; then
+		bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source or set KERNEL_VERSION_SANITY_SKIP=\"1\" in your recipe."
+	fi
+	exit 0
+}
+
 require recipes-kernel/linux/linux-yocto-coreos-efi.inc

templates/bblayers.conf.sample

@@ -10,7 +10,6 @@ BBLAYERS ?= " \
   ##COREOS_LAYERSDIR##/meta-belden-coreos \
   ##COREOS_LAYERSDIR##/meta-belden-coreos-bsp \
   ##COREOS_LAYERSDIR##/meta-belden-marvell-bsp \
-  ##COREOS_LAYERSDIR##/meta-netmodule-coreos-bsp \
   ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-oe \
   ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-networking \
   ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-filesystems \
@@ -19,12 +18,8 @@ BBLAYERS ?= " \
   ##COREOS_EXTLAYERSDIR##/meta-virtualization \
   ##COREOS_EXTLAYERSDIR##/meta-efibootguard \
   ##COREOS_EXTLAYERSDIR##/meta-swupdate \
-  ##COREOS_EXTLAYERSDIR##/meta-arm/meta-arm \
-  ##COREOS_EXTLAYERSDIR##/meta-arm/meta-arm-toolchain \
-  ##COREOS_EXTLAYERSDIR##/meta-ti/meta-ti-bsp \
   ##NWL_LAYERSDIR##/meta-nwl-distro \
   ##NWL_LAYERSDIR##/meta-netmodule-legacy-bsp \
-  ##NWL_LAYERSDIR##/meta-nwl-marvell-bsp \
   ##NWL_EXTLAYERSDIR##/meta-netmodule-wlan \
   "
 

templates/conf-notes.txt

@@ -27,8 +27,8 @@
 You can now run 'bitbake <target>'
 
 Common targets are:
-    nwl-ramdisk-minimal
+    nwl-image-minimal
-    nwl-test-image
+    nwl-image-testable
 
 You can also run generated qemu images with a command like 'runqemu qemuarm64'.
 

templates/local.conf.sample

@@ -26,7 +26,6 @@
 #MACHINE ?= "qemux86"
 #MACHINE ?= "qemux86-64"
 #MACHINE ?= "cn9130-cf-pro"
-#MACHINE ?= "cn9131-nitroc"
 #
 # This sets the default machine to be qemuarm64 if no other machine is selected:
 MACHINE ??= "cn9130-cf-pro"