From c29b040639203fd3f1d96db01162db2611e6a7b3 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 14 Nov 2017 23:15:23 +1000 Subject: u-boot-xlnx_2017.3: Fix QEMU SD boot partition setup Add a patch to fix the SD boot partition setup for QEMU targets such that instead of QEMU being special it defaults to the same behaviour as silicon/etc. Signed-off-by: Nathan Rossi Signed-off-by: Manjukumar Matha --- ...mp-Setup-partid-for-QEMU-to-match-silicon.patch | 33 ++++++++++++++++++++++ recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 recipes-bsp/u-boot/u-boot-xlnx/v2017.3/arm64-zynqmp-Setup-partid-for-QEMU-to-match-silicon.patch diff --git a/recipes-bsp/u-boot/u-boot-xlnx/v2017.3/arm64-zynqmp-Setup-partid-for-QEMU-to-match-silicon.patch b/recipes-bsp/u-boot/u-boot-xlnx/v2017.3/arm64-zynqmp-Setup-partid-for-QEMU-to-match-silicon.patch new file mode 100644 index 00000000..d8261e62 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-xlnx/v2017.3/arm64-zynqmp-Setup-partid-for-QEMU-to-match-silicon.patch @@ -0,0 +1,33 @@ +From 777ac896daaffeaa2fac2bdb424a96def7409a4b Mon Sep 17 00:00:00 2001 +From: Nathan Rossi +Date: Wed, 18 Oct 2017 21:29:47 +1000 +Subject: [PATCH] arm64: zynqmp: Setup partid for QEMU to match silicon + +During board late init the environment is 'setup' to set the partid to 0 +for QEMU. Change this so that QEMU targets behave just like silicon and +emulation targets such that partid is set to auto. + +Signed-off-by: Nathan Rossi +Upstream-Status: Submitted [sent to git@xilinx.com] +--- + board/xilinx/zynqmp/zynqmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c +index fd80844df6..2df66a4b75 100644 +--- a/board/xilinx/zynqmp/zynqmp.c ++++ b/board/xilinx/zynqmp/zynqmp.c +@@ -294,9 +294,9 @@ int board_late_init(void) + setenv("setup", "setenv baudrate 4800 && setenv bootcmd run veloce"); + case ZYNQMP_CSU_VERSION_EP108: + case ZYNQMP_CSU_VERSION_SILICON: ++ case ZYNQMP_CSU_VERSION_QEMU: + setenv("setup", "setenv partid auto"); + break; +- case ZYNQMP_CSU_VERSION_QEMU: + default: + setenv("setup", "setenv partid 0"); + } +-- +2.15.0 + diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb b/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb index 867f72e2..c10564f4 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb @@ -5,6 +5,10 @@ XILINX_RELEASE_VERSION = "v2017.3" SRCREV ?= "da811c4511ef9caeb95f9a22fe49d38bd8e56ded" PV = "v2017.01-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" +SRC_URI_append = " \ + file://arm64-zynqmp-Setup-partid-for-QEMU-to-match-silicon.patch \ + " + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c" -- cgit v1.2.3-54-g00ecf