aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArsalan H. Awan <Arsalan_Awan@mentor.com>2019-09-11 17:00:18 +0500
committerArsalan H. Awan <Arsalan_Awan@mentor.com>2019-09-11 17:10:19 +0500
commit13ba7008ffd890db5ddeba9c32c2212c4696177e (patch)
treef7c9d3bad0b7007ba83ca3a23694ef4bfba62b19
parenta830cd7664edc727cb0b9fe8c61871558ad68c19 (diff)
downloadmeta-amd-13ba7008ffd890db5ddeba9c32c2212c4696177e.tar.gz
meta-amd-13ba7008ffd890db5ddeba9c32c2212c4696177e.tar.bz2
meta-amd-13ba7008ffd890db5ddeba9c32c2212c4696177e.zip
meta-amd-distro: mv distro related configs and the wic img file here
This moves the meta-amd-bsp/scripts/lib/wic/canned-wks/amd-usbimage.wks to meta-amd-distro/scripts/lib/wic/canned-wks/amd-usbimage.wks, and the wic img settings from amd-common-configurations.inc to poky-amd.conf, as well as a few related configs as well that are not BSP configs, rather distro configs. Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com>
-rw-r--r--meta-amd-bsp/conf/machine/include/amd-common-configurations.inc29
-rw-r--r--meta-amd-distro/conf/distro/poky-amd.conf29
-rw-r--r--meta-amd-distro/scripts/lib/wic/canned-wks/amd-usbimage.wks (renamed from meta-amd-bsp/scripts/lib/wic/canned-wks/amd-usbimage.wks)0
3 files changed, 29 insertions, 29 deletions
diff --git a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
index a406de11..7704acfd 100644
--- a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
@@ -46,34 +46,5 @@ APPEND += "${APPEND_ADDITIONAL}"
EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
-# IMAGE_FSTYPES "live" is enabled by default in oe-core which is
-# responsible for building both "iso" & "hddimg". Although the
-# right way to specify which ones to build is using NOISO & NOHDD
-# vars, there's a specific scenario where Toaster build artifacts
-# collection mechanism depends on the IMAGE_FSTYPES variable to
-# specify the image types explicitly (See: commit a5b1aa4).
-# Also, "iso" doesn't get built even if specified explicitly
-# because NOISO = "1" by default (See c787dcd in oe-core).
-# Therefore, we do as follows:
-IMAGE_FSTYPES += "wic wic.bmap iso"
-NOISO = "0"
-NOHDD = "1"
-
-WKS_FILES ?= "amd-usbimage.wks"
-
-# Contents of IMAGE_BOOT_FILES are deployed into "amd-usbimage.wks" wic image
-IMAGE_BOOT_FILES = " \
- ${EFIIMGDIR}${EFIDIR}/*;EFI/BOOT/ \
- ${EFIIMGDIR}/startup.nsh;startup.nsh \
- ${KERNEL_IMAGETYPE} \
- ${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz;initrd \
- ${ROOTFS};rootfs.img \
-"
-
-# This makes sure that boot files are deployed before do_image_wic starts execution
-do_image_wic[depends] += "${IMAGE_BASENAME}:do_bootimg"
-
-IMAGE_OVERHEAD_FACTOR = "1.1"
-
# Add common feartures to be supported for all machines here
EXTRA_IMAGE_FEATURES += "amd-misc-pkgs"
diff --git a/meta-amd-distro/conf/distro/poky-amd.conf b/meta-amd-distro/conf/distro/poky-amd.conf
index c9d886b9..fd4cd300 100644
--- a/meta-amd-distro/conf/distro/poky-amd.conf
+++ b/meta-amd-distro/conf/distro/poky-amd.conf
@@ -22,3 +22,32 @@ IMAGE_ROOTFS_EXTRA_SPACE = "51200"
# We want information about package and image contents
INHERIT += "buildhistory"
BUILDHISTORY_COMMIT ?= "1"
+
+# IMAGE_FSTYPES "live" is enabled by default in oe-core which is
+# responsible for building both "iso" & "hddimg". Although the
+# right way to specify which ones to build is using NOISO & NOHDD
+# vars, there's a specific scenario where Toaster build artifacts
+# collection mechanism depends on the IMAGE_FSTYPES variable to
+# specify the image types explicitly (See: commit a5b1aa4).
+# Also, "iso" doesn't get built even if specified explicitly
+# because NOISO = "1" by default (See c787dcd in oe-core).
+# Therefore, we do as follows:
+IMAGE_FSTYPES += "wic wic.bmap iso"
+NOISO = "0"
+NOHDD = "1"
+
+WKS_FILES ?= "amd-usbimage.wks"
+
+# Contents of IMAGE_BOOT_FILES are deployed into "amd-usbimage.wks" wic image
+IMAGE_BOOT_FILES = " \
+ ${EFIIMGDIR}${EFIDIR}/*;EFI/BOOT/ \
+ ${EFIIMGDIR}/startup.nsh;startup.nsh \
+ ${KERNEL_IMAGETYPE} \
+ ${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz;initrd \
+ ${ROOTFS};rootfs.img \
+"
+
+# This makes sure that boot files are deployed before do_image_wic starts execution
+do_image_wic[depends] += "${IMAGE_BASENAME}:do_bootimg"
+
+IMAGE_OVERHEAD_FACTOR = "1.1"
diff --git a/meta-amd-bsp/scripts/lib/wic/canned-wks/amd-usbimage.wks b/meta-amd-distro/scripts/lib/wic/canned-wks/amd-usbimage.wks
index 96ce8c75..96ce8c75 100644
--- a/meta-amd-bsp/scripts/lib/wic/canned-wks/amd-usbimage.wks
+++ b/meta-amd-distro/scripts/lib/wic/canned-wks/amd-usbimage.wks