Merge remote-tracking branch 'origin/scarthgap' into yocto-master

This moves the system to scarthgap.  It is known to NOT work with Styhead and master,

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

3 files changed, 12 insertions, 16 deletions

diff --git a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
index 0b826ee2..b4de5ee1 100644
--- a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
+++ b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
@@ -39,18 +39,18 @@ CONVERSION_CMD:qemu-sd-fatimg () {
         parted -s ${QEMU_IMG} set 1 boot on
         parted ${QEMU_IMG} print
         BOOT_BLOCKS=$(LC_ALL=C parted -s ${QEMU_IMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-        rm -f ${UNPACKDIR}/${BOOT_VOLUME_ID}.img
-        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${UNPACKDIR}/${BOOT_VOLUME_ID}.img $BOOT_BLOCKS
+        rm -f ${WORKDIR}/${BOOT_VOLUME_ID}.img
+        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${WORKDIR}/${BOOT_VOLUME_ID}.img $BOOT_BLOCKS
         if [ -e ${DEPLOY_DIR_IMAGE}/boot.bin ]; then
-                mcopy -i ${UNPACKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.bin ::/
+                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.bin ::/
         fi
         if [ -e ${DEPLOY_DIR_IMAGE}/boot.scr ]; then
-                mcopy -i ${UNPACKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.scr ::/
+                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.scr ::/
         fi
         if [ ${INITRAMFS_IMAGE} = ${IMAGE_BASENAME} ] && [ x"${INITRAMFS_IMAGE_BUNDLE}" != "x1" ]; then
-                mcopy -i ${UNPACKDIR}/${BOOT_VOLUME_ID}.img -s  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot
+                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot
         fi
-        dd if=${UNPACKDIR}/${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024)
+        dd if=${WORKDIR}/${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024)
 }
 
 CONVERSION_DEPENDS_qemu-sd = "qemu-system-native"
diff --git a/meta-xilinx-core/classes/xilinx-deprecated.bbclass b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
index 1aee2fe1..788b963e 100644
--- a/meta-xilinx-core/classes/xilinx-deprecated.bbclass
+++ b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
@@ -9,10 +9,15 @@ python xilinx_deprecated_config_eventhandler () {
     if d.getVar('BOARD') or d.getVar('BOARD_VARIANT'):
         bb.error("Deprecated BOARD (%s) or BOARD_VARIANT (%s) is being used, they are no longer supported and are ignored." % (d.getVar('BOARD'), d.getVar('BOARD_VARIANT')))
 
+    # Check for 'generic' machines, warn the user this isn't what they want
+    if d.getVar('MACHINE').endswith('-generic'):
+        bb.warn('The %s machine is intended to be included by other machines, it should not be used by itself.  For a non-machine, SoC specific filesystem, please use one of the common machines defined in meta-xilinx-core.' % d.getVar('MACHINE'))
+
     msg_list = d.getVarFlags('XILINX_DEPRECATED') or []
     for msg_source in msg_list:
         if msg_source == "doc":
             continue
         msg = d.getVarFlag('XILINX_DEPRECATED', msg_source) or ""
-        bb.warn('%s: %s' % (msg_source, msg))
+        if msg:
+            bb.warn('%s: %s' % (msg_source, msg))
 }
diff --git a/meta-xilinx-core/classes/xilinx-vars.bbclass b/meta-xilinx-core/classes/xilinx-vars.bbclass
index 19cf8771..e19918ca 100644
--- a/meta-xilinx-core/classes/xilinx-vars.bbclass
+++ b/meta-xilinx-core/classes/xilinx-vars.bbclass
@@ -6,15 +6,6 @@ xilinx_variables_config_eventhandler[eventmask] = "bb.event.ConfigParsed"
 # It's up to the base sytem to define the variables being used here, we're
 # only going to check them.
 python xilinx_variables_config_eventhandler () {
-    # Verify HDF_MACHINE
-    hdf_prior = d.getVar('HDF_MACHINE_PRIOR')
-    hdf_final = d.getVar('HDF_MACHINE')
-
-    if hdf_prior and hdf_prior != hdf_final:
-        bb.fatal("HDF_MACHINE is set to %s, it appears you intended %s. " \
-                 "This is usually as a result of specifying it in the local.conf or before the 'require' in the machine .conf file. " \
-                 "See meta-xilinx-core/conf/machine/README." % (hdf_final, hdf_prior))
-
     # Verify DEFAULTTUNE
     tune_prior = d.getVar('DEFAULTTUNE_PRIOR')
     tune_final = d.getVar('DEFAULTTUNE')