From a31869ff33b43916d33487deaf767c1b05defacd Mon Sep 17 00:00:00 2001
From: Andrejs Cainikovs <andrejs.cainikovs@netmodule.com>
Date: Thu, 6 Jun 2019 17:57:59 +0200
Subject: [PATCH] nmhw22 target renamed to nmhw23

---
 classes/sota_imx8-nmhw22.bbclass              |  1 -
 classes/sota_imx8-nmhw23.bbclass              |  1 +
 .../{imx8-nmhw22.conf => imx8-nmhw23.conf}    | 12 +++----
 recipes-bsp/u-boot/u-boot-imx8-nmhw22_git.bb  | 36 -------------------
 recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb  | 28 +++++++++++++++
 ...ota-nmhw22.wks => sdimage-sota-nmhw23.wks} |  0
 6 files changed, 35 insertions(+), 43 deletions(-)
 delete mode 100644 classes/sota_imx8-nmhw22.bbclass
 create mode 100644 classes/sota_imx8-nmhw23.bbclass
 rename conf/machine/{imx8-nmhw22.conf => imx8-nmhw23.conf} (64%)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx8-nmhw22_git.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
 rename wic/{sdimage-sota-nmhw22.wks => sdimage-sota-nmhw23.wks} (100%)

diff --git a/classes/sota_imx8-nmhw22.bbclass b/classes/sota_imx8-nmhw22.bbclass
deleted file mode 100644
index 2148a34..0000000
--- a/classes/sota_imx8-nmhw22.bbclass
+++ /dev/null
@@ -1 +0,0 @@
-WKS_FILE_sota = "sdimage-sota-nmhw22.wks"
diff --git a/classes/sota_imx8-nmhw23.bbclass b/classes/sota_imx8-nmhw23.bbclass
new file mode 100644
index 0000000..6b17412
--- /dev/null
+++ b/classes/sota_imx8-nmhw23.bbclass
@@ -0,0 +1 @@
+WKS_FILE_sota = "sdimage-sota-nmhw23.wks"
diff --git a/conf/machine/imx8-nmhw22.conf b/conf/machine/imx8-nmhw23.conf
similarity index 64%
rename from conf/machine/imx8-nmhw22.conf
rename to conf/machine/imx8-nmhw23.conf
index f5e7891..2d7e951 100644
--- a/conf/machine/imx8-nmhw22.conf
+++ b/conf/machine/imx8-nmhw23.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: NetModule HW 22
-#@DESCRIPTION: Machine configuration for the nmhw22 mainboard
+#@NAME: NetModule HW 23
+#@DESCRIPTION: Machine configuration for the nmhw23 mainboard
 
 require conf/machine/include/arm/arch-arm64.inc
 
@@ -9,8 +9,8 @@ IMAGE_CLASSES += "image_types"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 
-KERNEL_DEFCONFIG = ""
-KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom0.dtb"
+KERNEL_DEFCONFIG = "defconfig"
+KERNEL_DEVICETREE = "netmodule/imx8-nmhw23.dtb"
 
 SOTA_MACHINE = "${MACHINE}"
 
@@ -21,8 +21,8 @@ KERNEL_IMAGETYPES = "fitImage Image"
 KERNEL_IMAGETYPE_sota = "fitImage"
 KERNEL_IMAGETYPES_sota = "fitImage"
 UBOOT_ENTRYPOINT ?= "0x80020000"
-UBOOT_MACHINE = "imx8qxp_mek_defconfig"
+UBOOT_MACHINE = "imx8_nmhw23_defconfig"
 IMAGE_BOOT_FILES = "flash.bin"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx8-nmhw22"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx8-nmhw23"
diff --git a/recipes-bsp/u-boot/u-boot-imx8-nmhw22_git.bb b/recipes-bsp/u-boot/u-boot-imx8-nmhw22_git.bb
deleted file mode 100644
index de25e18..0000000
--- a/recipes-bsp/u-boot/u-boot-imx8-nmhw22_git.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-require u-boot-nm.inc
-
-DEPENDS += "bc-native coreutils-native dtc-native"
-
-# Force machine configuration for this recipe
-UBOOT_MACHINE = "imx8qxp_mek_defconfig"
-
-# Be aware github/netmodule git
-SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=develop/nmhw22-bringup"
-
-# License
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
-
-# Should be updated when a new U-Boot Version is available
-SRCREV ?= "${AUTOREV}"
-PV = "v2019.04pre+git${SRCPV}"
-
-UBOOT_BINARY = "flash.bin"
-UBOOT_MAKE_TARGET = "flash.bin"
-
-do_compile() {
-    export ATF_LOAD_ADDR=0x80000000
-    export BL33_LOAD_ADDR=0x80020000
-    oe_runmake ${UBOOT_MACHINE}
-    # TODO: move this to U-Boot defconfig
-    echo "CONFIG_CMD_EXT2=y" >> ${B}/.config
-    echo "CONFIG_CMD_EXT4=y" >> ${B}/.config
-    echo "CONFIG_CMD_EXT4_WRITE=y" >> ${B}/.config
-    oe_runmake ${UBOOT_MAKE_TARGET}
-    dd if=${S}/u-boot.itb of=${S}/flash.bin bs=512 seek=528
-}
-
-do_deploy_append() {
-    cp ${S}/flash.bin ${DEPLOYDIR}/flash.bin
-}
diff --git a/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb b/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
new file mode 100644
index 0000000..0fc318e
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
@@ -0,0 +1,28 @@
+require u-boot-nm.inc
+
+DEPENDS += "bc-native coreutils-native dtc-native"
+
+# Force machine configuration for this recipe
+UBOOT_MACHINE = "imx8_nmhw23_defconfig"
+
+# Be aware github/netmodule git
+SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2018.03/imx/imx8-nmhw23"
+
+# License
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
+# Should be updated when a new U-Boot Version is available
+SRCREV ?= "${AUTOREV}"
+PV = "v2018.03+git${SRCPV}"
+
+UBOOT_BINARY = "flash.bin"
+
+do_compile() {
+    sh ${B}build-imx8-nmhw23.sh
+}
+
+do_deploy_append() {
+    cp ${S}/flash.bin ${DEPLOYDIR}/flash.bin
+    cp ${S}/flash.sd  ${DEPLOYDIR}/flash.sd
+}
diff --git a/wic/sdimage-sota-nmhw22.wks b/wic/sdimage-sota-nmhw23.wks
similarity index 100%
rename from wic/sdimage-sota-nmhw22.wks
rename to wic/sdimage-sota-nmhw23.wks