From ea8c822d6d03f235bd52d321fb00edbb5b7f40fd Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Tue, 23 Apr 2019 10:06:31 +0200
Subject: [PATCH] hw18: Cleanup and set ostree image configuration

---
 classes/sota_armada-385.bbclass                       | 1 +
 conf/machine/armada-385-nrhw18.conf                   | 6 +-----
 conf/machine/include/armada.inc                       | 2 ++
 recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb | 2 +-
 wic/sdimage-sota-armada-385.wks                       | 5 +++++
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 classes/sota_armada-385.bbclass
 create mode 100644 wic/sdimage-sota-armada-385.wks

diff --git a/classes/sota_armada-385.bbclass b/classes/sota_armada-385.bbclass
new file mode 100644
index 0000000..a79053f
--- /dev/null
+++ b/classes/sota_armada-385.bbclass
@@ -0,0 +1 @@
+WKS_FILE_sota = "sdimage-sota-armada-385.wks"
diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf
index e8c27d6..6305718 100644
--- a/conf/machine/armada-385-nrhw18.conf
+++ b/conf/machine/armada-385-nrhw18.conf
@@ -13,14 +13,10 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 KERNEL_DEFCONFIG ??= "armada-385-nrhw18_defconfig"
 KERNEL_DEVICETREE = "armada-385-nrhw18-prod4.dtb"
 KERNEL_IMAGETYPE = "zImage"
-
-KERNEL_CLASSES_append_sota = " kernel-fitimage"
-KERNEL_IMAGETYPE_sota = "fitImage"
-UBOOT_ENTRYPOINT_sota = "0x13000000"
+KERNEL_IMAGETYPES = "fitImage zImage"
 
 KERNEL_MODULE_PROBECONF += "ath10k_pci"
 module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2"
 IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
diff --git a/conf/machine/include/armada.inc b/conf/machine/include/armada.inc
index 6b14ddf..d6e3409 100644
--- a/conf/machine/include/armada.inc
+++ b/conf/machine/include/armada.inc
@@ -18,3 +18,5 @@ UBOOT_LOADADDRESS = "0x13000000"
 
 # List common SoC features, may need to add touchscreen for specific machines
 MACHINE_FEATURES = "kernel26 usbgadget usbhost vfat ext2 ext4 ethernet"
+
+SOTA_MACHINE = "armada-385"
diff --git a/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb b/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
index 784e5f0..59c1a23 100644
--- a/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
+++ b/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
@@ -17,7 +17,7 @@ PV = "v2017.11+git${SRCPV}"
 UBOOT_SUFFIX = "kwb"
 UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
 
-do_deploy() {
+do_deploy_append() {
     rm -f ${DEPLOYDIR}/${PN}-spl.bin
     rm -f ${DEPLOYDIR}/${PN}.bin
     rm -f ${DEPLOYDIR}/${PN}-spl.kwb
diff --git a/wic/sdimage-sota-armada-385.wks b/wic/sdimage-sota-armada-385.wks
new file mode 100644
index 0000000..adbd3bc
--- /dev/null
+++ b/wic/sdimage-sota-armada-385.wks
@@ -0,0 +1,5 @@
+# short-description: Create OTA-enabled SD card image
+# long-description: Creates a partitioned SD card image with OSTree
+
+part u-boot --source rawcopy --sourceparams="file=u-boot-spl.kwb" --ondisk mmcblk --no-table --align 384
+part / --source otaimage --ondisk mmcblk --fstype=ext4 --align 4096