From 4f86b24e749ca18f9bb87953c3ce55162ab41525 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Tue, 30 Oct 2018 23:01:15 +0100 Subject: [PATCH] hw16: Rename from nbhw to nrhw --- README | 2 +- .../{am335x-nbhw16.conf => am335x-nrhw16.conf} | 16 ++++++++-------- conf/machine/am335x-nrhw20.conf | 4 ++-- .../modemmanager/modemmanager-debug_1.6.0.bb | 2 +- .../modemmanager/modemmanager-debug_1.8.0.bb | 2 +- recipes-connectivity/tibluetooth/tibluetooth.bb | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) rename conf/machine/{am335x-nbhw16.conf => am335x-nrhw16.conf} (66%) diff --git a/README b/README index 57ae038..8b901df 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ layers: meta-python, meta-oe, meta-networking To get an image that is compatible with the NetModule router, build an nmrouter-image. Set the MACHINE in conf/local.conf to MACHINE = "armada-385-nbhw17" (NB2800), MACHINE = "armada-385-nbhw14" (NB3800/NB3711/NB3701) or -MACHINE = "am335x-nbhw16" # Internal name for NB800 family +MACHINE = "am335x-nrhw16" # Internal name for NB800 family and add the following layers to conf/bblayers.conf: BBLAYERS ?= " \ /meta \ diff --git a/conf/machine/am335x-nbhw16.conf b/conf/machine/am335x-nrhw16.conf similarity index 66% rename from conf/machine/am335x-nbhw16.conf rename to conf/machine/am335x-nrhw16.conf index 0e0322c..78326c8 100644 --- a/conf/machine/am335x-nbhw16.conf +++ b/conf/machine/am335x-nrhw16.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: NBHW16 based routers like NB800 +#@NAME: NRHW16 based routers like NB800 #@DESCRIPTION: Machine configuration for the NBHW16 based routers http://netmodule.com/en/products/iot-routers require conf/machine/include/ti33x.inc @@ -9,19 +9,19 @@ IMAGE_CLASSES += "image_types" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG ??= "nbhw16_defconfig" -KERNEL_DEVICETREE = "am335x-nbhw16.dtb \ - am335x-nbhw16-prod2.dtb \ - am335x-nbhw16-prod3.dtb \ - am335x-nbhw16-prod4.dtb \ - am335x-nbhw16-prod5.dtb \ +KERNEL_DEFCONFIG ??= "nrhw16_defconfig" +KERNEL_DEVICETREE = "am335x-nrhw16.dtb \ + am335x-nrhw16-prod2.dtb \ + am335x-nrhw16-prod3.dtb \ + am335x-nrhw16-prod4.dtb \ + am335x-nrhw16-prod5.dtb \ " KERNEL_IMAGETYPE = "zImage" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PV_pn-linux-netmodule = "4.14.78-${SRCPV}" -SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nmhw21" +SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nrhw16" SRCREV_pn-linux-netmodule ?= "${AUTOREV}" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2" diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf index 80cc755..7de57bb 100644 --- a/conf/machine/am335x-nrhw20.conf +++ b/conf/machine/am335x-nrhw20.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: NBHW16 based routers like NB800 -#@DESCRIPTION: Machine configuration for the NBHW16 based routers http://netmodule.com/en/products/iot-routers +#@NAME: NRHW20 based routers like NB1601 +#@DESCRIPTION: Machine configuration for the NRHW20 based routers http://www.netmodule.com/products/industrial-routers.html require conf/machine/include/ti33x.inc diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb index 845cd4d..f0e2d76 100644 --- a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb +++ b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb @@ -5,7 +5,7 @@ require modemmanager_1.6.0.bb RPROVIDES_modemmanager-debug += " modemmanager" -do_install_append_am335x-nbhw16() { +do_install_append_am335x-nrhw16() { sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service } diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb index d1302c1..0f3d992 100644 --- a/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb +++ b/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb @@ -5,7 +5,7 @@ require modemmanager_1.8.0.bb RPROVIDES_modemmanager-debug += " modemmanager" -do_install_append_am335x-nbhw16() { +do_install_append_am335x-nrhw16() { sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service } diff --git a/recipes-connectivity/tibluetooth/tibluetooth.bb b/recipes-connectivity/tibluetooth/tibluetooth.bb index dcea7fd..2107aa4 100644 --- a/recipes-connectivity/tibluetooth/tibluetooth.bb +++ b/recipes-connectivity/tibluetooth/tibluetooth.bb @@ -27,7 +27,7 @@ FILES_${PN}_append = " \ /lib \ " -install_nbhw16 () { +install_nrhw16 () { install -d ${D}${systemd_unitdir}/system/ install -m 0644 tibluetooth-nbhw16.service ${D}${systemd_unitdir}/system/tibluetooth.service @@ -35,8 +35,8 @@ install_nbhw16 () { install -m 0644 TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/ } -do_install_am335x-nbhw16 () { - install_nbhw16 +do_install_am335x-nrhw16 () { + install_nrhw16 } install_nrhw20 () {