meta-xilinx: subtree update:a9025136f5..eb4ba06eb1

David Roman (1):
      picozed-zynq7.dts: add marvell,88e1510 to eth phy

Jaewon Lee (3):
      xilinx-board.inc: fixing BOARD_ARCH and BOARDVARIANT_ARCH names
      Adding BOARD and BOARD_VARIANT level hierarchy
      ultra96: Using BOARD level hiearchy for ultra96 overrides

Madhurkiran Harikrishnan (1):
      weston: Update the weston patches to comply with weston-9.0

Philip Balister (2):
      u-boot-xlnx: Fix build error by applying patch from upstream u-boot.
      linux-xlnx: Fix build with patch from upstream kernel for gcc-10.

Raju Kumar Pothuraju (1):
      linux-xlnx.inc: Update overlay config fragments

Sai Hari Chandana Kalluri (4):
      Update LICENSE_CHECKSUM for kernel-module-hdmi
      zcu102-zynqmp.conf: Fix qemuboot for zcu102-zynqmp
      Cleanup QB_MACHINE for xilinx machines
      qemu-xilinx: Fix patch puzz warning during do_patch

Varalaxmi Bingi (1):
      meta-xilinx-bsp: Move uboot-device-tree to meta-xilinx-tools layer

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I2c1c51b9988cb36185f3218075ea007c14f82ff8

9 files changed, 10 insertions, 10 deletions

diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
index ae209fd6a..700a2f805 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -5,8 +5,8 @@ MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}"
 MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
 
 
-SOC_BOARD_ARCH ?= "${BOARD}"
-SOC_BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
+BOARD_ARCH ?= "${BOARD}"
+BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
 
-PACKAGE_EXTRA_ARCHS_append = " ${SOC_BOARD_ARCH}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_BOARDVARIANT_ARCH}'][d.getVar('SOC_BOARDVARIANT_ARCH') != d.getVar('SOC_BOARD_ARCH')]}"
+PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index 045e9422c..f31c10cf2 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -5,6 +5,9 @@
 
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/xilinx-board.inc
+
+BOARD = "ultra96"
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi"
 
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index 4c174d2f5..bbc068874 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \
     boot.scr \
 "
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index c9813b70c..1ab6a1c75 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -43,7 +43,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
 
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
index a1a894ec4..dd6966a0a 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -5,6 +5,7 @@
 require conf/machine/include/soc-versal.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -47,7 +48,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
 HDF_MACHINE = "vc-p-a2197-00-versal"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index baa5e12f0..e9044ba7f 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -35,7 +35,6 @@ IMAGE_BOOT_FILES += " \
 "
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index dee379785..2c890cfb8 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \
 		"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 0f38e32b0..be0f701cb 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -5,6 +5,7 @@
 require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 7e8316f50..9c7dbe839 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -8,6 +8,7 @@ SOC_VARIANT ?= "cg"
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -46,7 +47,6 @@ IMAGE_BOOT_FILES += " \
 		"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"