diff options
| author | Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com> | 2022-07-27 17:34:12 +0530 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2022-07-28 06:56:48 -0700 |
| commit | d7056523ec7d65ecf0f680f4c6379f064e256698 (patch) | |
| tree | 2b3b0a2ee11b80f65ef6cee63aa7f6ccd8bc6365 /meta-xilinx-core/recipes-devtools | |
| parent | 02d25b33e88f593f01142183cd2291098b985d18 (diff) | |
| download | meta-xilinx-d7056523ec7d65ecf0f680f4c6379f064e256698.tar.gz | |
qemu-devicetrees: Update SRCREV and remove qemu patch from layers
Removing the patch which replaces the python -> python3 as it was fixed
in qemu/dts repo.
Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-devtools')
3 files changed, 2 insertions, 41 deletions
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc index 6d834297..9ee8174a 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc | |||
| @@ -9,9 +9,6 @@ LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912c | |||
| 9 | 9 | ||
| 10 | PV = "xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" | 10 | PV = "xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" |
| 11 | 11 | ||
| 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
| 13 | SRC_URI:append = " file://0001-Makefile-Use-python3-instead-of-python.patch" | ||
| 14 | |||
| 15 | REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https" | 12 | REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https" |
| 16 | 13 | ||
| 17 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 14 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch deleted file mode 100644 index 425145d0..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From e80324e3497e5768c9fdbde3c0660a03d0dcc3ee Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | ||
| 3 | Date: Mon, 8 Feb 2021 16:32:34 -0800 | ||
| 4 | Subject: [PATCH] Makefile:Use python3 instead of python | ||
| 5 | |||
| 6 | Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | ||
| 7 | --- | ||
| 8 | Makefile | 12 ++++++------ | ||
| 9 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/Makefile b/Makefile | ||
| 12 | index a110483..fd8868c 100644 | ||
| 13 | --- a/Makefile | ||
| 14 | +++ b/Makefile | ||
| 15 | @@ -91,13 +91,13 @@ $(LQSPI_XIP_OUTDIR)/%.dts: %.dts $(DTSI_FILES) $(HEADER_FILES) | ||
| 16 | # TODO: Add support for auto-generated dependency list | ||
| 17 | versal-pmc-npi.dtsi: versal-pmc-npi-nxx.dtsi versal-h10-pmc-npi-nxx.dtsi | ||
| 18 | versal-pmc-npi-nxx.dtsi: Makefile | ||
| 19 | - @python -c 'for a in range(0, 54): print("\tGEN_NMU(" + str(a) + ")")' > $@ | ||
| 20 | - @python -c 'for a in range(0, 50): print("\tGEN_NSU(" + str(a) + ")")' >> $@ | ||
| 21 | - @python -c 'for a in range(0, 146): print("\tGEN_NPS(" + str(a) + ")")' >> $@ | ||
| 22 | + @python3 -c 'for a in range(0, 54): print("\tGEN_NMU(" + str(a) + ")")' > $@ | ||
| 23 | + @python3 -c 'for a in range(0, 50): print("\tGEN_NSU(" + str(a) + ")")' >> $@ | ||
| 24 | + @python3 -c 'for a in range(0, 146): print("\tGEN_NPS(" + str(a) + ")")' >> $@ | ||
| 25 | versal-h10-pmc-npi-nxx.dtsi: Makefile | ||
| 26 | - @python -c 'for a in range(0, 37): print("\tGEN_NMU(" + str(a) + ")")' > $@ | ||
| 27 | - @python -c 'for a in range(0, 33): print("\tGEN_NSU(" + str(a) + ")")' >> $@ | ||
| 28 | - @python -c 'for a in range(0, 135): print("\tGEN_NPS(" + str(a) + ")")' >> $@ | ||
| 29 | + @python3 -c 'for a in range(0, 37): print("\tGEN_NMU(" + str(a) + ")")' > $@ | ||
| 30 | + @python3 -c 'for a in range(0, 33): print("\tGEN_NSU(" + str(a) + ")")' >> $@ | ||
| 31 | + @python3 -c 'for a in range(0, 135): print("\tGEN_NPS(" + str(a) + ")")' >> $@ | ||
| 32 | |||
| 33 | clean: | ||
| 34 | $(RM) versal-pmc-npi-nxx.dtsi | ||
| 35 | -- | ||
| 36 | 2.7.4 | ||
| 37 | |||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb index fa03e3e0..f65f3d21 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb | |||
| @@ -2,4 +2,5 @@ | |||
| 2 | require qemu-devicetrees.inc | 2 | require qemu-devicetrees.inc |
| 3 | 3 | ||
| 4 | BRANCH ?= "master" | 4 | BRANCH ?= "master" |
| 5 | SRCREV ?= "ba78633a5aef6fe279ec90d1429480bb75365452" | 5 | SRCREV ?= "fac9ca0c139c2f6496c879138e5a83221835ae26" |
| 6 | |||
