Merge remote-tracking branch 'origin/morty' into feat/noop

6 files changed, 27 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bee8a64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index ab9611a..6fbba26 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -1,12 +1,10 @@
 python __anonymous() {
     if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
-        d.appendVar("OVERRIDES", ":sota")
-        #d.appendVar("IMAGE_INSTALL", " ostree os-release")
-
         d.appendVarFlag("do_image_wic", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True))
-        #d.appendVar("EXTRA_IMAGEDEPENDS", " parted-native mtools-native dosfstools-native")
 }
 
+OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
+
 IMAGE_INSTALL_append_sota = " ostree os-release"
 IMAGE_CLASSES += " image_types_ostree image_types_ota"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}"
@@ -27,5 +25,6 @@ SOTA_MACHINE_rarpberrypi3 ?= "raspberrypi"
 SOTA_MACHINE_porter ?= "porter"
 SOTA_MACHINE_intel-corei7-64 ?= "minnowboard"
 SOTA_MACHINE_qemux86-64 ?= "qemux86-64"
+SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
 
 inherit sota_${SOTA_MACHINE}
diff --git a/classes/sota_am335x-evm-wifi.bbclass b/classes/sota_am335x-evm-wifi.bbclass
new file mode 100644
index 0000000..821e8fb
--- /dev/null
+++ b/classes/sota_am335x-evm-wifi.bbclass
@@ -0,0 +1,18 @@
+IMAGE_CLASSES += "image_types_uboot"
+
+KERNEL_IMAGETYPE_sota = "uImage"
+
+OSTREE_BOOTLOADER ?= "u-boot"
+
+EXTRA_IMAGEDEPENDS_append_sota = " acer-bootfiles"
+IMAGE_BOOT_FILES_sota = "bootfiles/*"
+OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l"
+
+IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant"
+IMAGE_INSTALL_remove_sota = " connman connman-client"
+
+PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f"
+
+KERNEL_EXTRA_ARGS_append_sota = " LOADADDR=${UBOOT_ENTRYPOINT}"
+
+VIRTUAL-RUNTIME_net_manager_sota = "systemd"
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 78ca1e5..62b682a 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -13,4 +13,5 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
 INHERIT_prepend = " sota"
 IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
 
+# Prelinking increases the size of downloads and causes build errors
 USER_CLASSES_remove = "image-prelink"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index c56695e..c52395d 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -9,4 +9,6 @@ DISTRO_CODENAME = "sota"
 
 INHERIT += " sota"
 IMAGE_INSTALL_append = " connman connman-client"
+
+# Prelinking increases the size of downloads and causes build errors
 USER_CLASSES_remove = "image-prelink"
diff --git a/conf/include/bblayers/sota_am335x-evm.inc b/conf/include/bblayers/sota_am335x-evm.inc
new file mode 100644
index 0000000..f2d485d
--- /dev/null
+++ b/conf/include/bblayers/sota_am335x-evm.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-ti "