From 4ff3d2b09eaca243c750105d2cee16a62624bc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20M=C3=BCller?= <lucien.mueller@netmodule.com>
Date: Fri, 12 Oct 2018 15:07:04 +0200
Subject: [PATCH] sota: added sota capabilities.

BugzID: 53676
---
 conf/machine/am335x-nmhw21.conf  |  5 ++++-
 conf/machine/include/ti33x.inc   | 12 ++++++------
 recipes-bsp/u-boot/u-boot-nm.inc |  2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/conf/machine/am335x-nmhw21.conf b/conf/machine/am335x-nmhw21.conf
index ca8060f..7356984 100644
--- a/conf/machine/am335x-nmhw21.conf
+++ b/conf/machine/am335x-nmhw21.conf
@@ -13,9 +13,12 @@ KERNEL_DEFCONFIG ??= "am335x-nmhw21_defconfig"
 KERNEL_DEVICETREE = "am335x-nmhw21-prod1.dtb \
     "
 KERNEL_IMAGETYPE = "zImage"
+KERNEL_CLASSES_append_sota = " kernel-fitimage"
+KERNEL_IMAGETYPE_sota = "fitImage"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw21-v1"
+
 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/nmhw21"
 SRCREV_pn-linux-netmodule ?= "${AUTOREV}"
-
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index ba24bb9..b91f4e6 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -20,17 +20,17 @@ GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_KERNEL_PR = "r22"
 
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_ARCH = "arm"
-UBOOT_MACHINE = "am335x_evm_config"
+UBOOT_MACHINE ?= "am335x_evm_config"
 
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ENTRYPOINT ?= "0x80008000"
+UBOOT_LOADADDRESS ?= "0x80008000"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
diff --git a/recipes-bsp/u-boot/u-boot-nm.inc b/recipes-bsp/u-boot/u-boot-nm.inc
index 2c31c58..2925869 100644
--- a/recipes-bsp/u-boot/u-boot-nm.inc
+++ b/recipes-bsp/u-boot/u-boot-nm.inc
@@ -8,6 +8,8 @@ S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+PROVIDES = "virtual/bootloader"
+
 inherit uboot-config deploy
 
 EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1'