LM
/
meta-netmodule-bsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nmhw21: fix machine definitions and branches 

Signed-off-by: Patrick Zysset <patrick.zysset@netmodule.com>
This commit is contained in:
Patrick Zysset 2018-10-20 02:15:33 +02:00
parent 170a2eaa27
commit 929a4a1b9a
7 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/machine/am335x-vcu.conf → conf/machine/am335x-nmhw21.conf
View File

@ -1,6 +1,6 @@
#@TYPE: Machine #@TYPE: Machine
#@NAME: Vehicle Control Unit (VCU) #@NAME: NetModule HW 21
#@DESCRIPTION: Machine configuration for the VCU mainboard #@DESCRIPTION: Machine configuration for the nmhw21 mainboard
require conf/machine/include/ti33x.inc require conf/machine/include/ti33x.inc
@ -9,13 +9,13 @@ IMAGE_CLASSES += "image_types"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
KERNEL_DEFCONFIG ??= "am335x-vcu_defconfig" KERNEL_DEFCONFIG ??= "am335x-nmhw21_defconfig"
KERNEL_DEVICETREE = "am335x-vcu-prod1.dtb \ KERNEL_DEVICETREE = "am335x-nmhw21-prod1.dtb \
" "
KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
PV_pn-linux-netmodule = "4.14.14-${SRCPV}" PV_pn-linux-netmodule = "4.14.77-${SRCPV}"
SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/vcu" SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nmhw21"
SRCREV_pn-linux-netmodule ?= "${AUTOREV}" SRCREV_pn-linux-netmodule ?= "${AUTOREV}"

5
recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb → recipes-bsp/u-boot/u-boot-am335x-nmhw21-v1_git.bb
View File

@ -1,15 +1,14 @@
require u-boot-nm.inc require u-boot-nm.inc
# Force machine configuration for this recipe # Force machine configuration for this recipe
UBOOT_MACHINE = "am335x_vcu_defconfig" UBOOT_MACHINE = "am335x_nmhw21_defconfig"
# Be aware github/netmodule git # Be aware github/netmodule git
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule" SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
# Should be updated when a new U-Boot Version is available # Should be updated when a new U-Boot Version is available
SRCREV ?= "${AUTOREV}" SRCREV ?= "${AUTOREV}"
PV = "v2016.04+git${SRCPV}" PV = "v2016.05+git${SRCPV}"
# PV = "v2016.04-${SRCREV}"
SPL_BINARY = "MLO" SPL_BINARY = "MLO"
UBOOT_SUFFIX = "img" UBOOT_SUFFIX = "img"

2
recipes-connectivity/gpsd/gpsd_3.17.bbappend
View File

@ -1,5 +1,5 @@
FILESEXTRAPATHS_prepend_am335x-nrhw20 := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_am335x-nrhw20 := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_am335x-vcu := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_am335x-nmhw21 := "${THISDIR}/${PN}:"
#SRC_URI_append = " file://gpsd.service" #SRC_URI_append = " file://gpsd.service"

2
recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb
View File

@ -13,6 +13,6 @@ do_install_append_am335x-nrhw20() {
sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
} }
do_install_append_am335x-vcu() { do_install_append_am335x-nmhw21() {
sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
} }

2
recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb
View File

@ -13,7 +13,7 @@ do_install_append_am335x-nrhw20() {
sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
} }
do_install_append_am335x-vcu() { do_install_append_am335x-nmhw21() {
sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
} }

6
recipes-connectivity/tibluetooth/tibluetooth.bb
View File

@ -52,7 +52,7 @@ do_install_am335x-nrhw20 () {
} }
install_vcu () { install_nmhw21 () {
install -d ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/system/
install -m 0644 tibluetooth-vcu.service ${D}${systemd_unitdir}/system/tibluetooth.service install -m 0644 tibluetooth-vcu.service ${D}${systemd_unitdir}/system/tibluetooth.service
@ -60,6 +60,6 @@ install_vcu () {
install -m 0644 TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/ install -m 0644 TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/
} }
do_install_am335x-vcu () { do_install_am335x-nmhw21 () {
install_vcu install_nmhw21
} }

6
recipes-kernel/linux/linux-netmodule_git.bb
View File

@ -1,4 +1,4 @@
# Copyright (C) 2013 NetModule AG # Copyright (C) 2018 NetModule AG
inherit kernel inherit kernel
@ -7,9 +7,9 @@ DESCRIPTION = "Linux kernel for various NetModule hardware"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
SRC_URI = "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/vcu" SRC_URI = "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nmhw21"
SRCREV ?= "${AUTOREV}" SRCREV ?= "${AUTOREV}"
PV ?= "4.14.14-${SRCPV}" PV ?= "4.14.77-${SRCPV}"
PR = "r0" PR = "r0"