summaryrefslogtreecommitdiffstats
path: root/meta-agl/templates/feature/agl-sota/50_local.conf.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl/templates/feature/agl-sota/50_local.conf.inc')
-rw-r--r--meta-agl/templates/feature/agl-sota/50_local.conf.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta-agl/templates/feature/agl-sota/50_local.conf.inc b/meta-agl/templates/feature/agl-sota/50_local.conf.inc
index 35ab3f9a..3ceb04df 100644
--- a/meta-agl/templates/feature/agl-sota/50_local.conf.inc
+++ b/meta-agl/templates/feature/agl-sota/50_local.conf.inc
@@ -1,10 +1,8 @@
-#see meta-updater/conf/distro/sota.conf.inc
+# See meta-updater/conf/distro/sota.conf.inc
INHERIT += "sota"
DISTRO_FEATURES_append = " sota usrmerge"
DISTRO_FEATURES_NATIVE_append = " sota"
AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz"
-# rpi4 and recent rpi3 firmwares need dtb in /boot partition
-# so that they can be read by the firmware. This fixes UART
-# issues for Raspberry Pi 3. For branches based on release
-# Thud this fix is not present in meta-updater.
-IMAGE_BOOT_FILES_append_rpi = "${@make_dtb_boot_files(d)}"
+# Netboot is not obeying usrmerge distro feature
+# therefore it is not compatible with agl-sota
+CONFLICT_DISTRO_FEATURES += "netboot"