nmhw22 target renamed to nmhw23

classes/sota_imx8-nmhw22.bbclass

@@ -1 +0,0 @@
-WKS_FILE_sota = "sdimage-sota-nmhw22.wks"

classes/sota_imx8-nmhw23.bbclass

@@ -0,0 +1 @@
+WKS_FILE_sota = "sdimage-sota-nmhw23.wks"

conf/machine/imx8-nmhw23.conf

@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: NetModule HW 22
+#@NAME: NetModule HW 23
-#@DESCRIPTION: Machine configuration for the nmhw22 mainboard
+#@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_DEFCONFIG = "defconfig"
-KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom0.dtb"
+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"

recipes-bsp/u-boot/u-boot-imx8-nmhw22_git.bb

@@ -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
-}

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
+}