From 92b86c9df15d6e84e51780ecb58f5e1624b41ab8 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 11 Oct 2022 07:52:33 -0700 Subject: xlnx-embeddedsw: Add 2023.1 placeholder, and move PV to append It is possible for a recipe that uses this to have a different versioning scheme. Instead of replacing the previous versioning scheme, just append out git information. This ensures that PREFERRED_VERSION and other version specific behaviors remain as intended. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 13837a3e..09d0ce0b 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -5,10 +5,12 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2" +ESW_BRANCH[2023.1] = "xlnx_rel_v2022.2" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" +ESW_REV[2023.1] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 9df06e8aade821ebf42382217616d58f26efb085 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 15:44:19 -0500 Subject: xlnx-embeddedsw: Update to latest 2023.1 branch/commit Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 09d0ce0b..72940ba0 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -5,12 +5,12 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2" -ESW_BRANCH[2023.1] = "xlnx_rel_v2022.2" +ESW_BRANCH[2023.1] = "master-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" +ESW_REV[2023.1] = "5fc063efc4803ef342985012a864a7609079a016" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" @@ -19,6 +19,7 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' LIC_FILES_CHKSUM[xlnx_rel_v2022.2] = 'ce611484168a6000bd35df68fc4f4290' +LIC_FILES_CHKSUM[master-next] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From dce24d1ab0aa9c0e05e0efd6e139534f462e0eef Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 19:37:58 -0700 Subject: embeddedsw: Add 2023.1 versions Signed-off-by: Mark Hatle --- .../recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb | 11 +++++++++++ .../recipes-bsp/embeddedsw/plm-firmware_2023.1.bb | 16 ++++++++++++++++ .../recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb | 16 ++++++++++++++++ .../recipes-bsp/embeddedsw/psm-firmware_2023.1.bb | 16 ++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb new file mode 100644 index 00000000..3f9740a0 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb @@ -0,0 +1,11 @@ +require fsbl-firmware.inc + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + +SRC_URI += " \ + file://makefile-skip-copy_bsp.sh.patch \ + file://fsbl-fixups.patch \ + " + +# This version does not build for zynq +COMPATIBLE_MACHINE:zynq = "none" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb new file mode 100644 index 00000000..cc810241 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb @@ -0,0 +1,16 @@ +require plm-firmware.inc + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + +SRC_URI += " \ + file://makefile-skip-copy_bsp.sh.patch \ + file://0001-versal_fw-Fixup-core-makefiles.patch \ + " + +EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" + +do_compile() { + oe_runmake + + ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin +} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb new file mode 100644 index 00000000..2c554d6d --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb @@ -0,0 +1,16 @@ +require pmu-firmware.inc + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + +SRC_URI += " \ + file://makefile-skip-copy_bsp.sh.patch \ + file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ + " + +EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" + +do_compile() { + oe_runmake + + ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin +} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb new file mode 100644 index 00000000..d861fb1c --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb @@ -0,0 +1,16 @@ +require psm-firmware.inc + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + +SRC_URI += " \ + file://makefile-skip-copy_bsp.sh.patch \ + file://0001-versal_fw-Fixup-core-makefiles.patch \ + " + +EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" + +do_compile() { + oe_runmake + + ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin +} -- cgit v1.2.3-54-g00ecf From a5abbfcf619a7d8cd3dfd2a042931463f986f399 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 7 Nov 2022 11:35:08 +0530 Subject: Updated SRCREV for 2023.1 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb index 854178fd..c9f3e321 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb @@ -2,5 +2,5 @@ require qemu-devicetrees.inc BRANCH ?= "master" -SRCREV ?= "2a44b7c4bd42a13e41cae9269de372862ed1e464" +SRCREV ?= "cffa4d47c6e239664492a92d5c3554f4f33d2f3e" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 72940ba0..0df56e86 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "5fc063efc4803ef342985012a864a7609079a016" +ESW_REV[2023.1] = "0e89798c4ccc529a939091343a0051c2429850a7" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 675cc3174baed5028c647eb829570501c34eddb9 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 7 Nov 2022 15:19:03 +0530 Subject: Updated SRCREV for 2023.1 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb index ed9f7839..1590db40 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2021.01" UBRANCH ?= "master" -SRCREV = "f0b15a93179beb9b9347dcc846b8fd76305bacfe" +SRCREV = "e8a2b6b6d117e2bbac6b83cf8f951f814c85b999" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 0df56e86..5f7c2ea6 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "0e89798c4ccc529a939091343a0051c2429850a7" +ESW_REV[2023.1] = "ff9feadcee3d767378ab0ece47ec7729706c1171" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 5a75cf75df6908101043a8c8aaf9c788c265429c Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 8 Nov 2022 18:32:23 +0530 Subject: Updated SRCREV for 2023.1 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 5f7c2ea6..bce67980 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "ff9feadcee3d767378ab0ece47ec7729706c1171" +ESW_REV[2023.1] = "e0f71de39018ddfe926702f4a70b9b853dde4a4e" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 2d13d91386d2a102925e5d74b593d4404bf2262a Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 9 Nov 2022 14:36:42 +0530 Subject: Updated SRCREV for 2023.1 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index bce67980..62337888 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "e0f71de39018ddfe926702f4a70b9b853dde4a4e" +ESW_REV[2023.1] = "a7634085efcd2f7283e2fdfb634748dcaf3a2486" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 79509ffc3ff8856798f986e2a2e14850d817c534 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 10 Nov 2022 15:38:58 +0530 Subject: Updated SRCREV for 2023.1 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb index c9f3e321..72e3bf10 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb @@ -2,5 +2,5 @@ require qemu-devicetrees.inc BRANCH ?= "master" -SRCREV ?= "cffa4d47c6e239664492a92d5c3554f4f33d2f3e" +SRCREV ?= "e66cc23bbb2cc7e7eff4b3ef69dd561050766b20" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 62337888..6d809581 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "a7634085efcd2f7283e2fdfb634748dcaf3a2486" +ESW_REV[2023.1] = "470504aae89093ac6a40f2180eed872f0c4fef2a" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 47e2c1d8937d6e34927ea04d459b026b71550f09 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 11 Nov 2022 13:28:07 +0530 Subject: Updated SRCREV for 2023.1_1995 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb index 1590db40..e1226281 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2021.01" UBRANCH ?= "master" -SRCREV = "e8a2b6b6d117e2bbac6b83cf8f951f814c85b999" +SRCREV = "0941cbeb593a6be8bf890105d38627dd853a1115" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index d8e3fab3..89804143 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,6 +1,6 @@ LINUX_VERSION = "5.15.0" KBRANCH="master" -SRCREV = "b754af5dade02518c3b0577f3066c3717bb17aa6" +SRCREV = "8178dcd484c63a31f6dde4168be01af86bc705e4" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 6d809581..ba4995ca 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "470504aae89093ac6a40f2180eed872f0c4fef2a" +ESW_REV[2023.1] = "31e1b6ff3b0fcc0dc4971d5f0f427a8c1d8b1349" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 42e4674091817a7f3603722680ee766de827f1e0 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 14 Nov 2022 13:17:16 +0530 Subject: Updated SRCREV for 2023.1_9171 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index ba4995ca..8baeb284 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "31e1b6ff3b0fcc0dc4971d5f0f427a8c1d8b1349" +ESW_REV[2023.1] = "2e6f42f470eb3f5e1f7ef50086de5bae7b461a9c" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 1feb581fd2784d176e6e3847e0db0c5fedea7fe0 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 15 Nov 2022 13:23:15 +0530 Subject: Updated SRCREV for 2023.1_3231 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 89804143..f032bfa1 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,6 +1,6 @@ LINUX_VERSION = "5.15.0" KBRANCH="master" -SRCREV = "8178dcd484c63a31f6dde4168be01af86bc705e4" +SRCREV = "c94d715f12728b7c03820182ec6f3dc0491b9e43" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 8baeb284..0df903f7 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "2e6f42f470eb3f5e1f7ef50086de5bae7b461a9c" +ESW_REV[2023.1] = "a3e842c5c01f38f6844cf1fbe4c904c44c4d391e" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 18b9f1495e2b386cc79361aa708dad1694fc82ab Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Sun, 20 Nov 2022 00:47:05 +0530 Subject: Updated SRCREV for 2023.1_2003 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 0df903f7..04ce837a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "a3e842c5c01f38f6844cf1fbe4c904c44c4d391e" +ESW_REV[2023.1] = "ca364e02a58547447519f530f9b6bba8abd2bfc9" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From b3674d6989e93d36177966fcdc5dacf9220132ac Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 22 Nov 2022 11:59:30 +0530 Subject: Updated SRCREV for 2023.1_7319 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 04ce837a..f136b32e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "ca364e02a58547447519f530f9b6bba8abd2bfc9" +ESW_REV[2023.1] = "5a13f7c068d0bddd14944a5442b848b2616f8f4e" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 4b86e51887934710d38dd3a2a3b2d5622d044be7 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 24 Nov 2022 14:27:09 +0530 Subject: Updated SRCREV for 2023.1_2491 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb index 47a80fc7..90128498 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb @@ -2,5 +2,5 @@ require qemu-devicetrees.inc BRANCH ?= "master" -SRCREV ?= "e40fc0821a20c9a7e79924b1e36631eb61e0dcf2" +SRCREV ?= "77d0bc94c27373f2adb21c9d2ce434c7af99520d" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index f136b32e..1e5b4130 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "5a13f7c068d0bddd14944a5442b848b2616f8f4e" +ESW_REV[2023.1] = "e3124e6081c2855dc5efc948c5dd3a2316a482bd" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From cdd012dc0694e5aaf2ca51d15dd2dd8a9a25d501 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 25 Nov 2022 12:30:05 +0530 Subject: Updated SRCREV for 2023.1_9347 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 1e5b4130..88776d0e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "e3124e6081c2855dc5efc948c5dd3a2316a482bd" +ESW_REV[2023.1] = "4d8007cd8c164888178135b313af0e29ae4b8d6c" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From fc4b0de3a77c4b9f858488743da29b3820d5b8c2 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 28 Nov 2022 14:25:29 +0530 Subject: Updated SRCREV for 2023.1_3543 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 88776d0e..9d6fc994 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "4d8007cd8c164888178135b313af0e29ae4b8d6c" +ESW_REV[2023.1] = "b009e682a718157db486e6fa20e64a0650822cf0" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 8cd674c5c7c11aecd430b24c6ee7ce28ffa27471 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 29 Nov 2022 11:31:27 +0530 Subject: Updated SRCREV for 2023.1_7343 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 9d6fc994..57be6cfa 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "b009e682a718157db486e6fa20e64a0650822cf0" +ESW_REV[2023.1] = "2a6b4ca15dda2e35ae43b7ff0a2985d8798f2471" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 529b354b477dd6546825371f9a176147b061a594 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 30 Nov 2022 11:21:16 +0530 Subject: Updated SRCREV for 2023.1_4983 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 57be6cfa..c39fcd4d 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "2a6b4ca15dda2e35ae43b7ff0a2985d8798f2471" +ESW_REV[2023.1] = "91d450691c98ddd431c48e308576b2e8dd03444b" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From e3123cede9bd8ce0ef7624923ed8a746dce06ef9 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 2 Dec 2022 15:09:55 +0530 Subject: Updated SRCREV for 2023.1_3583 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index f84fe542..b09755e0 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,6 +1,6 @@ LINUX_VERSION = "5.15.0" KBRANCH="master" -SRCREV = "507b50119fa3b3dc734f92a1a05e6ad6901964e9" +SRCREV = "015bf4737b50f4b3f7a5a8ed60c41bcb245618f5" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index c39fcd4d..f43a3a17 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "91d450691c98ddd431c48e308576b2e8dd03444b" +ESW_REV[2023.1] = "8682ce1923801fe7462e8e2830a8403070b8c45b" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From c9b840e036581e2e757ac1b14fcd059043d68a47 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 5 Dec 2022 11:48:31 +0530 Subject: Updated SRCREV for 2023.1_6111 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index f43a3a17..0af92055 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "8682ce1923801fe7462e8e2830a8403070b8c45b" +ESW_REV[2023.1] = "0c5b442096c3d58b4202e7361c4d103f0247bc2c" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From e420fd51ebb1701c8a240eed61bc1c411d2f146f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 7 Dec 2022 18:48:12 -0800 Subject: meta-xilinx-standalone: Remove obsolete machine references Signed-off-by: Mark Hatle --- meta-xilinx-standalone/README.md | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/README.md b/meta-xilinx-standalone/README.md index ea9fdbc4..6193f015 100644 --- a/meta-xilinx-standalone/README.md +++ b/meta-xilinx-standalone/README.md @@ -33,35 +33,6 @@ The standalone firmware is a genericly configured firmware, it can be build either in a single standalong configuration, or via an automated multiconfig approach only when needed. -* single configuration - -Select a machine: - cortexa53-zynqmp - ZynqMP based Cortex-A53 target - Valid Targets: fsbl-firmware, meta-toolchain - - cortexa72-versal - Versal based Cortex-A72 target - Valid Targets: meta-toolchain - - cortexa9-zynq - Zynq based cortex-A9 target - Valid Targets: meta-toolchain - - cortexr5-versal - Versal based Cortex-R5 target - Valid Targets: meta-toolchain - - cortexr5-zynqmp - ZynqMP based Cortex-R5 target - Valid Targets: meta-toolchain - - microblaze-versal-fw - Microblaze for Versal PSM/PLM firmware - Valid Targets: psm-firmware, plm-firmware, meta-toolchain - - microblaze-zynqmp-pmu - Microblaze for ZynqMP PMU firmware - Valid Target: pmu-firmware, meta-toolchain - - -To build you should use a command similar to: -MACHINE= DISTRO=xilinx-standalone bitbake - - * multiconfig setup To automatically build the standalone firmware with a Linux build, you need -- cgit v1.2.3-54-g00ecf From 2ce669e1a5321111853f891e1bfb3cc17c5097af Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 7 Dec 2022 18:48:59 -0800 Subject: xlnx-embeddedsw: Add special git - AUTOREV version Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 0af92055..86d8bcf2 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,6 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2" ESW_BRANCH[2023.1] = "master-next" +ESW_BRANCH[git] = "master" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" @@ -20,6 +21,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' LIC_FILES_CHKSUM[xlnx_rel_v2022.2] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM[master-next] = 'ce611484168a6000bd35df68fc4f4290' +LIC_FILES_CHKSUM[master] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From a2e4b30b9263517e022e1781e0991a20fa6634fd Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 7 Dec 2022 18:55:01 -0800 Subject: meta-xilinx-standalone: Update 2023.1 embeddedsw and git version Update the integration to match 2023 changes. Update the Makefile and versal pathes for 2023 specific version Add a workaround for -Werror -Wnull-dereference failing during some compiles Signed-off-by: Mark Hatle --- .../embeddedsw/fsbl-firmware_%.bbappend | 12 ++- ...0001-Workaround-Disable-Wnull-dereference.patch | 42 +++++++++ .../0001-versal_fw-Fixup-core-makefiles.patch | 101 ++++++++++++++++++++ .../2023.1/makefile-skip-copy_bsp.sh.patch | 104 +++++++++++++++++++++ .../recipes-bsp/embeddedsw/fsbl-firmware.inc | 2 +- .../recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb | 3 +- .../recipes-bsp/embeddedsw/fsbl-firmware_git.bb | 4 +- .../recipes-bsp/embeddedsw/plm-firmware_2023.1.bb | 23 ++++- .../recipes-bsp/embeddedsw/plm-firmware_git.bb | 57 +++++------ .../recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb | 3 +- .../recipes-bsp/embeddedsw/pmu-firmware_git.bb | 37 +------- .../recipes-bsp/embeddedsw/psm-firmware_2023.1.bb | 21 ++++- .../recipes-bsp/embeddedsw/psm-firmware_git.bb | 55 ++++------- 13 files changed, 350 insertions(+), 114 deletions(-) create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-versal_fw-Fixup-core-makefiles.patch create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/makefile-skip-copy_bsp.sh.patch (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend index 509a0dbb..6a23dc47 100644 --- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend +++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend @@ -1,16 +1,20 @@ # QEMU for the Kria SOM requires a section from the FSBL to be extracted -FSBL_DEFAULT_NAME = "executable.elf" -PMU_CONF_NAME = "pmu-conf.bin" +PMU_CONF_NAME ?= "pmu-conf" +PMU_CONF_BASE_NAME ?= "${PMU_CONF_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" + +# Required so we can run objcopy in do_compile +DEPENDS:append:zynqmp = " virtual/${TARGET_PREFIX}binutils" do_compile:append:zynqmp () { if [ -z "${SYSTEM_DTFILE}" ]; then - aarch64-none-elf-objcopy --dump-section .sys_cfg_data=../${PMU_CONF_NAME} ${FSBL_DEFAULT_NAME} + ${OBJCOPY} --dump-section .sys_cfg_data=${B}/${PMU_CONF_NAME}.bin ${B}/${ESW_COMPONENT} fi } do_deploy:append:zynqmp () { if [ -z "${SYSTEM_DTFILE}" ]; then - install -Dm 0644 ${B}/${PMU_CONF_NAME} ${DEPLOYDIR}/${PMU_CONF_NAME} + install -Dm 0644 ${B}/${PMU_CONF_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_BASE_NAME}.bin + ln -s ${PMU_CONF_BASE_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_NAME}.bin fi } diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch new file mode 100644 index 00000000..a71a4c11 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch @@ -0,0 +1,42 @@ +From 98b3377a70ee057f7529bd3381fa6d844ba6fe09 Mon Sep 17 00:00:00 2001 +From: Mark Hatle +Date: Wed, 7 Dec 2022 17:36:22 -0800 +Subject: [PATCH] Workaround: Disable -Wnull-dereference + + xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] + +Signed-off-by: Mark Hatle +--- + lib/sw_services/xilpm/src/versal/common/Makefile | 2 +- + lib/sw_services/xilpm/src/versal_net/common/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/sw_services/xilpm/src/versal/common/Makefile b/lib/sw_services/xilpm/src/versal/common/Makefile +index 0b61e37bbb..6c5f776ef0 100644 +--- a/lib/sw_services/xilpm/src/versal/common/Makefile ++++ b/lib/sw_services/xilpm/src/versal/common/Makefile +@@ -10,7 +10,7 @@ COMPILER_FLAGS= + EXTRA_COMPILER_FLAGS= + CUSTOM_COMPILER_FLAGS=-Werror + ifeq ($(findstring gcc, $(COMPILER)), gcc) +-CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wnull-dereference -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef ++CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef + endif + LIB= libxilpm.a + +diff --git a/lib/sw_services/xilpm/src/versal_net/common/Makefile b/lib/sw_services/xilpm/src/versal_net/common/Makefile +index 36460a1b18..257ad694e3 100644 +--- a/lib/sw_services/xilpm/src/versal_net/common/Makefile ++++ b/lib/sw_services/xilpm/src/versal_net/common/Makefile +@@ -10,7 +10,7 @@ COMPILER_FLAGS= + EXTRA_COMPILER_FLAGS= + CUSTOM_COMPILER_FLAGS=-Werror + ifeq ($(findstring gcc, $(COMPILER)), gcc) +-CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wnull-dereference -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef ++CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef + endif + LIB= libxilpm.a + +-- +2.17.1 + diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-versal_fw-Fixup-core-makefiles.patch new file mode 100644 index 00000000..d6cb0e38 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-versal_fw-Fixup-core-makefiles.patch @@ -0,0 +1,101 @@ +From 607322dafb2979affd329ea70a2a7952203188a4 Mon Sep 17 00:00:00 2001 +From: Mark Hatle +Date: Wed, 7 Dec 2022 15:42:15 -0800 +Subject: [PATCH] versal_fw: Fixup core makefiles + +The Yocto Project build environment needs to be able to override a few +additional variables that may not be appropriate to do on the regular +command line build version. This patch preserves the default while +allowing it to be overriden as necessary. + +Signed-off-by: Mark Hatle +--- + lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++-- + lib/sw_apps/versal_plm/misc/versal_net/Makefile | 6 ++++-- + lib/sw_apps/versal_psmfw/misc/Makefile | 6 ++++-- + 3 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/lib/sw_apps/versal_plm/misc/versal/Makefile b/lib/sw_apps/versal_plm/misc/versal/Makefile +index 5c8e719e9c..af070716b6 100644 +--- a/lib/sw_apps/versal_plm/misc/versal/Makefile ++++ b/lib/sw_apps/versal_plm/misc/versal/Makefile +@@ -2,6 +2,8 @@ + COMPILER := mb-gcc + ARCHIVER := mb-gcc-ar + ASSEMBLER := mb-as ++COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare ++EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects + DRIVER_LIB_VERSION = 1.0 + PROCESSOR = psv_pmc_0 + LIBRARIES = ${PROCESSOR}/lib/libxil.a +@@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a + + %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,) + @echo "Running Make include in $(subst /make.include,,$@)" +- $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" ++ $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" + + %/make.libs: include + @echo "Running Make libs in $(subst /make.libs,,$@)" +- $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" ++ $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" + + %/make.clean: + $(MAKE) -C $(subst /make.clean,,$@) -s clean +diff --git a/lib/sw_apps/versal_plm/misc/versal_net/Makefile b/lib/sw_apps/versal_plm/misc/versal_net/Makefile +index abffa6c5ed..4af5a02001 100644 +--- a/lib/sw_apps/versal_plm/misc/versal_net/Makefile ++++ b/lib/sw_apps/versal_plm/misc/versal_net/Makefile +@@ -2,6 +2,8 @@ + COMPILER := mb-gcc + ARCHIVER := mb-gcc-ar + ASSEMBLER := mb-as ++COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare ++EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects + DRIVER_LIB_VERSION = 1.0 + PROCESSOR = psx_pmc_0 + LIBRARIES = ${PROCESSOR}/lib/libxil.a +@@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a + + %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,) + @echo "Running Make include in $(subst /make.include,,$@)" +- $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" ++ $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" + + %/make.libs: include + @echo "Running Make libs in $(subst /make.libs,,$@)" +- $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" ++ $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" + + %/make.clean: + $(MAKE) -C $(subst /make.clean,,$@) -s clean +diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile +index 02d85e492e..f6386dcbed 100644 +--- a/lib/sw_apps/versal_psmfw/misc/Makefile ++++ b/lib/sw_apps/versal_psmfw/misc/Makefile +@@ -11,6 +11,8 @@ PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES)) + COMPILER := mb-gcc + ARCHIVER := mb-ar + ASSEMBLER := mb-as ++COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare ++EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra + + ifneq (,$(findstring win,$(RDI_PLATFORM))) + SHELL = CMD +@@ -41,11 +43,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a + + %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,) + @echo "Running Make include in $(subst /make.include,,$@)" +- $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra" ++ $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" + + %/make.libs: include + @echo "Running Make libs in $(subst /make.libs,,$@)" +- $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra" ++ $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" + + %/make.clean: + $(MAKE) -C $(subst /make.clean,,$@) -s clean +-- +2.17.1 + diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/makefile-skip-copy_bsp.sh.patch new file mode 100644 index 00000000..1300c7e1 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/makefile-skip-copy_bsp.sh.patch @@ -0,0 +1,104 @@ +From d703670357546d9aab66baea1f6751ba1cbdf7ad Mon Sep 17 00:00:00 2001 +From: Mark Hatle +Date: Wed, 7 Dec 2022 15:30:23 -0800 +Subject: [PATCH] Prevent makefile from calling copy_bsp.sh + +If we call copy_bsp.sh we will undo any manual compliation steps we +have already done. Avoid this. + +YP integration specific + +Signed-off-by: Mark Hatle +--- + lib/sw_apps/versal_plm/src/versal/Makefile | 4 ++-- + lib/sw_apps/versal_plm/src/versal_net/Makefile | 4 ++-- + lib/sw_apps/versal_psmfw/src/versal/Makefile | 4 ++-- + lib/sw_apps/versal_psmfw/src/versal_net/Makefile | 6 +++--- + lib/sw_apps/zynqmp_pmufw/src/Makefile | 4 ++-- + 5 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lib/sw_apps/versal_plm/src/versal/Makefile b/lib/sw_apps/versal_plm/src/versal/Makefile +index d1ebd1d374..bfb8c83adb 100644 +--- a/lib/sw_apps/versal_plm/src/versal/Makefile ++++ b/lib/sw_apps/versal_plm/src/versal/Makefile +@@ -32,8 +32,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + + $(LIBS): +- echo "Copying BSP files" +- ../../misc/versal/copy_bsp.sh ++ #echo "Copying BSP files" ++ #../../misc/versal/copy_bsp.sh + echo "Compiling bsp" + $(MAKE) -C ../../misc/versal/versal_plm_bsp + +diff --git a/lib/sw_apps/versal_plm/src/versal_net/Makefile b/lib/sw_apps/versal_plm/src/versal_net/Makefile +index 39c7aa38e3..081d8f1b2e 100644 +--- a/lib/sw_apps/versal_plm/src/versal_net/Makefile ++++ b/lib/sw_apps/versal_plm/src/versal_net/Makefile +@@ -32,8 +32,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + + $(LIBS): +- echo "Copying BSP files" +- ../../misc/versal_net/copy_bsp.sh ++ #echo "Copying BSP files" ++ #../../misc/versal_net/copy_bsp.sh + echo "Compiling bsp" + $(MAKE) -C ../../misc/versal_net/versal_plm_bsp + +diff --git a/lib/sw_apps/versal_psmfw/src/versal/Makefile b/lib/sw_apps/versal_psmfw/src/versal/Makefile +index 1572bbbca9..ce182acaa7 100644 +--- a/lib/sw_apps/versal_psmfw/src/versal/Makefile ++++ b/lib/sw_apps/versal_psmfw/src/versal/Makefile +@@ -34,8 +34,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + + $(LIBS): +- echo "Copying BSP files" +- ../../misc/copy_bsp.sh ++ #echo "Copying BSP files" ++ #../../misc/copy_bsp.sh + echo "Compiling bsp" + $(MAKE) -C ../../misc/versal_psmfw_bsp + +diff --git a/lib/sw_apps/versal_psmfw/src/versal_net/Makefile b/lib/sw_apps/versal_psmfw/src/versal_net/Makefile +index a72ffa1de2..3670310daa 100644 +--- a/lib/sw_apps/versal_psmfw/src/versal_net/Makefile ++++ b/lib/sw_apps/versal_psmfw/src/versal_net/Makefile +@@ -34,8 +34,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + + $(LIBS): +- echo "Copying BSP files" +- ../../misc/versal_net/copy_bsp.sh ++ #echo "Copying BSP files" ++ #../../misc/versal_net/copy_bsp.sh + echo "Compiling bsp" + $(MAKE) -C ../../misc/versal_net/versal_psmfw_bsp + +@@ -44,4 +44,4 @@ $(LIBS): + + clean: + rm -rf $(OBJS) $(LIBS) $(EXEC) *.o *.d ../common/*.o ../common/*.d +- rm -rf ../../misc/versal_net/versal_psmfw_bsp +\ No newline at end of file ++ rm -rf ../../misc/versal_net/versal_psmfw_bsp +diff --git a/lib/sw_apps/zynqmp_pmufw/src/Makefile b/lib/sw_apps/zynqmp_pmufw/src/Makefile +index 1750c0a329..17f6a545ea 100644 +--- a/lib/sw_apps/zynqmp_pmufw/src/Makefile ++++ b/lib/sw_apps/zynqmp_pmufw/src/Makefile +@@ -28,8 +28,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + + $(LIBS): +- echo "Copying BSP files" +- ../misc/copy_bsp.sh ++ #echo "Copying BSP files" ++ #../misc/copy_bsp.sh + echo "Compiling bsp" + $(MAKE) -C ../misc/zynqmp_pmufw_bsp + +-- +2.17.1 + diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc index dd87ff31..ceb49417 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc @@ -2,7 +2,7 @@ DESCRIPTION = "First Stage Bootloader" inherit xlnx-embeddedsw deploy -COMPATIBLE_HOST = ".*-(elf|eabi)" +COMPATIBLE_HOST = ".*-(elf|.*eabi)" COMPATIBLE_MACHINE = "none" COMPATIBLE_MACHINE:zynq = ".*" COMPATIBLE_MACHINE:zynqmp = ".*" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb index 3f9740a0..9055ac6c 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb @@ -1,10 +1,11 @@ require fsbl-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://fsbl-fixups.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " # This version does not build for zynq diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb index 697431ad..dc3b0ca9 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb @@ -3,10 +3,12 @@ DEFAULT_PREFERENCE = "-1" require fsbl-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ + file://makefile-skip-copy_bsp.sh.patch \ file://fsbl-fixups.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " # This version does not build for zynq diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb index cc810241..22626f4d 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb @@ -1,15 +1,36 @@ require plm-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +# Separate build directories for versal and versal-net +SOC_DIR = "versal" +SOC_DIR:versal-net = "versal_net" +B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}" + +BSP_DIR ?= "${B}/../../misc/versal_plm_bsp" + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-versal_fw-Fixup-core-makefiles.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" +# Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow] +EXTRA_COMPILER_FLAGS += "-Wno-overflow" + +# Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] +EXTRA_COMPILER_FLAGS += "-Wno-null-dereference" + +do_configure() { + # manually do the copy_bsp step first, so as to be able to fix up use of + # mb-* commands + ${B}/../../misc/${SOC_DIR}/copy_bsp.sh +} + do_compile() { + pwd oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb index af906e5e..aae0e8af 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb @@ -3,53 +3,38 @@ DEFAULT_PREFERENCE = "-1" require plm-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +# Separate build directories for versal and versal-net +SOC_DIR = "versal" +SOC_DIR:versal-net = "versal_net" +B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}" + +BSP_DIR ?= "${B}/../../misc/versal_plm_bsp" + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ + file://0001-versal_fw-Fixup-core-makefiles.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " +EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" + +# Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow] +EXTRA_COMPILER_FLAGS += "-Wno-overflow" + +# Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] +EXTRA_COMPILER_FLAGS += "-Wno-null-dereference" + do_configure() { # manually do the copy_bsp step first, so as to be able to fix up use of # mb-* commands - . ${B}/../misc/copy_bsp.sh - echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak + ${B}/../../misc/${SOC_DIR}/copy_bsp.sh } do_compile() { - # First process the sequential items - for i in $(cat seq.mak); do - echo Include Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(cat seq.mak); do - echo Libs Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # the Makefile in ${B}/../misc/Makefile, does not handle CC, AR, AS, etc - # properly. So do its job manually. Preparing the includes first, then libs. - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Include: $i - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Libs: $i - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # --build-id=none is required due to linker script not defining a location for it. - # Again, recipe-systoot include is necessary - echo Construct: executable - oe_runmake plm.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" + pwd + oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb index 2c554d6d..b1e8c005 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb @@ -1,10 +1,11 @@ require pmu-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb index a17aad55..e55edd1d 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb @@ -3,45 +3,18 @@ DEFAULT_PREFERENCE = "-1" require pmu-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ + file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " -do_configure() { - # manually do the copy_bsp step first, so as to be able to fix up use of - # mb-* commands - . ${B}/../misc/copy_bsp.sh - echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak -} +EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" do_compile() { - # First process the sequential items - for i in $(cat seq.mak); do - echo Include Seq: $i - oe_runmake -C $(dirname $i) -s include - done - for i in $(cat seq.mak); do - echo Libs Seq: $i - oe_runmake -C $(dirname $i) -s libs - done - - # the Makefile in ${B}/../misc/Makefile, does not handle CC, AR, AS, etc - # properly. So do its job manually. Preparing the includes first, then libs. - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Include: $i - oe_runmake -C $(dirname $i) -s include - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Libs: $i - oe_runmake -C $(dirname $i) -s libs - done - - # --build-id=none is required due to linker script not defining a location for it. - # Again, recipe-systoot include is necessary - echo Construct: executable - oe_runmake executable.elf CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" + oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb index d861fb1c..bd992e41 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb @@ -1,14 +1,33 @@ require psm-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +# Separate build directories for versal and versal-net +SOC_DIR = "versal" +SOC_DIR:versal-net = "versal_net" +B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}" + +BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp" + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-versal_fw-Fixup-core-makefiles.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" +# Override default since we're in a subdirectory deeper now... +do_configure() { + # manually do the copy_bsp step first, so as to be able to fix up use of + # mb-* commands + if [ ${SOC_DIR} != "versal" ]; then + ${B}/../../misc/${SOC_DIR}/copy_bsp.sh + else + ${B}/../../misc/copy_bsp.sh + fi +} + do_compile() { oe_runmake diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb index 94a2c22d..a70c7a8d 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb @@ -3,53 +3,36 @@ DEFAULT_PREFERENCE = "-1" require psm-firmware.inc -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" +# Separate build directories for versal and versal-net +SOC_DIR = "versal" +SOC_DIR:versal-net = "versal_net" +B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}" + +BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp" + +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ + file://0001-versal_fw-Fixup-core-makefiles.patch \ + file://0001-Workaround-Disable-Wnull-dereference.patch \ " +EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" + +# Override default since we're in a subdirectory deeper now... do_configure() { # manually do the copy_bsp step first, so as to be able to fix up use of # mb-* commands - . ${B}/../misc/copy_bsp.sh - echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak + if [ ${SOC_DIR} != "versal" ]; then + ${B}/../../misc/${SOC_DIR}/copy_bsp.sh + else + ${B}/../../misc/copy_bsp.sh + fi } do_compile() { - # First process the sequential items - for i in $(cat seq.mak); do - echo Include Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(cat seq.mak); do - echo Libs Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # the Makefile in ${B}/../misc/Makefile, does not handle CC, AR, AS, etc - # properly. So do its job manually. Preparing the includes first, then libs. - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Include: $i - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Libs: $i - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # --build-id=none is required due to linker script not defining a location for it. - # Again, recipe-systoot include is necessary - echo Construct: executable - oe_runmake psmfw.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" + oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } -- cgit v1.2.3-54-g00ecf From da2cc7357fbeab427aaa9d2f0f868a21577c0b93 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 9 Dec 2022 12:21:57 -0800 Subject: *-tc.conf: Update machines to define qemu-xilinx as preferred Each Xilinx machine.conf should include the qemu file to ensure the correct PREFERRED_PROVIDERS_qemu (and related) are defined properly. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/conf/machine/aarch32-tc.conf | 1 + meta-xilinx-standalone/conf/machine/aarch64-tc.conf | 1 + meta-xilinx-standalone/conf/machine/arm-rm-tc.conf | 1 + meta-xilinx-standalone/conf/machine/microblaze-tc.conf | 1 + 4 files changed, 4 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf index 7031d1af..5b59bc6a 100644 --- a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf +++ b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf @@ -1,3 +1,4 @@ +require conf/machine/include/machine-xilinx-qemu.inc require conf/multilib.conf require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/baremetal-tc.conf diff --git a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf index d20ad48d..b3ab4c6b 100644 --- a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf +++ b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf @@ -1,3 +1,4 @@ +require conf/machine/include/machine-xilinx-qemu.inc require conf/multilib.conf require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/baremetal-tc.conf diff --git a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf index a3a07768..6f0e5fbf 100644 --- a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf +++ b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf @@ -1,3 +1,4 @@ +require conf/machine/include/machine-xilinx-qemu.inc require conf/multilib.conf require conf/machine/include/arm/arch-armv8r.inc require conf/machine/include/baremetal-tc.conf diff --git a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf index 372a8fba..4eb88828 100644 --- a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf +++ b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf @@ -1,3 +1,4 @@ +require conf/machine/include/machine-xilinx-qemu.inc require conf/multilib.conf require conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/baremetal-tc.conf -- cgit v1.2.3-54-g00ecf From 587da65b312bd4e8072b7c84e0c5bd5eed95eb6c Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 20 Dec 2022 12:49:03 +0530 Subject: Updated SRCREV for 2023.1_1823 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb index 45181691..23aacdf1 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2021.01" UBRANCH ?= "master" -SRCREV = "79f1d334368f063d3ec88ce80dd8b5248c58f84c" +SRCREV = "e31e620390acdc4e34baca3355fd840618436356" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 3fc51ac1..fc48843b 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.0" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="master" -SRCREV = "bdf00302ed29141c201e9c05b7338db698b2dce9" +SRCREV = "155ae9648df275d38841cfe45231ba0471baa1cb" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 86d8bcf2..3dbc8ac5 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "0c5b442096c3d58b4202e7361c4d103f0247bc2c" +ESW_REV[2023.1] = "979d90d818c87f810824936f76bdd6361b0516f4" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From a906596017b9fd3e55555862700594aad8867c27 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 19 Dec 2022 15:17:19 -0800 Subject: standalone gcc-runtime_%.bbappend: Add workaround for getentropy and related getentropy and the related arc4random function are defined in unistd.h, they appear to be defined in some iterations of libgloss. However the defintion is not enough in the general case, which causes C++ linkage to fail with: libstdc++.a(random.o): in function `std::(anonymous namespace)::__libc_getentropy(void*)': (.text._ZNSt12_GLOBAL__N_117__libc_getentropyEPv+0x14): *undefined reference to `getentropy'* This change doesn't remove getentropy or arc4random, but does instruct libstdc++ to not use either function. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index cbf43008..629dd99f 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -9,6 +9,8 @@ EXTRA_OECONF:append:xilinx-standalone:class-target = " \ --enable-plugins \ --with-gnu-as \ --disable-libitm \ + glibcxx_cv_getentropy=no \ + glibcxx_cv_arc4random=no \ " EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ -- cgit v1.2.3-54-g00ecf From 2461e6c07f1e327fec346f6134c8a906f8b6c114 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 21 Dec 2022 16:09:16 +0530 Subject: Updated SRCREV for 2023.1_5219 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 3dbc8ac5..d02a5dd2 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "979d90d818c87f810824936f76bdd6361b0516f4" +ESW_REV[2023.1] = "9e14866252711caf13a8bf1011f24a411be6cab5" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 6a5cb91eabe3c8f15ec0d8f55215d6d2d6028515 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 22 Dec 2022 16:12:13 +0530 Subject: Updated SRCREV for 2023.1_4251 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb index 23aacdf1..1958b082 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2021.01" UBRANCH ?= "master" -SRCREV = "e31e620390acdc4e34baca3355fd840618436356" +SRCREV = "a6062ad66e0c9a00b9a95f392373c175bd7f3e6b" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index fc48843b..9254d7e1 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.0" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="master" -SRCREV = "155ae9648df275d38841cfe45231ba0471baa1cb" +SRCREV = "66047f17b3e38228bf4fbae2de4947f2dfe66c19" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index d02a5dd2..cdee25a7 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "9e14866252711caf13a8bf1011f24a411be6cab5" +ESW_REV[2023.1] = "9b24ed36f3451994ac21eee73474f98ea2e02c56" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 48cd0f231d1fa462673c5e663c084f6790ccd2a6 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 26 Dec 2022 14:46:04 +0530 Subject: Updated SRCREV for 2023.1_9847 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index cdee25a7..761eb957 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "9b24ed36f3451994ac21eee73474f98ea2e02c56" +ESW_REV[2023.1] = "13c428f88432e86e1e48f496e274d5a1eb4dd59f" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From a0aa00e5257523e1e12db0b55a57f65a6f5cdfb6 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 28 Dec 2022 15:30:38 +0530 Subject: Updated SRCREV for 2023.1_3683 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 761eb957..9a4cac2f 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "13c428f88432e86e1e48f496e274d5a1eb4dd59f" +ESW_REV[2023.1] = "633fdd4a16dc76d5c0c8c9625af2c03ffe54ea1d" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From d04f53509295be5040efbc98c59f5c5c0c54ba5e Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 4 Jan 2023 17:34:46 +0530 Subject: Updated SRCREV for 2023.1_5895 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 9a4cac2f..4c69f4c9 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "633fdd4a16dc76d5c0c8c9625af2c03ffe54ea1d" +ESW_REV[2023.1] = "1ef4e63ec7fc7b373f02c0e6ca11c939f6520c44" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From a6bbe1adb83bcb0edc62fc9f1d3f5c54db34a916 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 5 Jan 2023 16:24:31 +0530 Subject: Updated SRCREV for 2023.1_6435 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb index a3da73fa..9f2592d5 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2021.01" UBRANCH ?= "master" -SRCREV = "4137a8a84a534f01b04efde7935eb08ae18acf3c" +SRCREV = "d706060b431d6799d0564be6053f896cd6778ddb" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 01b10529..80cb9fdb 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.0" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="master" -SRCREV = "35d1d3f8a60afcd8ef9c6f0fcc36f266695d856c" +SRCREV = "4141348a90b289f09400964663938995ccc8af6c" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 4c69f4c9..d9599e3a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "1ef4e63ec7fc7b373f02c0e6ca11c939f6520c44" +ESW_REV[2023.1] = "2295e94d5573a3de3f20c2271c74d058b5a83bb8" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From b260751a3149df900aaae302971ae9f0dc2e629f Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 13 Jan 2023 23:30:51 +0530 Subject: Updated SRCREV for 2023.1_3343 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index 6ff4243f..a4b822ac 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH ?= "xlnx_rebase_v2023.01-next" -SRCREV = "1fe11bde7b765024eb7a49584e7c65015ae90bac" +SRCREV = "907ddbc80d669fa7f65bdab0e9a64ca6228caee6" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc index 555dcd1a..1f792c66 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc @@ -1,3 +1,3 @@ XILINX_QEMU_VERSION = "v7.1.0" BRANCH = "master" -SRCREV = "b1bd591be5da55e5ae293e96b9e4d5fdf1a717bd" +SRCREV = "df7653df3c172a473f1ac8bf1427927e7b7db931" diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index a6bfdcad..551e2626 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.0" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="master" -SRCREV = "4004675be19290e29ab424688a33db44a84b4547" +SRCREV = "72a24cae76209b1519e2bbe0923023919bc36be9" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index d9599e3a..25e42e2a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "2295e94d5573a3de3f20c2271c74d058b5a83bb8" +ESW_REV[2023.1] = "d0c8e5e9fa9ecd228ece2832915876b5886f38e3" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 85e35d044af743b39acc1204377dad0d624be430 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Sun, 15 Jan 2023 23:00:59 +0530 Subject: Updated SRCREV for 2023.1_7643 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb | 2 +- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb index a84fb10a..41c8873c 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb @@ -2,5 +2,5 @@ require qemu-devicetrees.inc BRANCH ?= "master" -SRCREV ?= "684900bedd23ebca843f92091081e333b65b1a81" +SRCREV ?= "819cc099222c7a5f066dd43de58d530a43d322d0" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc index 1f792c66..58e1bcce 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc @@ -1,3 +1,3 @@ XILINX_QEMU_VERSION = "v7.1.0" BRANCH = "master" -SRCREV = "df7653df3c172a473f1ac8bf1427927e7b7db931" +SRCREV = "f79bbe582955220d547b448950528a5646ad192e" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 25e42e2a..1935fd69 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "d0c8e5e9fa9ecd228ece2832915876b5886f38e3" +ESW_REV[2023.1] = "1aa981dfeaf83505ae8b4a618c3709af98ea8038" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From df1e0ba1c2b70fac570de53b80eb7eea99a7fdae Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 16 Jan 2023 16:32:31 +0530 Subject: Updated SRCREV for 2023.1_3135 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 551e2626..a2210e79 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.0" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="master" -SRCREV = "72a24cae76209b1519e2bbe0923023919bc36be9" +SRCREV = "fa82574fbf80f0da1a57a7a8b4defad6b9c01ef0" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 1935fd69..b2e849e7 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "1aa981dfeaf83505ae8b4a618c3709af98ea8038" +ESW_REV[2023.1] = "ffe0841b0df2e4daa62df9ab78789bea717bc3af" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 8fe1ee1873ac97dd9fb721c4066c473c43de6fc6 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 14 Jan 2023 09:25:41 -0800 Subject: xilinx-standalone.inc: Sync with poky distro settings Certain settings appear to have an overall affect on recipe hashes. Use petalinux (poky) distro as an example for base settings to ensure native items built in one config SHOULD also be re-usable in the bareemetal config. This has a side effect of NOT disabling static binaries in baremetal, but this seems like a reasonable default, since there really isn't a concept of dynamically loaded libraries. If necessary, the user can still override this, but will need to specifically select class-target to do so. Similarly SECURITY_CFLAGS and SECURITY_LDFLAGS are available by empty by default. The default cflags/ldflags for baremetal usage are likely different from a Linux system, so can be used in the future if requried. Signed-off-by: Mark Hatle --- .../conf/distro/xilinx-standalone.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc index 57fbf956..ec490d26 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc @@ -45,3 +45,21 @@ TOOLCHAIN_NEED_CONFIGSITE_CACHE = "" # Workaround for pulling in nativesdk-mingw-w64-winpthreads TOOLCHAIN_HOST_TASK:append:sdkmingw32 = " nativesdk-mingw-w64-winpthreads" + +# Disable static for all classes, except for target. This will ensure we can +# share more recipe hashes with other distros, while still building +# static binaries for baremetal targets (by default). The user can of course +# still override this, but will need to specifically select class-target to +# do so. +DISABLE_STATIC:class-target ?= "" + +SECURITY_CFLAGS:class-target ?= "" +SECURITY_LDFLAGS:class-target ?= "" + +require conf/distro/include/no-static-libs.inc +require conf/distro/include/yocto-uninative.inc +require conf/distro/include/security_flags.inc +INHERIT += "uninative" + +BB_SIGNATURE_HANDLER ?= "OEEquivHash" +BB_HASHSERVE ??= "auto" -- cgit v1.2.3-54-g00ecf From bc2d0f4da3b8890e175ad2672276ba3d50b6bed4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 15 Jan 2023 08:25:25 -0800 Subject: xilinx-standalone.inc: Further sync with upstream disro settings Many of the settings/workaround have been replaced by changes in the upstream OE-Core tclibc-newlib. Additionally adding the DISTROVERRIDES with an append was potentially changing -native recipes hashes. Move this only where needed to avoid this behavior. Also sync settings with meta-petalinux, such as the buildhistory. This is now moved to the local.conf file. Signed-off-by: Mark Hatle --- .../conf/distro/xilinx-standalone-nolto.conf | 3 +++ meta-xilinx-standalone/conf/distro/xilinx-standalone.inc | 16 +--------------- 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf index 315f555c..ccfd0600 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf @@ -1 +1,4 @@ require conf/distro/xilinx-standalone.inc + +# Make sure any users get the xilinx-standalone distro override +DISTROOVERRIDES =. "xilinx-standalone:" diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc index ec490d26..4b51dd1b 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc @@ -2,9 +2,6 @@ DISTRO_NAME = "Xilinx Standalone Distro" DISTRO_VERSION = "1.0" TARGET_VENDOR = "-xilinx" -# Make sure any users get the xilinx-standalone distro override -DISTROOVERRIDES:prepend = "${@'xilinx-standalone:' if d.getVar('DISTRO') != "xilinx-standalone" else ''}" - TCLIBC = "newlib" TCLIBCAPPEND ="" @@ -12,12 +9,10 @@ TCLIBCAPPEND ="" SDK_VERSION = "xilinx-standalone" # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian -LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" +LIBC_DEPENDENCIES:append:xilinx-standalone = " newlib-staticdev libgloss-staticdev" ESW_CFLAGS ?= "" -INHERIT += "buildhistory" - # Cortex R5 requires an additional cflag to be passed for compatibility with the embeddedsw TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -DARMR5', '', d)}" @@ -29,20 +24,11 @@ COMPATOS:class-target = ".*-linux${LIBCEXTENSION}${ABIEXTENSION}" COMPATIBLE_HOST ?= "${COMPATOS}" # Clear defaults -DISTRO_FEATURES_BACKFILL:xilinx-standalone = "" -VIRTUAL-RUNTIME_init_manager:xilinx-standalone = "" - PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" PREFERRED_VERSION_libmetal-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" PREFERRED_VERSION_open-amp-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" -# Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian -LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" - -# No cached configsite files -TOOLCHAIN_NEED_CONFIGSITE_CACHE = "" - # Workaround for pulling in nativesdk-mingw-w64-winpthreads TOOLCHAIN_HOST_TASK:append:sdkmingw32 = " nativesdk-mingw-w64-winpthreads" -- cgit v1.2.3-54-g00ecf From 84574fabc8ea4169c6f65eb4fcbf8de0187c7dcf Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 17 Jan 2023 16:12:05 +0530 Subject: Updated SRCREV for 2023.1_8951 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index b2e849e7..4611c792 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "ffe0841b0df2e4daa62df9ab78789bea717bc3af" +ESW_REV[2023.1] = "e6dae914878210cc35755b35bda838b961cf04dd" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From fa0816d010257cd0ee9dd49723d6d4165edfeafa Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 18 Jan 2023 15:59:26 +0530 Subject: Updated SRCREV for 2023.1_7555 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 4611c792..f166f8c1 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "e6dae914878210cc35755b35bda838b961cf04dd" +ESW_REV[2023.1] = "e47e81e2c309d99e5b3a56656c80ba5a0f0f7835" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 5f3322b385e6462a155da6e7f2b5084dd6ebc713 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 20 Jan 2023 16:55:24 +0530 Subject: Updated SRCREV for 2023.1_2383 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index f166f8c1..10019d1d 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "e47e81e2c309d99e5b3a56656c80ba5a0f0f7835" +ESW_REV[2023.1] = "bd2f5bec9b5b129d8c3eec8ab9d2079278b6fae8" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From dd633cede55c4bd96afe98de4c71d22759c8b3be Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 23 Jan 2023 17:11:23 +0530 Subject: Updated SRCREV for 2023.1_5399 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 10019d1d..2d2d3ed1 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "bd2f5bec9b5b129d8c3eec8ab9d2079278b6fae8" +ESW_REV[2023.1] = "2cfb3868d219252d1ca7adf912d04c4212eb38c7" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 07dbcd95be5bc3d0c40a1ca04460442cad1381e7 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 17 Jan 2023 10:54:17 -0800 Subject: embeddedsw: Revert 2023.1 workarounds Remove workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] Also the other workaround can be removed, this has apparently been fixed in the upstream code. Signed-off-by: Mark Hatle --- ...0001-Workaround-Disable-Wnull-dereference.patch | 42 ---------------------- .../recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb | 1 - .../recipes-bsp/embeddedsw/fsbl-firmware_git.bb | 1 - .../recipes-bsp/embeddedsw/plm-firmware_2023.1.bb | 8 ----- .../recipes-bsp/embeddedsw/plm-firmware_git.bb | 8 ----- .../recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb | 1 - .../recipes-bsp/embeddedsw/pmu-firmware_git.bb | 1 - .../recipes-bsp/embeddedsw/psm-firmware_2023.1.bb | 1 - .../recipes-bsp/embeddedsw/psm-firmware_git.bb | 1 - 9 files changed, 64 deletions(-) delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch deleted file mode 100644 index a71a4c11..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 98b3377a70ee057f7529bd3381fa6d844ba6fe09 Mon Sep 17 00:00:00 2001 -From: Mark Hatle -Date: Wed, 7 Dec 2022 17:36:22 -0800 -Subject: [PATCH] Workaround: Disable -Wnull-dereference - - xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] - -Signed-off-by: Mark Hatle ---- - lib/sw_services/xilpm/src/versal/common/Makefile | 2 +- - lib/sw_services/xilpm/src/versal_net/common/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/sw_services/xilpm/src/versal/common/Makefile b/lib/sw_services/xilpm/src/versal/common/Makefile -index 0b61e37bbb..6c5f776ef0 100644 ---- a/lib/sw_services/xilpm/src/versal/common/Makefile -+++ b/lib/sw_services/xilpm/src/versal/common/Makefile -@@ -10,7 +10,7 @@ COMPILER_FLAGS= - EXTRA_COMPILER_FLAGS= - CUSTOM_COMPILER_FLAGS=-Werror - ifeq ($(findstring gcc, $(COMPILER)), gcc) --CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wnull-dereference -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef -+CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef - endif - LIB= libxilpm.a - -diff --git a/lib/sw_services/xilpm/src/versal_net/common/Makefile b/lib/sw_services/xilpm/src/versal_net/common/Makefile -index 36460a1b18..257ad694e3 100644 ---- a/lib/sw_services/xilpm/src/versal_net/common/Makefile -+++ b/lib/sw_services/xilpm/src/versal_net/common/Makefile -@@ -10,7 +10,7 @@ COMPILER_FLAGS= - EXTRA_COMPILER_FLAGS= - CUSTOM_COMPILER_FLAGS=-Werror - ifeq ($(findstring gcc, $(COMPILER)), gcc) --CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wnull-dereference -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef -+CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef - endif - LIB= libxilpm.a - --- -2.17.1 - diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb index 9055ac6c..8816dc4d 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb @@ -5,7 +5,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://fsbl-fixups.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " # This version does not build for zynq diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb index dc3b0ca9..f5e55ecc 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb @@ -8,7 +8,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://fsbl-fixups.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " # This version does not build for zynq diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb index 22626f4d..37861b75 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb @@ -12,17 +12,10 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-versal_fw-Fixup-core-makefiles.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" -# Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow] -EXTRA_COMPILER_FLAGS += "-Wno-overflow" - -# Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] -EXTRA_COMPILER_FLAGS += "-Wno-null-dereference" - do_configure() { # manually do the copy_bsp step first, so as to be able to fix up use of # mb-* commands @@ -30,7 +23,6 @@ do_configure() { } do_compile() { - pwd oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb index aae0e8af..bbc7519f 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb @@ -15,17 +15,10 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-versal_fw-Fixup-core-makefiles.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" -# Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow] -EXTRA_COMPILER_FLAGS += "-Wno-overflow" - -# Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] -EXTRA_COMPILER_FLAGS += "-Wno-null-dereference" - do_configure() { # manually do the copy_bsp step first, so as to be able to fix up use of # mb-* commands @@ -33,7 +26,6 @@ do_configure() { } do_compile() { - pwd oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb index b1e8c005..fe6deddc 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb @@ -5,7 +5,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb index e55edd1d..c55cd149 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb @@ -8,7 +8,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb index bd992e41..569c5a46 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb @@ -12,7 +12,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-versal_fw-Fixup-core-makefiles.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb index a70c7a8d..42e0a95f 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb @@ -15,7 +15,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ file://0001-versal_fw-Fixup-core-makefiles.patch \ - file://0001-Workaround-Disable-Wnull-dereference.patch \ " EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" -- cgit v1.2.3-54-g00ecf From 79c14c72cbb41be3c1f818ee329538eed0d0c534 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 23 Jan 2023 12:06:09 -0800 Subject: Revert "standalone gcc-runtime_%.bbappend: Add workaround for getentropy and related" This reverts commit a906596017b9fd3e55555862700594aad8867c27. No longer necessary after change made to embeddedsw Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend | 2 -- 1 file changed, 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index 629dd99f..cbf43008 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -9,8 +9,6 @@ EXTRA_OECONF:append:xilinx-standalone:class-target = " \ --enable-plugins \ --with-gnu-as \ --disable-libitm \ - glibcxx_cv_getentropy=no \ - glibcxx_cv_arc4random=no \ " EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ -- cgit v1.2.3-54-g00ecf From 86dbf50ebddaf4a894fd08de84abd4c3ad9c3bab Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 24 Jan 2023 17:25:52 -0800 Subject: meta-xilinx-standalone: Add binutils workaround Workaround for: ERROR: binutils-cross-canadian-aarch64-2.39-r0 do_package_qa: QA Issue: non -staticdev package contains static .a library: binutils-cross-canadian-aarch64 path '/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-oesdk-linux/usr/lib/aarch64-xilinx-elf/bfd-plugins/libdep.a' [staticdev] Need for the workaround was introduced with latest version of poky (langdale) Signed-off-by: Mark Hatle --- .../recipes-devtools/binutils/binutils-xilinx-standalone.inc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc index 463b796a..0537b03a 100644 --- a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc @@ -17,3 +17,11 @@ EXTRA_OECONF:append:xilinx-standalone:arm = " \ EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ --disable-initfini-array \ " + +# Workaround for: +# ERROR: binutils-cross-canadian-aarch64-2.39-r0 do_package_qa: QA +# Issue: non -staticdev package contains static .a library: +# binutils-cross-canadian-aarch64 path +# '/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-oesdk-linux/usr/lib/aarch64-xilinx-elf/bfd-plugins/libdep.a' +# [staticdev] +INSANE_SKIP:${PN} += "staticdev" -- cgit v1.2.3-54-g00ecf From a99eac45ec37ece1db04b82bbc34eb44b384733f Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 27 Jan 2023 16:24:35 +0530 Subject: Updated SRCREV for 2023.1_6051 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index c0ef3210..512958d3 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "08377c71703ea43167ba6e7f6f5ee22fa64dd2a4" +SRCREV = "2ed82959d4be87e3fcecf7defc846b28fd97089d" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 2d2d3ed1..b903325a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "2cfb3868d219252d1ca7adf912d04c4212eb38c7" +ESW_REV[2023.1] = "840dc9b82252bcb706bcf99b10f087249fbc6252" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 683893de2e49a8a462abfd60fc3a98b95157315b Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 30 Jan 2023 12:50:10 +0530 Subject: Updated SRCREV for 2023.1_6987 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index b903325a..3af939b0 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "840dc9b82252bcb706bcf99b10f087249fbc6252" +ESW_REV[2023.1] = "51492bf679a6a6889b5144f909ebf0115f8641bb" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 22ed5750b8f57d536e655b17b10d1fb3e65c429b Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 31 Jan 2023 16:04:31 +0530 Subject: Updated SRCREV for 2023.1_8671 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 3af939b0..e3b0244d 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "51492bf679a6a6889b5144f909ebf0115f8641bb" +ESW_REV[2023.1] = "c914c13d799c2b5d5ad074f1272aea0c0f25cc1d" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From d7b4575ac2e954c34e3b81ac82aa47c5528f32cf Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 1 Feb 2023 16:26:14 +0530 Subject: Updated SRCREV for 2023.1_1315 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index e3b0244d..c396c086 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "c914c13d799c2b5d5ad074f1272aea0c0f25cc1d" +ESW_REV[2023.1] = "b1b419c61a05ca06aec00835a59040eb5018e107" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 0e653e96c1416d996d2c5f06e732a147de921a37 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Sat, 4 Feb 2023 12:49:22 +0530 Subject: Updated SRCREV for 2023.1_9255 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index 512958d3..86409f67 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "2ed82959d4be87e3fcecf7defc846b28fd97089d" +SRCREV = "5a5006c41b6a71d3647789b044e39073c08cb7e6" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index c396c086..3d09486e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "b1b419c61a05ca06aec00835a59040eb5018e107" +ESW_REV[2023.1] = "8b5e228f90cd1c78d5a680e396ad35871af1ea2d" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 1783caf604c8df708beb44f653e63cf03da722e9 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 6 Feb 2023 15:56:55 +0530 Subject: Updated SRCREV for 2023.1_8307 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 3d09486e..78347c70 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "8b5e228f90cd1c78d5a680e396ad35871af1ea2d" +ESW_REV[2023.1] = "2ee99fe6d68663e8a94f1c149512ac399701f6bf" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From b571ae2972027907e0d3df58736c7dabb487dd8e Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 8 Feb 2023 16:48:21 +0530 Subject: Updated SRCREV for 2023.1_8783 Signed-off-by: Siva Addepalli --- .../recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb | 2 +- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb index 53c0eb42..7a429f14 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb @@ -1,5 +1,5 @@ ATF_VERSION = "2.8" -SRCREV = "8f811e71abf25d52553f1f42f2bfd6bb5e855dd9" +SRCREV = "a03759e82905dacd541f69f12ec597b7f4d8edc0" BRANCH = "xlnx_rebase_v2.8" LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index 86409f67..b1391310 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "5a5006c41b6a71d3647789b044e39073c08cb7e6" +SRCREV = "ad896da215290eaea6c985ee7a2fb1d23755ac60" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 78347c70..9ff5e155 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -11,7 +11,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" -ESW_REV[2023.1] = "2ee99fe6d68663e8a94f1c149512ac399701f6bf" +ESW_REV[2023.1] = "73ab17ed8b5044eb4e5139473fc550ba1c2e9d27" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 1604bcefd7b11d1768bd6bfccbf7c194f0db3c3e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 7 Feb 2023 07:44:29 -0800 Subject: xlnx-embeddedsw.bbclass: Update references to latest work Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 9ff5e155..023baa8b 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -4,13 +4,12 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master' REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" -ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2" -ESW_BRANCH[2023.1] = "master-next" -ESW_BRANCH[git] = "master" +ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2_update" +ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" -ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" +ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" ESW_REV[2023.1] = "73ab17ed8b5044eb4e5139473fc550ba1c2e9d27" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" @@ -19,9 +18,8 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' -LIC_FILES_CHKSUM[xlnx_rel_v2022.2] = 'ce611484168a6000bd35df68fc4f4290' -LIC_FILES_CHKSUM[master-next] = 'ce611484168a6000bd35df68fc4f4290' -LIC_FILES_CHKSUM[master] = 'ce611484168a6000bd35df68fc4f4290' +LIC_FILES_CHKSUM[xlnx_rel_v2022.2_update] = 'ce611484168a6000bd35df68fc4f4290' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From ac9458816a1070b497947dc1acf91cc26215c203 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 8 Feb 2023 08:08:26 -0800 Subject: microblaze-tc.conf: Disable pie support, not available on microblaze Signed-off-by: Mark Hatle --- meta-xilinx-standalone/conf/machine/microblaze-tc.conf | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf index 4eb88828..38e0b01b 100644 --- a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf +++ b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf @@ -3,6 +3,14 @@ require conf/multilib.conf require conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/baremetal-tc.conf +# Set defaults +# pie is not supported on microblaze, disable it to avoid: +# .../microblaze-xilinx-elf/12.2.0/ld: -pie not supported +GCCPIE:microblaze = "" +GLIBCPIE:microblaze = "" +SECURITY_CFLAGS:remove:microblaze = "${SECURITY_PIE_CFLAGS}" +SECURITY_CFLAGS:pn-libgcc:microblaze = "" + # ILP request an alternative machine dictionary INHERIT += "xlnx-standalone" PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}' -- cgit v1.2.3-54-g00ecf From 35e82245d5739673818bd59830d2687aba88f99b Mon Sep 17 00:00:00 2001 From: Appana Durga Kedareswara rao Date: Fri, 10 Feb 2023 23:26:14 +0530 Subject: meta-xilinx-standalone: recipes-bsp: device-tree: Update recipe for freertos distro Add support for freertos distro by updating COMPATIBLE_HOST. Signed-off-by: Appana Durga Kedareswara rao Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend index 056c4edc..fcc041fd 100644 --- a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend @@ -1,4 +1,5 @@ COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-freertos = "${HOST_SYS}" COMPATIBLE_MACHINE:cortexa53-zynqmp = ".*" COMPATIBLE_MACHINE:cortexr5-zynqmp = ".*" @@ -11,3 +12,5 @@ COMPATIBLE_MACHINE:cortexa9-zynq = ".*" # Enable @ flag on dtc which is required by libxil DTC_FLAGS:append:xilinx-standalone = " -@" DT_INCLUDE:append:xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/" +DTC_FLAGS:append:xilinx-freertos = " -@" +DT_INCLUDE:append:xilinx-freertos = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/" -- cgit v1.2.3-54-g00ecf From 6680ec1a752ee9cbfa65aa948c6ce2f2733af0e8 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 13 Feb 2023 21:05:32 +0530 Subject: Updated SRCREV for 2023.1_8755 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 023baa8b..9e71d9e0 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "73ab17ed8b5044eb4e5139473fc550ba1c2e9d27" +ESW_REV[2023.1] = "d0f6576069c812f9bc710cf40d43269efbdff5be" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From c93b1aa98c69c7adc7b9490743e916a1591ecc1f Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 14 Feb 2023 12:49:57 +0530 Subject: Updated SRCREV for 2023.1_5539 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 9e71d9e0..14d8c519 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "d0f6576069c812f9bc710cf40d43269efbdff5be" +ESW_REV[2023.1] = "571ae9e436b4e40276d5b39d8354c6c676dd6f03" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 5b595cb907e3e8fbca743ec5696327a2c6571b23 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 17 Feb 2023 12:49:53 +0530 Subject: Updated SRCREV for 2023.1_1355 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 14d8c519..81050633 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "571ae9e436b4e40276d5b39d8354c6c676dd6f03" +ESW_REV[2023.1] = "c28637f9f069765ca772143710e28fe8cbecb43d" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 7859add1a9a6cf4c4d8620c9437ea9bd3b474b81 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 17 Feb 2023 20:25:50 +0530 Subject: Updated SRCREV for 2023.1_3067 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index 1a2ce9d4..1fbabe5c 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "ec9ba29c0afe53c73b394d3de8b23e5fb8666782" +SRCREV = "6ec750e0b80808b2aa0c291a9d5ce0a756bd21bd" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 81050633..78a84e59 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "c28637f9f069765ca772143710e28fe8cbecb43d" +ESW_REV[2023.1] = "fd385bc6baed2e94c96f3a84a283056b534b5b11" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 3915d667b03b282d474cc7b90c80374c8c602ff2 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 20 Feb 2023 16:22:38 +0530 Subject: Updated SRCREV for 2023.1_6955 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 78a84e59..7eec2ac6 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "fd385bc6baed2e94c96f3a84a283056b534b5b11" +ESW_REV[2023.1] = "eee545e1c50e286fea4f67f143ce7aca9cbfba6c" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From aee55354756be9514c61f5e768dfa0370bdf8de0 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 21 Feb 2023 18:25:51 +0530 Subject: Updated SRCREV for 2023.1_2923 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 7eec2ac6..3c8b8d55 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "eee545e1c50e286fea4f67f143ce7aca9cbfba6c" +ESW_REV[2023.1] = "d3d25c660deb87a62e83d78fb3984ea8e6e366f9" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 24dd9510869db386f5f83541793e874c0273eebc Mon Sep 17 00:00:00 2001 From: Manikanta Sreeram Date: Wed, 22 Feb 2023 00:17:27 -0700 Subject: Revert "Updated SRCREV for 2023.1_2923" This reverts commit aee55354756be9514c61f5e768dfa0370bdf8de0. --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 3c8b8d55..7eec2ac6 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "d3d25c660deb87a62e83d78fb3984ea8e6e366f9" +ESW_REV[2023.1] = "eee545e1c50e286fea4f67f143ce7aca9cbfba6c" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From e9f1a0e4bc0ece047fc990b1b7b43d4ca86b55dd Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 22 Feb 2023 17:23:02 +0530 Subject: Updated SRCREV for 2023.1_2579 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 1ff3e973..6360e99f 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "9a6179fbafbadf9ac502252f3b859ef9912b1250" +SRCREV = "946680ef0588c8a7e8471c4744fb36985927df19" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 7eec2ac6..0c89bffb 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "eee545e1c50e286fea4f67f143ce7aca9cbfba6c" +ESW_REV[2023.1] = "980da655d329203565a0b7ef4a468126666ce560" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" @@ -19,7 +19,7 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' LIC_FILES_CHKSUM[xlnx_rel_v2022.2_update] = 'ce611484168a6000bd35df68fc4f4290' -LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = 'ce611484168a6000bd35df68fc4f4290' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = '15386ea7656d3b83815bce88c0bbe66d' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From cef5bff37338335f4b89d5ceb25058aca5b15813 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 23 Feb 2023 15:57:54 +0530 Subject: Updated SRCREV for 2023.1_8935 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 6360e99f..c1a7d5c2 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "946680ef0588c8a7e8471c4744fb36985927df19" +SRCREV = "f5379970f78c19080885efe69f5813669c449441" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 0c89bffb..969df82b 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "980da655d329203565a0b7ef4a468126666ce560" +ESW_REV[2023.1] = "1ce4cddb1401258ef5988430080e356a0a752ed4" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 0231f165e1fa7f9e118d1231ee2af60831e17b51 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 24 Feb 2023 15:56:21 +0530 Subject: Updated SRCREV for 2023.1_8983 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index c1a7d5c2..1c458519 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "f5379970f78c19080885efe69f5813669c449441" +SRCREV = "ac207a051409437534e7048e6c9d1ac8733b5348" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 969df82b..14965086 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "1ce4cddb1401258ef5988430080e356a0a752ed4" +ESW_REV[2023.1] = "af7dbc028f014457bc76b479ac0f3671732aa75e" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 5367d2ddb05192fcd5318ca67bc301f8eda557d0 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 13 Feb 2023 14:18:42 -0800 Subject: gnu-toolchain-canadian: Fix symlink generation for mingw32 Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb b/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb index 8b323c41..1af09a5f 100644 --- a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb +++ b/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb @@ -6,13 +6,15 @@ BPN = "gnu-toolchain-canadian" LICENSE = "MIT" +EXEEXT:sdkmingw32 = ".exe" + do_install () { if [ "${TARGET_SYS_MULTILIB_ORIGINAL}" != "" -a "${TARGET_SYS_MULTILIB_ORIGINAL}" != "${TARGET_SYS}" ]; then mkdir -p ${D}${bindir} # Create a link for each item references by the environment files for each in gcc g++ as ld gdb strip ranlib objcopy objdump readelf ar nm ; do - ln -s ../${TARGET_SYS_MULTILIB_ORIGINAL}/${TARGET_SYS_MULTILIB_ORIGINAL}-${each} ${D}${bindir}/${TARGET_SYS}-$each + ln -s ../${TARGET_SYS_MULTILIB_ORIGINAL}/${TARGET_SYS_MULTILIB_ORIGINAL}-${each}${EXEEXT} ${D}${bindir}/${TARGET_SYS}-${each}${EXEEXT} done fi } -- cgit v1.2.3-54-g00ecf From 936df9e1bc03edf04c914b90510a4d0852a488c6 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 13:26:35 -0800 Subject: meta-toolchain: Remove multilib changes Changing this breaks YP compatibility requirements. We have moved to a custom recipe, meta-xilinx-toolchain to build the special toolchains. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend | 2 -- 1 file changed, 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend index aa72e6a4..0d824324 100644 --- a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend +++ b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend @@ -1,3 +1 @@ COMPATIBLE_HOST = "${HOST_SYS}" - -TOOLCHAIN_TARGET_TASK:xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}" -- cgit v1.2.3-54-g00ecf From 9d281ac210668bb8bf1728f6d82809c121da36a2 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 14:01:52 -0800 Subject: binutils: Disable multilib support, not required Signed-off-by: Mark Hatle --- .../recipes-devtools/binutils/binutils-xilinx-standalone.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc index 0537b03a..48db3cf3 100644 --- a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc @@ -6,7 +6,6 @@ EXTRA_OECONF:append:xilinx-standalone = " \ --disable-shared \ --enable-lto \ --enable-static \ - --enable-multilib \ " # CortexR5 and 32-bit arm are both "arm" -- cgit v1.2.3-54-g00ecf From b9c4df8783edc2eac7808a7eed25891dc650635c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 13:58:23 -0800 Subject: gcc: Remove multilib standalones configs Standalone multilibs are only needed when building a PetaLinux specific toolchain. So remove this from the general bbappends. Signed-off-by: Mark Hatle --- .../gcc-12/additional-microblaze-multilibs.patch | 86 ---------------------- .../gcc/gcc-cross-canadian_%.bbappend | 7 -- .../recipes-devtools/gcc/gcc-cross_%.bbappend | 4 - .../recipes-devtools/gcc/gcc-runtime_%.bbappend | 34 --------- .../recipes-devtools/gcc/gcc-source_12.%.bbappend | 14 ---- .../recipes-devtools/gcc/gcc-xilinx-standalone.inc | 9 --- .../recipes-devtools/gcc/mb-convert-head.sh | 16 ---- .../recipes-devtools/gcc/mb-convert.sh | 60 --------------- 8 files changed, 230 deletions(-) delete mode 100644 meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch delete mode 100755 meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh delete mode 100755 meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch deleted file mode 100644 index 3d520d0f..00000000 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch +++ /dev/null @@ -1,86 +0,0 @@ -Change the multilib settings to match the expectations of Vitis and related. - -The multilib list is as follows: - -.; -le;@mlittle-endian -bs;@mxl-barrel-shift -p;@mxl-pattern-compare -m;@mno-xl-soft-mul -fpd;@mhard-float -m/fpd;@mno-xl-soft-mul@mhard-float -p/m;@mxl-pattern-compare@mno-xl-soft-mul -p/fpd;@mxl-pattern-compare@mhard-float -p/m/fpd;@mxl-pattern-compare@mno-xl-soft-mul@mhard-float -bs/p;@mxl-barrel-shift@mxl-pattern-compare -bs/m;@mxl-barrel-shift@mno-xl-soft-mul -bs/fpd;@mxl-barrel-shift@mhard-float -bs/m/fpd;@mxl-barrel-shift@mno-xl-soft-mul@mhard-float -bs/p/m;@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul -bs/p/fpd;@mxl-barrel-shift@mxl-pattern-compare@mhard-float -bs/p/m/fpd;@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul@mhard-float -le/m64;@mlittle-endian@m64 -le/bs;@mlittle-endian@mxl-barrel-shift -le/p;@mlittle-endian@mxl-pattern-compare -le/m;@mlittle-endian@mno-xl-soft-mul -le/fpd;@mlittle-endian@mhard-float -le/m/fpd;@mlittle-endian@mno-xl-soft-mul@mhard-float -le/p/m;@mlittle-endian@mxl-pattern-compare@mno-xl-soft-mul -le/p/fpd;@mlittle-endian@mxl-pattern-compare@mhard-float -le/p/m/fpd;@mlittle-endian@mxl-pattern-compare@mno-xl-soft-mul@mhard-float -le/bs/p;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare -le/bs/m;@mlittle-endian@mxl-barrel-shift@mno-xl-soft-mul -le/bs/fpd;@mlittle-endian@mxl-barrel-shift@mhard-float -le/bs/m/fpd;@mlittle-endian@mxl-barrel-shift@mno-xl-soft-mul@mhard-float -le/bs/p/m;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul -le/bs/p/fpd;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare@mhard-float -le/bs/p/m/fpd;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul@mhard-float -le/m64/bs;@mlittle-endian@m64@mxl-barrel-shift -le/m64/p;@mlittle-endian@m64@mxl-pattern-compare -le/m64/m;@mlittle-endian@m64@mno-xl-soft-mul -le/m64/fpd;@mlittle-endian@m64@mhard-float -le/m64/m/fpd;@mlittle-endian@m64@mno-xl-soft-mul@mhard-float -le/m64/p/m;@mlittle-endian@m64@mxl-pattern-compare@mno-xl-soft-mul -le/m64/p/fpd;@mlittle-endian@m64@mxl-pattern-compare@mhard-float -le/m64/p/m/fpd;@mlittle-endian@m64@mxl-pattern-compare@mno-xl-soft-mul@mhard-float -le/m64/bs/p;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare -le/m64/bs/m;@mlittle-endian@m64@mxl-barrel-shift@mno-xl-soft-mul -le/m64/bs/fpd;@mlittle-endian@m64@mxl-barrel-shift@mhard-float -le/m64/bs/m/fpd;@mlittle-endian@m64@mxl-barrel-shift@mno-xl-soft-mul@mhard-float -le/m64/bs/p/m;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul -le/m64/bs/p/fpd;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare@mhard-float -le/m64/bs/p/m/fpd;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul@mhard-float - -As part of this the order of the multilibs was changes from upstream to make -it easier to avoid big-endian m64, which is not supported by the toolchain. - -Signed-off-by: Mark Hatle - -Index: gcc-9.2.0/gcc/config/microblaze/t-microblaze -=================================================================== ---- gcc-9.2.0.orig/gcc/config/microblaze/t-microblaze -+++ gcc-9.2.0/gcc/config/microblaze/t-microblaze -@@ -1,17 +1,11 @@ --MULTILIB_OPTIONS = m64 mxl-barrel-shift mlittle-endian mno-xl-soft-mul mxl-multiply-high --#MULTILIB_DIRNAMES = m64 bs le m mh --MULTILIB_DIRNAMES = . . . . . --MULTILIB_EXCEPTIONS = *m64/mxl-multiply-high mxl-multiply-high --MULTILIB_EXCEPTIONS += *m64 --MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift --MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul --MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mno-xl-soft-mul --MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul --MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mno-xl-soft-mul/mxl-multiply-high --MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul/mxl-multiply-high -+MULTILIB_OPTIONS = mlittle-endian m64 mxl-barrel-shift mxl-pattern-compare mno-xl-soft-mul mhard-float -+MULTILIB_DIRNAMES = le m64 bs p m fpd -+MULTILIB_EXCEPTIONS = mxl-multiply-high - MULTILIB_EXCEPTIONS += *mxl-barrel-shift/mxl-multiply-high mxl-multiply-high - MULTILIB_EXCEPTIONS += *mlittle-endian/mxl-multiply-high mxl-multiply-high --MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mlittle-endian/mxl-multiply-high -+MULTILIB_EXCEPTIONS += *mxl-pattern-compare*/*mxl-multiply-high* -+# Big endian m64 is not supported -+MULTILIB_EXCEPTIONS += m64* - - # Extra files - microblaze-c.o: $(srcdir)/config/microblaze/microblaze-c.c \ diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index b4fffe6a..449db177 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend @@ -1,13 +1,6 @@ require gcc-configure-xilinx-standalone.inc require gcc-xilinx-standalone.inc -# We want to use the stock multilib configs, when available -EXTRACONFFUNCS:xilinx-standalone = "" - -EXTRA_OECONF:append:xilinx-standalone = " \ - --enable-multilib \ -" - # Temporary hack to build gcc cross canadian for tclibc-newlib as --with-sysroot=/not/exist # has been removed from TARGET_OS for elf and eabi in gcc-cross-canadian.inc diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend index 43d6be73..69782d71 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend @@ -1,6 +1,2 @@ require gcc-configure-xilinx-standalone.inc require gcc-xilinx-standalone.inc - -# We want to use the stock multilib configs, when available -EXTRACONFFUNCS:xilinx-standalone = "" - diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index cbf43008..3a7d1395 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -16,16 +16,6 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ --with-arch=armv8-a \ " -# Both arm and armv7r/armv8r overrides are set w/ cortex r5 -# So only set rmprofile if armv*r is defined. -ARM_PROFILE = "aprofile" -ARM_PROFILE:armv7r = "rmprofile" -ARM_PROFILE:armv8r = "rmprofile" - -EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \ - --with-multilib-list=${ARM_PROFILE} \ - " - EXTRA_OECONF:append:xilinx-standalone:armv7r:class-target = " \ --disable-tls \ --disable-decimal-float \ @@ -48,30 +38,6 @@ RUNTIMETARGET:xilinx-standalone:class-target = "libstdc++-v3" do_install:append:xilinx-standalone:class-target() { # Fixup what gcc-runtime normally would do, we don't want linux directories! rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux - - # The multilibs have different headers, so stop combining them! - if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then - rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS} - fi - - # link the C++ header into the place that multilib gcc expects - # C++ compiler looks at usr/include/c++/version/canonical-arch/mlib - if [ "${TARGET_SYS_MULTILIB_ORIGINAL}" != "" -a "${TARGET_SYS_MULTILIB_ORIGINAL}" != "${TARGET_SYS}" ]; then - mlib=${BASE_LIB:tune-${DEFAULTTUNE}} - mlib=${mlib##lib/} - - link_name=${D}${includedir}/c++/${BINV}/${TARGET_SYS_MULTILIB_ORIGINAL}/${mlib} - target=${D}${includedir}/c++/${BINV}/${TARGET_SYS} - - echo mkdir -p $link_name - mkdir -p $link_name - for each in bits ext ; do - relpath=$(python3 -c "import os.path; print(os.path.relpath('$target/$each', '$(dirname $link_name/$each)'))") - - echo ln -s $relpath $link_name/$each - ln -s $relpath $link_name/$each - done - fi } FILES:${PN}-dbg:append:xilinx-standalone:class-target = "\ diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend index c0ccc3c3..0d824324 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend @@ -1,15 +1 @@ COMPATIBLE_HOST = "${HOST_SYS}" - -# Add MicroBlaze Patches (only when using MicroBlaze) -FILESEXTRAPATHS:append:microblaze:xilinx-standalone := ":${THISDIR}/gcc-12" -SRC_URI:append:microblaze:xilinx-standalone = " \ - file://additional-microblaze-multilibs.patch \ -" - -CHECK_FOR_MICROBLAZE:microblaze = "1" - -python() { - if d.getVar('CHECK_FOR_MICROBLAZE') == '1': - if 'xilinx-microblaze' not in d.getVar('BBFILE_COLLECTIONS').split(): - bb.fatal('You must include the meta-microblaze layer to build for this configuration.') -} diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc index ca14529c..2faf7a4b 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc @@ -12,15 +12,6 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \ --with-arch=armv8-a \ " -# Both arm and armv*r overrides are set w/ cortex r5 -# So only set rmprofile if armv*r is defined. -ARM_PROFILE = "aprofile" -ARM_PROFILE:armv7r = "rmprofile" -ARM_PROFILE:armv8r = "rmprofile" -EXTRA_OECONF:append:xilinx-standalone:arm = " \ - --with-multilib-list=${ARM_PROFILE} \ - " - EXTRA_OECONF:append:xilinx-standalone:armv7r = " \ --disable-tls \ --disable-decimal-float \ diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh b/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh deleted file mode 100755 index b59dff1e..00000000 --- a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash - -# Call using: -#../microblaze/sysroots/x86_64-oesdk-linux/usr/bin/microblaze-xilinx-elf/microblaze-xilinx-elf-gcc -print-multi-lib | mb-convert-head.sh - -# Then copy the output into the special microblaze-tc BSP - -sed -e 's,;, ,' | - while read mlib args ; do - if [ $mlib = '.' ]; then - continue - fi - multilib="libmb$(echo $mlib | sed -e 's,/,,g')" - - echo 'MULTILIBS += "multilib:'${multilib}'"' - done diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh b/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh deleted file mode 100755 index ab689444..00000000 --- a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/bash - -# Call using: -#../microblaze/sysroots/x86_64-oesdk-linux/usr/bin/microblaze-xilinx-elf/microblaze-xilinx-elf-gcc -print-multi-lib | mb-convert.sh - -# Then copy the output into the special microblaze-tc BSP - -mlib_to_feature() { - feature_base="microblaze" - feature_endian=" bigendian" - feature_barrel="" - feature_pattern="" - feature_multiply="" - feature_multiplyhigh="" - feature_sixtyfour="" - feature_math="" - while read feature ; do - case $feature in - le) feature_endian="";; - bs) feature_barrel=" barrel-shift";; - p) feature_pattern=" pattern-compare";; - m) if [ -z ${feature_multiplyhigh} ]; then feature_multiply=" multiply-low" ; fi ;; - mh) feature_multiply="" ; feature_multiplyhigh=" multiply-high";; - m64) feature_sixtyfour=" 64-bit";; - fpd) feature_math=" fpu-hard";; - *) echo "UNKNOWN $feature";; - esac - done - echo "${feature_base}${feature_sixtyfour}${feature_endian}${feature_barrel}${feature_pattern}${feature_multiply}${feature_multiplyhigh}${feature_math}" -} - -sed -e 's,;, ,' | - while read mlib args ; do - if [ $mlib = '.' ]; then - echo '# Base configuration' - echo '# CFLAGS:' - echo 'DEFAULTTUNE = "microblaze"' - echo - echo 'AVAILTUNES += "microblaze"' - echo 'BASE_LIB:tune-microblaze = "lib"' - echo 'TUNE_FEATURES:tune-microblaze = "microblaze bigendian"' - echo 'PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"' - continue - fi - - cflags=$(echo $args | sed -e 's,@, -,g') - multilib="libmb$(echo $mlib | sed -e 's,/,,g')" - tune="microblaze$(echo $mlib | sed -e 's,m64,64,' -e 's,/,,g')" - features=$(echo $mlib | sed -e 's,/, ,g' | xargs -n 1 echo | mlib_to_feature) - echo - echo - echo "# $mlib" - echo "# CFLAGS:${cflags}" - echo "DEFAULTTUNE:virtclass-multilib-$multilib = \"$tune\"" - echo - echo "AVAILTUNES += \"$tune\"" - echo "BASE_LIB:tune-$tune = \"lib/$mlib\"" - echo "TUNE_FEATURES:tune-$tune = \"${features}\"" - echo "PACKAGE_EXTRA_ARCHS:tune-$tune = \"\${TUNE_PKGARCH}\"" - done -- cgit v1.2.3-54-g00ecf From 3da29a97cf5cd0ebac38e36a95862c4168533686 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 14:07:12 -0800 Subject: machines: Move special TC machines to meta-petalinux The special toolchains are really only applicable to a PetaLinux/Vitis toolchain build. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/README.md | 15 +- .../conf/machine/aarch32-tc.conf | 221 --------- .../conf/machine/aarch64-tc.conf | 30 -- meta-xilinx-standalone/conf/machine/arm-rm-tc.conf | 275 ----------- .../conf/machine/include/baremetal-tc.conf | 7 - .../conf/machine/microblaze-tc.conf | 550 --------------------- 6 files changed, 1 insertion(+), 1097 deletions(-) delete mode 100644 meta-xilinx-standalone/conf/machine/aarch32-tc.conf delete mode 100644 meta-xilinx-standalone/conf/machine/aarch64-tc.conf delete mode 100644 meta-xilinx-standalone/conf/machine/arm-rm-tc.conf delete mode 100644 meta-xilinx-standalone/conf/machine/include/baremetal-tc.conf delete mode 100644 meta-xilinx-standalone/conf/machine/microblaze-tc.conf (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/README.md b/meta-xilinx-standalone/README.md index 6193f015..8834a87b 100644 --- a/meta-xilinx-standalone/README.md +++ b/meta-xilinx-standalone/README.md @@ -1,7 +1,7 @@ # meta-xilinx-standalone This layer is meant to augment Yocto/OE functionality to provide a -Baremetal/Standalone Toolchain as well as a generic version of various +Baremetal/Standalone distribution as well as a generic version of various firmware that is required to boot a ZynqMP or Versal system. For optimized versions of the firmware and additional components you must @@ -14,19 +14,6 @@ configuration build, or a multiconfig build. A multiconfig build, along with the MACHINES defined in meta-xilinx-bsps will automate the generation of certain firmwares. -## Toolchains - -To build standalone toolchains similar to those embedded with the -Xilinx xsct tooling: - -Use one of the custom machines: - aarch32-tc - 32-bit ARM toolchains (various) - aarch64-tc - 64-bit ARM toolchains (various) - arm-rm-tc - ARM Cortex-R (and various) - microblaze-tc - Microblaze toolchains (various) - -MACHINE= DISTRO=xilinx-standalone bitbake meta-toolchain - ## Standalone Firmware The standalone firmware is a genericly configured firmware, it can be diff --git a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf deleted file mode 100644 index 5b59bc6a..00000000 --- a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf +++ /dev/null @@ -1,221 +0,0 @@ -require conf/machine/include/machine-xilinx-qemu.inc -require conf/multilib.conf -require conf/machine/include/arm/armv7a/tune-cortexa9.inc -require conf/machine/include/baremetal-tc.conf - -# Define all of the multilibs supproted by this configuration -MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" - -MULTILIBS = "multilib:libarmv5tesoftfp multilib:libarmv5tehard" -MULTILIBS += "multilib:libnofp" -MULTILIBS += "multilib:libv7nofp multilib:libv7fpsoftfp multilib:libv7fphard" -MULTILIBS += "multilib:libv7anofp" -MULTILIBS += "multilib:libv7afpsoftfp" -MULTILIBS += "multilib:libv7afpthf multilib:libv7asimdsoftfp" -MULTILIBS += "multilib:libv7asimdhard multilib:libv7vesimdsoftfp" -MULTILIBS += "multilib:libvtvesimdhf" -MULTILIBS += "multilib:libv8anofp" -MULTILIBS += "multilib:libv8asimdsoftfp multilib:libv8asimdhard" - -TUNE_CCARGS = "${TUNE_CCARGS:tune-${DEFAULTTUNE}}" -TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" - -# Base configuration -# CFLAGS: -DEFAULTTUNE = "aarch32" - -AVAILTUNES += "aarch32" -PACKAGE_EXTRA_ARCHS:tune-aarch32 = "${TUNE_PKGARCH:tune-aarch32}" -BASE_LIB:tune-aarch32 = "lib" -TUNE_FEATURES:tune-aarch32 = "arm" -TUNE_CCARGS:tune-aarch32 = "" -TUNE_PKGARCH:tune-aarch32 = "aarch32" - - -# arm/v5te/softfp -# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp" - -AVAILTUNES += "armv5tesoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}" -BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp" -TUNE_FEATURES:tune-armv5tesoftfp = "arm" -TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp" - - -# arm/v5te/hard -# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard" - -AVAILTUNES += "armv5tehard" -PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}" -BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard" -TUNE_FEATURES:tune-armv5tehard = "arm" -TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf" - - -# thumb/nofp -# CFLAGS: -mthumb -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp" - -AVAILTUNES += "armnofp" -PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}" -BASE_LIB:tune-armnofp = "lib/thumb/nofp" -TUNE_FEATURES:tune-armnofp = "arm" -TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft" -TUNE_PKGARCH:tune-armnofp = "armt" - - -# thumb/v7/nofp -# CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp" - -AVAILTUNES += "armv7nofp" -PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}" -BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp" -TUNE_FEATURES:tune-armv7nofp = "arm" -TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv7nofp = "armv7t" - - -# thumb/v7+fp/softfp -# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp" - -AVAILTUNES += "armv7fpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}" -BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp" -TUNE_FEATURES:tune-armv7fpsoftfp = "arm" -TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt" - - -# thumb/v7+fp/hard -# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard" - -AVAILTUNES += "armv7fphard" -PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}" -BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard" -TUNE_FEATURES:tune-armv7fphard = "arm" -TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf" - - -# thumb/v7-a/nofp -# CFLAGS: -mthumb -march=armv7-a -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv7anofp = "armv7anofp" - -AVAILTUNES += "armv7anofp" -PACKAGE_EXTRA_ARCHS:tune-armv7anofp = "${TUNE_PKGARCH:tune-armv7anofp}" -BASE_LIB:tune-armv7anofp = "lib/thumb/v7-a/nofp" -TUNE_FEATURES:tune-armv7anofp = "arm" -TUNE_CCARGS:tune-armv7anofp = "-mthumb -march=armv7-a -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv7anofp = "armv7at" - - -# thumb/v7-a+fp/softfp -# CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7afpsoftfp = "armv7afpsoftfp" - -AVAILTUNES += "armv7afpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7afpsoftfp = "${TUNE_PKGARCH:tune-armv7afpsoftfp}" -BASE_LIB:tune-armv7afpsoftfp = "lib/thumb/v7-a+fp/softfp" -TUNE_FEATURES:tune-armv7afpsoftfp = "arm" -TUNE_CCARGS:tune-armv7afpsoftfp = "-mthumb -march=armv7-a+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7afpsoftfp = "armv7afpt" - - -# thumb/v7-a+fp/hard -# CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv7afpthf = "armv7afpthf" - -AVAILTUNES += "armv7afpthf" -PACKAGE_EXTRA_ARCHS:tune-armv7afpthf = "${TUNE_PKGARCH:tune-armv7afpthf}" -BASE_LIB:tune-armv7afpthf = "lib/thumb/v7-a+fp/hard" -TUNE_FEATURES:tune-armv7afpthf = "arm" -TUNE_CCARGS:tune-armv7afpthf = "-mthumb -march=armv7-a+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv7afpthf = "armv7afpthf" - -# thumb/v7-a+simd/softfp -# CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7asimdsoftfp = "armv7asimdsoftfp" - -AVAILTUNES += "armv7asimdsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7asimdsoftfp = "${TUNE_PKGARCH:tune-armv7asimdsoftfp}" -BASE_LIB:tune-armv7asimdsoftfp = "lib/thumb/v7-a+simd/softfp" -TUNE_FEATURES:tune-armv7asimdsoftfp = "arm" -TUNE_CCARGS:tune-armv7asimdsoftfp = "-mthumb -march=armv7-a+simd -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7asimdsoftfp = "armv7asimdt" - - -# thumb/v7-a+simd/hard -# CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv7asimdhard = "armv7asimdhard" - -AVAILTUNES += "armv7asimdhard" -PACKAGE_EXTRA_ARCHS:tune-armv7asimdhard = "${TUNE_PKGARCH:tune-armv7asimdhard}" -BASE_LIB:tune-armv7asimdhard = "lib/thumb/v7-a+simd/hard" -TUNE_FEATURES:tune-armv7asimdhard = "arm" -TUNE_CCARGS:tune-armv7asimdhard = "-mthumb -march=armv7-a+simd -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv7asimdhard = "armv7asimdthf" - - -# thumb/v7ve+simd/softfp -# CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7vesimdsoftfp = "armv7vesimdsoftfp" - -AVAILTUNES += "armv7vesimdsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7vesimdsoftfp = "${TUNE_PKGARCH:tune-armv7vesimdsoftfp}" -BASE_LIB:tune-armv7vesimdsoftfp = "lib/thumb/v7ve+simd/softfp" -TUNE_FEATURES:tune-armv7vesimdsoftfp = "arm" -TUNE_CCARGS:tune-armv7vesimdsoftfp = "-mthumb -march=armv7ve+simd -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7vesimdsoftfp = "armv7vesimdt" - -# thumb/v7ve+simd/hard -# CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libvtvesimdhf = "armvtvesimdhf" - -AVAILTUNES += "armvtvesimdhf" -PACKAGE_EXTRA_ARCHS:tune-armvtvesimdhf = "${TUNE_PKGARCH:tune-armvtvesimdhf}" -BASE_LIB:tune-armvtvesimdhf = "lib/thumb/v7ve+simd/hard" -TUNE_FEATURES:tune-armvtvesimdhf = "arm" -TUNE_CCARGS:tune-armvtvesimdhf = "-mthumb -march=armv7ve+simd -mfloat-abi=hard" -TUNE_PKGARCH:tune-armvtvesimdhf = "armv7vesimdthf" - - -# thumb/v8-a/nofp -# CFLAGS: -mthumb -march=armv8-a -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv8anofp = "armv8anofp" - -AVAILTUNES += "armv8anofp" -PACKAGE_EXTRA_ARCHS:tune-armv8anofp = "${TUNE_PKGARCH:tune-armv8anofp}" -BASE_LIB:tune-armv8anofp = "lib/thumb/v8-a/nofp" -TUNE_FEATURES:tune-armv8anofp = "arm" -TUNE_CCARGS:tune-armv8anofp = "-mthumb -march=armv8-a -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv8anofp = "armv8at" - -# thumb/v8-a+simd/softfp -# CFLAGS: -mthumb -march=armv8-a+simd -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv8asimdsoftfp = "armv8asimdsoftfp" - -AVAILTUNES += "armv8asimdsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv8asimdsoftfp = "${TUNE_PKGARCH:tune-armv8asimdsoftfp}" -BASE_LIB:tune-armv8asimdsoftfp = "lib/thumb/v8-a+simd/softfp" -TUNE_FEATURES:tune-armv8asimdsoftfp = "arm" -TUNE_CCARGS:tune-armv8asimdsoftfp = "-mthumb -march=armv8-a+simd -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv8asimdsoftfp = "armv8asimdt" - - -# thumb/v8-a+simd/hard -# CFLAGS: -mthumb -march=armv8-a+simd -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv8asimdhard = "armv8asimdhard" - -AVAILTUNES += "armv8asimdhard" -PACKAGE_EXTRA_ARCHS:tune-armv8asimdhard = "${TUNE_PKGARCH:tune-armv8asimdhard}" -BASE_LIB:tune-armv8asimdhard = "lib/thumb/v8-a+simd/hard" -TUNE_FEATURES:tune-armv8asimdhard = "arm" -TUNE_CCARGS:tune-armv8asimdhard = "-mthumb -march=armv8-a+simd -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv8asimdhard = "armv8asimdthf" diff --git a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf deleted file mode 100644 index b3ab4c6b..00000000 --- a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf +++ /dev/null @@ -1,30 +0,0 @@ -require conf/machine/include/machine-xilinx-qemu.inc -require conf/multilib.conf -require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc -require conf/machine/include/baremetal-tc.conf - -# Define ilp32 variant (not in tune files) -TUNEVALID[ilp32] = "ilp32 ABI" - -TUNE_CCARGS .= '${@bb.utils.contains("TUNE_FEATURES", "ilp32", " -mabi=ilp32", "", d)}' - -# ILP request an alternative machine dictionary -INHERIT += "xlnx-standalone" -PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "ilp32", " xlnx_ilp32_dict", "", d)}' - -# Define all of the multilibs supported by this configuration -MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" -MULTILIBS = "multilib:libilp32" - -# Base configuration -# CFLAGS: -DEFAULTTUNE = "cortexa72-cortexa53" - -# CFLAGS: -mabi=ilp32 -DEFAULTTUNE:virtclass-multilib-libilp32 = "cortexa72-cortexa53-ilp32" - -AVAILTUNES += "cortexa72-cortexa53-ilp32" -ARMPKGARCH:tune-cortexa72-cortexa53-ilp32 = "${ARMPKGARCH:tune-cortexa72-cortexa53}-ilp32" -TUNE_FEATURES:tune-cortexa72-cortexa53-ilp32 = "${TUNE_FEATURES:tune-cortexa72-cortexa53} ilp32" -PACKAGE_EXTRA_ARCHS:tune-cortexa72-cortexa53-ilp32 = "${PACKAGE_EXTRA_ARCHS:tune-cortexa72-cortexa53} cortexa72-cortexa53-ilp32" -BASE_LIB:tune-cortexa72-cortexa53-ilp32 = "lib/ilp32" diff --git a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf deleted file mode 100644 index 6f0e5fbf..00000000 --- a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf +++ /dev/null @@ -1,275 +0,0 @@ -require conf/machine/include/machine-xilinx-qemu.inc -require conf/multilib.conf -require conf/machine/include/arm/arch-armv8r.inc -require conf/machine/include/baremetal-tc.conf - -# Since we're combining armv7r and armv8r into a single set of multilibs, -# copy the following machine setting to make sure it's available -# From conf/machine/include/arm/arch-armv7r.inc - -TUNEVALID[armv7r] = "Enable instructions for ARMv7-r" -TUNE_CCARGS_MARCH = "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', ' -march=armv7-r', '', d)}" -MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 'armv7r:', '', d)}" -TUNECONFLICTS[armv7r] = "armv4 armv5 armv6 armv7a" - - -# Define all of the multilibs supproted by this configuration -MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" - -MULTILIBS = "multilib:libarmv5tesoftfp multilib:libarmv5tehard" -MULTILIBS += "multilib:libnofp" -MULTILIBS += "multilib:libv7nofp multilib:libv7fpsoftfp multilib:libv7fphard" -MULTILIBS += "multilib:libv6mnofp" -MULTILIBS += "multilib:libv7mnofp" -MULTILIBS += "multilib:libv7emnofp multilib:libv7emfpsoftfp" -MULTILIBS += "multilib:libv7emfphard multilib:libv7emdpsoftfp" -MULTILIBS += "multilib:libv7emdphard" -MULTILIBS += "multilib:libv8mbasenofp" -MULTILIBS += "multilib:libv8mmainnofp multilib:libv8mmainfpsoftfp multilib:libv8mmainfphard multilib:libv8mmaindpsoftfp multilib:libv8mmaindphard" - -TUNE_CCARGS = "${TUNE_CCARGS:tune-${DEFAULTTUNE}}" -TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" - -# Base configuration -# CFLAGS: -DEFAULTTUNE = "armv7r" - -AVAILTUNES += "armv7r" -PACKAGE_EXTRA_ARCHS:tune-armv7r = "${TUNE_PKGARCH:tune-armv7r}" -BASE_LIB:tune-armv7r = "lib" -TUNE_FEATURES:tune-armv7r = "arm armv7r" -TUNE_CCARGS:tune-armv7r = "" -TUNE_PKGARCH:tune-armv7r = "armv7r" - - -# arm/v5te/softfp -# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp" - -AVAILTUNES += "armv5tesoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}" -BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp" -TUNE_FEATURES:tune-armv5tesoftfp = "arm armv7r" -TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp" - - -# arm/v5te/hard -# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard" - -AVAILTUNES += "armv5tehard" -PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}" -BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard" -TUNE_FEATURES:tune-armv5tehard = "arm armv7r" -TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf" - - -# thumb/nofp -# CFLAGS: -mthumb -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp" - -AVAILTUNES += "armnofp" -PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}" -BASE_LIB:tune-armnofp = "lib/thumb/nofp" -TUNE_FEATURES:tune-armnofp = "arm armv7r" -TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft" -TUNE_PKGARCH:tune-armnofp = "armt" - - -# thumb/v7/nofp -# CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp" - -AVAILTUNES += "armv7nofp" -PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}" -BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp" -TUNE_FEATURES:tune-armv7nofp ="arm armv7r" -TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv7nofp = "armv7t" - - -# thumb/v7+fp/softfp -# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp" - -AVAILTUNES += "armv7fpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}" -BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp" -TUNE_FEATURES:tune-armv7fpsoftfp ="arm armv7r" -TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt" - - -# thumb/v7+fp/hard -# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard" - -AVAILTUNES += "armv7fphard" -PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}" -BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard" -TUNE_FEATURES:tune-armv7fphard ="arm armv7r" -TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf" - - -# thumb/v6-m/nofp -# CFLAGS: -mthumb -march=armv6s-m -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv6mnofp = "armv6mnofp" - -# Workaround for this multilib in newlib -# newlib/libc/sys/arm/trap.S:88: Error: lo register required -- `sub ip,sp,ip -EXTRA_OECONF:append:pn-libv6mnofp-newlib = " --disable-newlib-supplied-syscalls" - -AVAILTUNES += "armv6mnofp" -PACKAGE_EXTRA_ARCHS:tune-armv6mnofp = "${TUNE_PKGARCH:tune-armv6mnofp}" -BASE_LIB:tune-armv6mnofp = "lib/thumb/v6-m/nofp" -TUNE_FEATURES:tune-armv6mnofp ="arm armv7r" -TUNE_CCARGS:tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv6mnofp = "armv6smt" - - -# thumb/v7-m/nofp -# CFLAGS: -mthumb -march=armv7-m -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv7mnofp = "armv7mnofp" - -AVAILTUNES += "armv7mnofp" -PACKAGE_EXTRA_ARCHS:tune-armv7mnofp = "${TUNE_PKGARCH:tune-armv7mnofp}" -BASE_LIB:tune-armv7mnofp = "lib/thumb/v7-m/nofp" -TUNE_FEATURES:tune-armv7mnofp ="arm armv7r" -TUNE_CCARGS:tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv7mnofp = "armv7mt" - - -# thumb/v7e-m/nofp -# CFLAGS: -mthumb -march=armv7e-m -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv7emnofp = "armv7emnofp" - -AVAILTUNES += "armv7emnofp" -PACKAGE_EXTRA_ARCHS:tune-armv7emnofp = "${TUNE_PKGARCH:tune-armv7emnofp}" -BASE_LIB:tune-armv7emnofp = "lib/thumb/v7e-m/nofp" -TUNE_FEATURES:tune-armv7emnofp ="arm armv7r" -TUNE_CCARGS:tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv7emnofp = "armv7emt" - - -# thumb/v7e-m+fp/softfp -# CFLAGS: -mthumb -march=armv7e-m+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp" - -AVAILTUNES += "armv7emfpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7emfpsoftfp = "${TUNE_PKGARCH:tune-armv7emfpsoftfp}" -BASE_LIB:tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp" -TUNE_FEATURES:tune-armv7emfpsoftfp ="arm armv7r" -TUNE_CCARGS:tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7emfpsoftfp = "armv7emfpt" - - -# thumb/v7e-m+fp/hard -# CFLAGS: -mthumb -march=armv7e-m+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv7emfphard = "armv7emfphard" - -AVAILTUNES += "armv7emfphard" -PACKAGE_EXTRA_ARCHS:tune-armv7emfphard = "${TUNE_PKGARCH:tune-armv7emfphard}" -BASE_LIB:tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard" -TUNE_FEATURES:tune-armv7emfphard ="arm armv7r" -TUNE_CCARGS:tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv7emfphard = "armv7emfpthf" - - -# thumb/v7e-m+dp/softfp -# CFLAGS: -mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp" - -AVAILTUNES += "armv7emdpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv7emdpsoftfp = "${TUNE_PKGARCH:tune-armv7emdpsoftfp}" -BASE_LIB:tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp" -TUNE_FEATURES:tune-armv7emdpsoftfp ="arm armv7r" -TUNE_CCARGS:tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv7emdpsoftfp = "armv7emdp" - -# thumb/v7e-m+dp/hard -# CFLAGS: -mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv7emdphard = "armv7emdphard" - -AVAILTUNES += "armv7emdphard" -PACKAGE_EXTRA_ARCHS:tune-armv7emdphard = "${TUNE_PKGARCH:tune-armv7emdphard}" -BASE_LIB:tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard" -TUNE_FEATURES:tune-armv7emdphard ="arm armv7r" -TUNE_CCARGS:tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv7emdphard = "armv7emdpthf" - - -# thumb/v8-m.base/nofp -# CFLAGS: -mthumb -march=armv8-m.base -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv8mbasenofp = "armv8mbasenofp" - -# Workaround for this multilib in newlib -# newlib/libc/sys/arm/trap.S:88: Error: lo register required -- `sub ip,sp,ip' -EXTRA_OECONF:append:pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-syscalls" - -AVAILTUNES += "armv8mbasenofp" -PACKAGE_EXTRA_ARCHS:tune-armv8mbasenofp = "${TUNE_PKGARCH:tune-armv8mbasenofp}" -BASE_LIB:tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp" -TUNE_FEATURES:tune-armv8mbasenofp ="arm armv8r" -TUNE_CCARGS:tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv8mbasenofp = "armv8mbaset" - -# thumb/v8-m.main/nofp -# CFLAGS: -mthumb -march=armv8-m.main -mfloat-abi=soft -DEFAULTTUNE:virtclass-multilib-libv8mmainnofp = "armv8mmainnofp" - -AVAILTUNES += "armv8mmainnofp" -PACKAGE_EXTRA_ARCHS:tune-armv8mmainnofp = "${TUNE_PKGARCH:tune-armv8mmainnofp}" -BASE_LIB:tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp" -TUNE_FEATURES:tune-armv8mmainnofp ="arm armv8r" -TUNE_CCARGS:tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft" -TUNE_PKGARCH:tune-armv8mmainnofp = "armv8mmaint" - - -# thumb/v8-m.main+fp/softfp -# CFLAGS: -mthumb -march=armv8-m.main+fp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp" - -AVAILTUNES += "armv8mmainfpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH:tune-armv8mmainfpsoftfp}" -BASE_LIB:tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp" -TUNE_FEATURES:tune-armv8mmainfpsoftfp ="arm armv8r" -TUNE_CCARGS:tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv8mmainfpsoftfp = "armv8mmainfpt" - -# thumb/v8-m.main+fp/hard -# CFLAGS: -mthumb -march=armv8-m.main+fp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv8mmainfphard = "armv8mmainfphard" - -AVAILTUNES += "armv8mmainfphard" -PACKAGE_EXTRA_ARCHS:tune-armv8mmainfphard = "${TUNE_PKGARCH:tune-armv8mmainfphard}" -BASE_LIB:tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard" -TUNE_FEATURES:tune-armv8mmainfphard ="arm armv8r" -TUNE_CCARGS:tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv8mmainfphard = "armv8mmainfpthf" - - -# thumb/v8-m.main+dp/softfp -# CFLAGS: -mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp -DEFAULTTUNE:virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp" - -AVAILTUNES += "armv8mmaindpsoftfp" -PACKAGE_EXTRA_ARCHS:tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH:tune-armv8mmaindpsoftfp}" -BASE_LIB:tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp" -TUNE_FEATURES:tune-armv8mmaindpsoftfp ="arm armv8r" -TUNE_CCARGS:tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp" -TUNE_PKGARCH:tune-armv8mmaindpsoftfp = "armv8mmainfpdpt" - - -# thumb/v8-m.main+dp/hard -# CFLAGS: -mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard -DEFAULTTUNE:virtclass-multilib-libv8mmaindphard = "armv8mmaindphard" - -AVAILTUNES += "armv8mmaindphard" -PACKAGE_EXTRA_ARCHS:tune-armv8mmaindphard = "${TUNE_PKGARCH:tune-armv8mmaindphard}" -BASE_LIB:tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard" -TUNE_FEATURES:tune-armv8mmaindphard ="arm armv8r" -TUNE_CCARGS:tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard" -TUNE_PKGARCH:tune-armv8mmaindphard = "armv8mmainfpdpthf" diff --git a/meta-xilinx-standalone/conf/machine/include/baremetal-tc.conf b/meta-xilinx-standalone/conf/machine/include/baremetal-tc.conf deleted file mode 100644 index c9f5c614..00000000 --- a/meta-xilinx-standalone/conf/machine/include/baremetal-tc.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This is specific to baremetal toolchains only. -# -# Some of the operations we want to do are different then regular Yocto -# Project SDK workflows, so wrap baremetal toolchain items in a custom -# override: - -MACHINEOVERRIDES:append = ":baremetal-multilib-tc" diff --git a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf deleted file mode 100644 index 38e0b01b..00000000 --- a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf +++ /dev/null @@ -1,550 +0,0 @@ -require conf/machine/include/machine-xilinx-qemu.inc -require conf/multilib.conf -require conf/machine/include/microblaze/arch-microblaze.inc -require conf/machine/include/baremetal-tc.conf - -# Set defaults -# pie is not supported on microblaze, disable it to avoid: -# .../microblaze-xilinx-elf/12.2.0/ld: -pie not supported -GCCPIE:microblaze = "" -GLIBCPIE:microblaze = "" -SECURITY_CFLAGS:remove:microblaze = "${SECURITY_PIE_CFLAGS}" -SECURITY_CFLAGS:pn-libgcc:microblaze = "" - -# ILP request an alternative machine dictionary -INHERIT += "xlnx-standalone" -PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}' - -# GNU hash style not supported -LINKER_HASH_STYLE:microblaze = "" - -# Define all of the multilibs supproted by this configuration -MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" - -MULTILIBS += "multilib:libmble" -MULTILIBS += "multilib:libmbbs" -MULTILIBS += "multilib:libmbp" -MULTILIBS += "multilib:libmbm" -MULTILIBS += "multilib:libmbfpd" -MULTILIBS += "multilib:libmbmfpd" -MULTILIBS += "multilib:libmbpm" -MULTILIBS += "multilib:libmbpfpd" -MULTILIBS += "multilib:libmbpmfpd" -MULTILIBS += "multilib:libmbbsp" -MULTILIBS += "multilib:libmbbsm" -MULTILIBS += "multilib:libmbbsfpd" -MULTILIBS += "multilib:libmbbsmfpd" -MULTILIBS += "multilib:libmbbspm" -MULTILIBS += "multilib:libmbbspfpd" -MULTILIBS += "multilib:libmbbspmfpd" -MULTILIBS += "multilib:libmblem64" -MULTILIBS += "multilib:libmblebs" -MULTILIBS += "multilib:libmblep" -MULTILIBS += "multilib:libmblem" -MULTILIBS += "multilib:libmblefpd" -MULTILIBS += "multilib:libmblemfpd" -MULTILIBS += "multilib:libmblepm" -MULTILIBS += "multilib:libmblepfpd" -MULTILIBS += "multilib:libmblepmfpd" -MULTILIBS += "multilib:libmblebsp" -MULTILIBS += "multilib:libmblebsm" -MULTILIBS += "multilib:libmblebsfpd" -MULTILIBS += "multilib:libmblebsmfpd" -MULTILIBS += "multilib:libmblebspm" -MULTILIBS += "multilib:libmblebspfpd" -MULTILIBS += "multilib:libmblebspmfpd" -MULTILIBS += "multilib:libmblem64bs" -MULTILIBS += "multilib:libmblem64p" -MULTILIBS += "multilib:libmblem64m" -MULTILIBS += "multilib:libmblem64fpd" -MULTILIBS += "multilib:libmblem64mfpd" -MULTILIBS += "multilib:libmblem64pm" -MULTILIBS += "multilib:libmblem64pfpd" -MULTILIBS += "multilib:libmblem64pmfpd" -MULTILIBS += "multilib:libmblem64bsp" -MULTILIBS += "multilib:libmblem64bsm" -MULTILIBS += "multilib:libmblem64bsfpd" -MULTILIBS += "multilib:libmblem64bsmfpd" -MULTILIBS += "multilib:libmblem64bspm" -MULTILIBS += "multilib:libmblem64bspfpd" -MULTILIBS += "multilib:libmblem64bspmfpd" - - -# Base configuration -# CFLAGS: -DEFAULTTUNE = "microblaze" - -AVAILTUNES += "microblaze" -BASE_LIB:tune-microblaze = "lib" -TUNE_FEATURES:tune-microblaze = "microblaze bigendian" -PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}" - - -# le -# CFLAGS: -mlittle-endian -DEFAULTTUNE:virtclass-multilib-libmble = "microblazele" - -AVAILTUNES += "microblazele" -BASE_LIB:tune-microblazele = "lib/le" -TUNE_FEATURES:tune-microblazele = "microblaze" -PACKAGE_EXTRA_ARCHS:tune-microblazele = "${TUNE_PKGARCH}" - - -# bs -# CFLAGS: -mxl-barrel-shift -DEFAULTTUNE:virtclass-multilib-libmbbs = "microblazebs" - -AVAILTUNES += "microblazebs" -BASE_LIB:tune-microblazebs = "lib/bs" -TUNE_FEATURES:tune-microblazebs = "microblaze bigendian barrel-shift" -PACKAGE_EXTRA_ARCHS:tune-microblazebs = "${TUNE_PKGARCH}" - - -# p -# CFLAGS: -mxl-pattern-compare -DEFAULTTUNE:virtclass-multilib-libmbp = "microblazep" - -AVAILTUNES += "microblazep" -BASE_LIB:tune-microblazep = "lib/p" -TUNE_FEATURES:tune-microblazep = "microblaze bigendian pattern-compare" -PACKAGE_EXTRA_ARCHS:tune-microblazep = "${TUNE_PKGARCH}" - - -# m -# CFLAGS: -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmbm = "microblazem" - -AVAILTUNES += "microblazem" -BASE_LIB:tune-microblazem = "lib/m" -TUNE_FEATURES:tune-microblazem = "microblaze bigendian multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazem = "${TUNE_PKGARCH}" - - -# fpd -# CFLAGS: -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbfpd = "microblazefpd" - -AVAILTUNES += "microblazefpd" -BASE_LIB:tune-microblazefpd = "lib/fpd" -TUNE_FEATURES:tune-microblazefpd = "microblaze bigendian fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazefpd = "${TUNE_PKGARCH}" - - -# m/fpd -# CFLAGS: -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbmfpd = "microblazemfpd" - -AVAILTUNES += "microblazemfpd" -BASE_LIB:tune-microblazemfpd = "lib/m/fpd" -TUNE_FEATURES:tune-microblazemfpd = "microblaze bigendian multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazemfpd = "${TUNE_PKGARCH}" - - -# p/m -# CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmbpm = "microblazepm" - -AVAILTUNES += "microblazepm" -BASE_LIB:tune-microblazepm = "lib/p/m" -TUNE_FEATURES:tune-microblazepm = "microblaze bigendian pattern-compare multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazepm = "${TUNE_PKGARCH}" - - -# p/fpd -# CFLAGS: -mxl-pattern-compare -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbpfpd = "microblazepfpd" - -AVAILTUNES += "microblazepfpd" -BASE_LIB:tune-microblazepfpd = "lib/p/fpd" -TUNE_FEATURES:tune-microblazepfpd = "microblaze bigendian pattern-compare fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazepfpd = "${TUNE_PKGARCH}" - - -# p/m/fpd -# CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbpmfpd = "microblazepmfpd" - -AVAILTUNES += "microblazepmfpd" -BASE_LIB:tune-microblazepmfpd = "lib/p/m/fpd" -TUNE_FEATURES:tune-microblazepmfpd = "microblaze bigendian pattern-compare multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazepmfpd = "${TUNE_PKGARCH}" - - -# bs/p -# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -DEFAULTTUNE:virtclass-multilib-libmbbsp = "microblazebsp" - -AVAILTUNES += "microblazebsp" -BASE_LIB:tune-microblazebsp = "lib/bs/p" -TUNE_FEATURES:tune-microblazebsp = "microblaze bigendian barrel-shift pattern-compare" -PACKAGE_EXTRA_ARCHS:tune-microblazebsp = "${TUNE_PKGARCH}" - - -# bs/m -# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmbbsm = "microblazebsm" - -AVAILTUNES += "microblazebsm" -BASE_LIB:tune-microblazebsm = "lib/bs/m" -TUNE_FEATURES:tune-microblazebsm = "microblaze bigendian barrel-shift multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazebsm = "${TUNE_PKGARCH}" - - -# bs/fpd -# CFLAGS: -mxl-barrel-shift -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbbsfpd = "microblazebsfpd" - -AVAILTUNES += "microblazebsfpd" -BASE_LIB:tune-microblazebsfpd = "lib/bs/fpd" -TUNE_FEATURES:tune-microblazebsfpd = "microblaze bigendian barrel-shift fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazebsfpd = "${TUNE_PKGARCH}" - - -# bs/m/fpd -# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbbsmfpd = "microblazebsmfpd" - -AVAILTUNES += "microblazebsmfpd" -BASE_LIB:tune-microblazebsmfpd = "lib/bs/m/fpd" -TUNE_FEATURES:tune-microblazebsmfpd = "microblaze bigendian barrel-shift multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazebsmfpd = "${TUNE_PKGARCH}" - - -# bs/p/m -# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmbbspm = "microblazebspm" - -AVAILTUNES += "microblazebspm" -BASE_LIB:tune-microblazebspm = "lib/bs/p/m" -TUNE_FEATURES:tune-microblazebspm = "microblaze bigendian barrel-shift pattern-compare multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazebspm = "${TUNE_PKGARCH}" - - -# bs/p/fpd -# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbbspfpd = "microblazebspfpd" - -AVAILTUNES += "microblazebspfpd" -BASE_LIB:tune-microblazebspfpd = "lib/bs/p/fpd" -TUNE_FEATURES:tune-microblazebspfpd = "microblaze bigendian barrel-shift pattern-compare fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazebspfpd = "${TUNE_PKGARCH}" - - -# bs/p/m/fpd -# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmbbspmfpd = "microblazebspmfpd" - -AVAILTUNES += "microblazebspmfpd" -BASE_LIB:tune-microblazebspmfpd = "lib/bs/p/m/fpd" -TUNE_FEATURES:tune-microblazebspmfpd = "microblaze bigendian barrel-shift pattern-compare multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazebspmfpd = "${TUNE_PKGARCH}" - - -# le/m64 -# CFLAGS: -mlittle-endian -m64 -DEFAULTTUNE:virtclass-multilib-libmblem64 = "microblazele64" - -AVAILTUNES += "microblazele64" -BASE_LIB:tune-microblazele64 = "lib/le/m64" -TUNE_FEATURES:tune-microblazele64 = "microblaze 64-bit" -PACKAGE_EXTRA_ARCHS:tune-microblazele64 = "${TUNE_PKGARCH}" - - -# le/bs -# CFLAGS: -mlittle-endian -mxl-barrel-shift -DEFAULTTUNE:virtclass-multilib-libmblebs = "microblazelebs" - -AVAILTUNES += "microblazelebs" -BASE_LIB:tune-microblazelebs = "lib/le/bs" -TUNE_FEATURES:tune-microblazelebs = "microblaze barrel-shift" -PACKAGE_EXTRA_ARCHS:tune-microblazelebs = "${TUNE_PKGARCH}" - - -# le/p -# CFLAGS: -mlittle-endian -mxl-pattern-compare -DEFAULTTUNE:virtclass-multilib-libmblep = "microblazelep" - -AVAILTUNES += "microblazelep" -BASE_LIB:tune-microblazelep = "lib/le/p" -TUNE_FEATURES:tune-microblazelep = "microblaze pattern-compare" -PACKAGE_EXTRA_ARCHS:tune-microblazelep = "${TUNE_PKGARCH}" - - -# le/m -# CFLAGS: -mlittle-endian -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblem = "microblazelem" - -AVAILTUNES += "microblazelem" -BASE_LIB:tune-microblazelem = "lib/le/m" -TUNE_FEATURES:tune-microblazelem = "microblaze multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazelem = "${TUNE_PKGARCH}" - - -# le/fpd -# CFLAGS: -mlittle-endian -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblefpd = "microblazelefpd" - -AVAILTUNES += "microblazelefpd" -BASE_LIB:tune-microblazelefpd = "lib/le/fpd" -TUNE_FEATURES:tune-microblazelefpd = "microblaze fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelefpd = "${TUNE_PKGARCH}" - - -# le/m/fpd -# CFLAGS: -mlittle-endian -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblemfpd = "microblazelemfpd" - -AVAILTUNES += "microblazelemfpd" -BASE_LIB:tune-microblazelemfpd = "lib/le/m/fpd" -TUNE_FEATURES:tune-microblazelemfpd = "microblaze multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelemfpd = "${TUNE_PKGARCH}" - - -# le/p/m -# CFLAGS: -mlittle-endian -mxl-pattern-compare -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblepm = "microblazelepm" - -AVAILTUNES += "microblazelepm" -BASE_LIB:tune-microblazelepm = "lib/le/p/m" -TUNE_FEATURES:tune-microblazelepm = "microblaze pattern-compare multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazelepm = "${TUNE_PKGARCH}" - - -# le/p/fpd -# CFLAGS: -mlittle-endian -mxl-pattern-compare -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblepfpd = "microblazelepfpd" - -AVAILTUNES += "microblazelepfpd" -BASE_LIB:tune-microblazelepfpd = "lib/le/p/fpd" -TUNE_FEATURES:tune-microblazelepfpd = "microblaze pattern-compare fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelepfpd = "${TUNE_PKGARCH}" - - -# le/p/m/fpd -# CFLAGS: -mlittle-endian -mxl-pattern-compare -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblepmfpd = "microblazelepmfpd" - -AVAILTUNES += "microblazelepmfpd" -BASE_LIB:tune-microblazelepmfpd = "lib/le/p/m/fpd" -TUNE_FEATURES:tune-microblazelepmfpd = "microblaze pattern-compare multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelepmfpd = "${TUNE_PKGARCH}" - - -# le/bs/p -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -DEFAULTTUNE:virtclass-multilib-libmblebsp = "microblazelebsp" - -AVAILTUNES += "microblazelebsp" -BASE_LIB:tune-microblazelebsp = "lib/le/bs/p" -TUNE_FEATURES:tune-microblazelebsp = "microblaze barrel-shift pattern-compare" -PACKAGE_EXTRA_ARCHS:tune-microblazelebsp = "${TUNE_PKGARCH}" - - -# le/bs/m -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblebsm = "microblazelebsm" - -AVAILTUNES += "microblazelebsm" -BASE_LIB:tune-microblazelebsm = "lib/le/bs/m" -TUNE_FEATURES:tune-microblazelebsm = "microblaze barrel-shift multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazelebsm = "${TUNE_PKGARCH}" - - -# le/bs/fpd -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblebsfpd = "microblazelebsfpd" - -AVAILTUNES += "microblazelebsfpd" -BASE_LIB:tune-microblazelebsfpd = "lib/le/bs/fpd" -TUNE_FEATURES:tune-microblazelebsfpd = "microblaze barrel-shift fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelebsfpd = "${TUNE_PKGARCH}" - - -# le/bs/m/fpd -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblebsmfpd = "microblazelebsmfpd" - -AVAILTUNES += "microblazelebsmfpd" -BASE_LIB:tune-microblazelebsmfpd = "lib/le/bs/m/fpd" -TUNE_FEATURES:tune-microblazelebsmfpd = "microblaze barrel-shift multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelebsmfpd = "${TUNE_PKGARCH}" - - -# le/bs/p/m -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblebspm = "microblazelebspm" - -AVAILTUNES += "microblazelebspm" -BASE_LIB:tune-microblazelebspm = "lib/le/bs/p/m" -TUNE_FEATURES:tune-microblazelebspm = "microblaze barrel-shift pattern-compare multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazelebspm = "${TUNE_PKGARCH}" - - -# le/bs/p/fpd -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblebspfpd = "microblazelebspfpd" - -AVAILTUNES += "microblazelebspfpd" -BASE_LIB:tune-microblazelebspfpd = "lib/le/bs/p/fpd" -TUNE_FEATURES:tune-microblazelebspfpd = "microblaze barrel-shift pattern-compare fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelebspfpd = "${TUNE_PKGARCH}" - - -# le/bs/p/m/fpd -# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblebspmfpd = "microblazelebspmfpd" - -AVAILTUNES += "microblazelebspmfpd" -BASE_LIB:tune-microblazelebspmfpd = "lib/le/bs/p/m/fpd" -TUNE_FEATURES:tune-microblazelebspmfpd = "microblaze barrel-shift pattern-compare multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazelebspmfpd = "${TUNE_PKGARCH}" - - -# le/m64/bs -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -DEFAULTTUNE:virtclass-multilib-libmblem64bs = "microblazele64bs" - -AVAILTUNES += "microblazele64bs" -BASE_LIB:tune-microblazele64bs = "lib/le/m64/bs" -TUNE_FEATURES:tune-microblazele64bs = "microblaze 64-bit barrel-shift" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bs = "${TUNE_PKGARCH}" - - -# le/m64/p -# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -DEFAULTTUNE:virtclass-multilib-libmblem64p = "microblazele64p" - -AVAILTUNES += "microblazele64p" -BASE_LIB:tune-microblazele64p = "lib/le/m64/p" -TUNE_FEATURES:tune-microblazele64p = "microblaze 64-bit pattern-compare" -PACKAGE_EXTRA_ARCHS:tune-microblazele64p = "${TUNE_PKGARCH}" - - -# le/m64/m -# CFLAGS: -mlittle-endian -m64 -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblem64m = "microblazele64m" - -AVAILTUNES += "microblazele64m" -BASE_LIB:tune-microblazele64m = "lib/le/m64/m" -TUNE_FEATURES:tune-microblazele64m = "microblaze 64-bit multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazele64m = "${TUNE_PKGARCH}" - - -# le/m64/fpd -# CFLAGS: -mlittle-endian -m64 -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64fpd = "microblazele64fpd" - -AVAILTUNES += "microblazele64fpd" -BASE_LIB:tune-microblazele64fpd = "lib/le/m64/fpd" -TUNE_FEATURES:tune-microblazele64fpd = "microblaze 64-bit fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64fpd = "${TUNE_PKGARCH}" - - -# le/m64/m/fpd -# CFLAGS: -mlittle-endian -m64 -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64mfpd = "microblazele64mfpd" - -AVAILTUNES += "microblazele64mfpd" -BASE_LIB:tune-microblazele64mfpd = "lib/le/m64/m/fpd" -TUNE_FEATURES:tune-microblazele64mfpd = "microblaze 64-bit multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64mfpd = "${TUNE_PKGARCH}" - - -# le/m64/p/m -# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblem64pm = "microblazele64pm" - -AVAILTUNES += "microblazele64pm" -BASE_LIB:tune-microblazele64pm = "lib/le/m64/p/m" -TUNE_FEATURES:tune-microblazele64pm = "microblaze 64-bit pattern-compare multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazele64pm = "${TUNE_PKGARCH}" - - -# le/m64/p/fpd -# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64pfpd = "microblazele64pfpd" - -AVAILTUNES += "microblazele64pfpd" -BASE_LIB:tune-microblazele64pfpd = "lib/le/m64/p/fpd" -TUNE_FEATURES:tune-microblazele64pfpd = "microblaze 64-bit pattern-compare fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64pfpd = "${TUNE_PKGARCH}" - - -# le/m64/p/m/fpd -# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64pmfpd = "microblazele64pmfpd" - -AVAILTUNES += "microblazele64pmfpd" -BASE_LIB:tune-microblazele64pmfpd = "lib/le/m64/p/m/fpd" -TUNE_FEATURES:tune-microblazele64pmfpd = "microblaze 64-bit pattern-compare multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64pmfpd = "${TUNE_PKGARCH}" - - -# le/m64/bs/p -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -DEFAULTTUNE:virtclass-multilib-libmblem64bsp = "microblazele64bsp" - -AVAILTUNES += "microblazele64bsp" -BASE_LIB:tune-microblazele64bsp = "lib/le/m64/bs/p" -TUNE_FEATURES:tune-microblazele64bsp = "microblaze 64-bit barrel-shift pattern-compare" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bsp = "${TUNE_PKGARCH}" - - -# le/m64/bs/m -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblem64bsm = "microblazele64bsm" - -AVAILTUNES += "microblazele64bsm" -BASE_LIB:tune-microblazele64bsm = "lib/le/m64/bs/m" -TUNE_FEATURES:tune-microblazele64bsm = "microblaze 64-bit barrel-shift multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bsm = "${TUNE_PKGARCH}" - - -# le/m64/bs/fpd -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64bsfpd = "microblazele64bsfpd" - -AVAILTUNES += "microblazele64bsfpd" -BASE_LIB:tune-microblazele64bsfpd = "lib/le/m64/bs/fpd" -TUNE_FEATURES:tune-microblazele64bsfpd = "microblaze 64-bit barrel-shift fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bsfpd = "${TUNE_PKGARCH}" - - -# le/m64/bs/m/fpd -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64bsmfpd = "microblazele64bsmfpd" - -AVAILTUNES += "microblazele64bsmfpd" -BASE_LIB:tune-microblazele64bsmfpd = "lib/le/m64/bs/m/fpd" -TUNE_FEATURES:tune-microblazele64bsmfpd = "microblaze 64-bit barrel-shift multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bsmfpd = "${TUNE_PKGARCH}" - - -# le/m64/bs/p/m -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -DEFAULTTUNE:virtclass-multilib-libmblem64bspm = "microblazele64bspm" - -AVAILTUNES += "microblazele64bspm" -BASE_LIB:tune-microblazele64bspm = "lib/le/m64/bs/p/m" -TUNE_FEATURES:tune-microblazele64bspm = "microblaze 64-bit barrel-shift pattern-compare multiply-low" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bspm = "${TUNE_PKGARCH}" - - -# le/m64/bs/p/fpd -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64bspfpd = "microblazele64bspfpd" - -AVAILTUNES += "microblazele64bspfpd" -BASE_LIB:tune-microblazele64bspfpd = "lib/le/m64/bs/p/fpd" -TUNE_FEATURES:tune-microblazele64bspfpd = "microblaze 64-bit barrel-shift pattern-compare fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bspfpd = "${TUNE_PKGARCH}" - - -# le/m64/bs/p/m/fpd -# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float -DEFAULTTUNE:virtclass-multilib-libmblem64bspmfpd = "microblazele64bspmfpd" - -AVAILTUNES += "microblazele64bspmfpd" -BASE_LIB:tune-microblazele64bspmfpd = "lib/le/m64/bs/p/m/fpd" -TUNE_FEATURES:tune-microblazele64bspmfpd = "microblaze 64-bit barrel-shift pattern-compare multiply-low fpu-hard" -PACKAGE_EXTRA_ARCHS:tune-microblazele64bspmfpd = "${TUNE_PKGARCH}" -- cgit v1.2.3-54-g00ecf From 89fa96069c443c31fcb8e97774fdd3a26f00da54 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 16:49:23 -0800 Subject: newlib: Remove PLNX/Vitis multilib helpers These are only used for the special PetaLinux/Vitis multilib toolchain and should not be generally applied. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend | 3 --- meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend | 6 ------ 2 files changed, 9 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend index 70a2f9da..fcdc1ebd 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend @@ -1,9 +1,6 @@ COMPATIBLE_HOST = ".*-elf" COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" -# When building multiple, we need to depend on the multilib newlib -DEPENDS:append:xilinx-standalone = " ${MLPREFIX}newlib" - EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ --enable-newlib-io-long-long \ diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend index 71590194..aff092cc 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend @@ -12,9 +12,3 @@ EXTRA_OECONF:append:xilinx-standalone = " \ do_configure:prepend:xilinx-standalone(){ export CC_FOR_TARGET="${CC}" } - -# Fix for multilib newlib installations -do_install:prepend:xilinx-standalone() { - mkdir -p $(dirname ${D}${libdir}) - mkdir -p $(dirname ${D}${includedir}) -} -- cgit v1.2.3-54-g00ecf From 9e1e14b05870b183d0df93bba08c065ea3c893da Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 17:03:16 -0800 Subject: Move multilib specific PLNX/Vitis items to meta-petalinux These items are specific to the special PetaLinux/Vitis multilib toolchain, move these to meta-petalinux. Signed-off-by: Mark Hatle --- .../recipes-core/meta/gnu-toolchain-canadian.bb | 27 ---------------------- .../packagegroup-cross-canadian.bbappend | 14 ----------- .../packagegroup-newlib-standalone-sdk-target.bb | 13 ----------- 3 files changed, 54 deletions(-) delete mode 100644 meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb delete mode 100644 meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend delete mode 100644 meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb b/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb deleted file mode 100644 index 1af09a5f..00000000 --- a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb +++ /dev/null @@ -1,27 +0,0 @@ -inherit cross-canadian - -SUMMARY = "Links to the various GNU toolchains for use with the Xilinx multilib toolchain" -PN = "gnu-toolchain-canadian-${TARGET_SYS}" -BPN = "gnu-toolchain-canadian" - -LICENSE = "MIT" - -EXEEXT:sdkmingw32 = ".exe" - -do_install () { - if [ "${TARGET_SYS_MULTILIB_ORIGINAL}" != "" -a "${TARGET_SYS_MULTILIB_ORIGINAL}" != "${TARGET_SYS}" ]; then - mkdir -p ${D}${bindir} - - # Create a link for each item references by the environment files - for each in gcc g++ as ld gdb strip ranlib objcopy objdump readelf ar nm ; do - ln -s ../${TARGET_SYS_MULTILIB_ORIGINAL}/${TARGET_SYS_MULTILIB_ORIGINAL}-${each}${EXEEXT} ${D}${bindir}/${TARGET_SYS}-${each}${EXEEXT} - done - fi -} - -INHIBIT_DEFAULT_DEPS = "1" - -ALLOW_EMPTY:${PN} = "1" -FILES:${PN} = "${bindir}" - -PACKAGES = "${PN}" diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend deleted file mode 100644 index 7ef0693b..00000000 --- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -# Avoid installing all of the alternative toolchains -# due to multilib enabled in the primary toolchain. - -# Create the links to the multilib toolchain components -GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}" - -# Without the := the eval during do_package is occasionally missing multilibs -RDEPENDS:${PN}:xilinx-standalone := " \ - ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \ - ${BINUTILS} \ - ${GCC} \ - ${GDB} \ - meta-environment-${MACHINE} \ -" diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb deleted file mode 100644 index 5534e1d9..00000000 --- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb +++ /dev/null @@ -1,13 +0,0 @@ -COMPATIBLE_HOST = "${HOST_SYS}" - -SUMMARY = "Target packages for the standalone SDK" - -PACKAGE_ARCH = "${TUNE_PKGARCH}" - -inherit packagegroup - -RDEPENDS:${PN} = "\ - libgcc-dev \ - libstdc++-dev \ - ${LIBC_DEPENDENCIES} \ - " -- cgit v1.2.3-54-g00ecf From 688e77aa4368dacce0d50f95b62b14f9d28bb9c5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 13:31:46 -0800 Subject: packagegroup-standalone-cross-canadian: Move from bbappend to new bb We want to avoid modifying the default package, as it can break Yocto Project Compatibility guidelines. Signed-off-by: Mark Hatle --- .../packagegroup-standalone-cross-canadian.bb | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb new file mode 100644 index 00000000..56bd7aca --- /dev/null +++ b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb @@ -0,0 +1,23 @@ +SUMMARY = "Host SDK package for standalone cross canadian toolchain" +PN = "packagegroup-stadalone-cross-canadian-${MACHINE}" + +inherit cross-canadian packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +# Use indirection to stop these being expanded prematurely +BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" +GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" +GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" + +# Create the links to the multilib toolchain components +GNUTCLINKS = "standalone-gnu-toolchain-canadian-${TARGET_SYS}" + +# Without the := the eval during do_package is occasionally missing multilibs +RDEPENDS:${PN}:xilinx-standalone := " \ + ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \ + ${BINUTILS} \ + ${GCC} \ + ${GDB} \ + meta-environment-${MACHINE} \ +" -- cgit v1.2.3-54-g00ecf From 75dc2bc0864a9bd5643419fdd2281a2704e88337 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 23 Feb 2023 16:48:49 -0800 Subject: Move PLNX/Vitis standalone toolchain helpers to meta-petalinux Signed-off-by: Mark Hatle --- .../packagegroup-standalone-cross-canadian.bb | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb deleted file mode 100644 index 56bd7aca..00000000 --- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-standalone-cross-canadian.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Host SDK package for standalone cross canadian toolchain" -PN = "packagegroup-stadalone-cross-canadian-${MACHINE}" - -inherit cross-canadian packagegroup - -PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" - -# Use indirection to stop these being expanded prematurely -BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" -GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" -GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" - -# Create the links to the multilib toolchain components -GNUTCLINKS = "standalone-gnu-toolchain-canadian-${TARGET_SYS}" - -# Without the := the eval during do_package is occasionally missing multilibs -RDEPENDS:${PN}:xilinx-standalone := " \ - ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \ - ${BINUTILS} \ - ${GCC} \ - ${GDB} \ - meta-environment-${MACHINE} \ -" -- cgit v1.2.3-54-g00ecf From 2817610e95253cec059c18e52a3b490f864fd2c4 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 27 Feb 2023 16:35:21 +0530 Subject: Updated SRCREV for 2023.1_8035 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 14965086..a6886b13 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "af7dbc028f014457bc76b479ac0f3671732aa75e" +ESW_REV[2023.1] = "4513ed5184c07985ceb3da98b118b5873c151747" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 87f0327aaee8eb30cc41ec5a306b5cd4df5d99e8 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 28 Feb 2023 14:42:27 +0530 Subject: Updated SRCREV for 2023.1_3659 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index a6886b13..e48381bf 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "4513ed5184c07985ceb3da98b118b5873c151747" +ESW_REV[2023.1] = "fb44965327eabbd5c4cc513a9332ea40c98c81e5" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 3a0f3b767e132d87453b6f7c6c2bd80a5ad4f6ef Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 1 Mar 2023 14:20:07 +0530 Subject: Updated SRCREV for 2023.1_7971 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index e48381bf..d69b3895 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "fb44965327eabbd5c4cc513a9332ea40c98c81e5" +ESW_REV[2023.1] = "fe8a3a8dec4070afae9094bae86e6d73b5ada700" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From fb708a060d75036a51cc6028c9049b6b464a80d7 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 2 Mar 2023 13:23:56 +0530 Subject: Updated SRCREV for 2023.1_5423 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index d69b3895..bdccaa8c 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "fe8a3a8dec4070afae9094bae86e6d73b5ada700" +ESW_REV[2023.1] = "0ba06dbe70f148c458b1d26e3febac32caaa56e5" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From f0ee0fcc8629b05229b7584d00c19fd6bd39d0e3 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 3 Mar 2023 13:15:03 +0530 Subject: Updated SRCREV for 2023.1_7147 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index bdccaa8c..fb37a1b4 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "0ba06dbe70f148c458b1d26e3febac32caaa56e5" +ESW_REV[2023.1] = "14809f266c6ec79b517d976f882ba496be3e1998" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 719221f708bb63b876cbd0b92c5a1add2e0d6c32 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 2 Mar 2023 12:48:18 -0700 Subject: embeddedsw: Disable buildpaths QA check for embeddedsw firmware Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc | 3 +++ meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc | 3 +++ meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc | 3 +++ meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc | 2 ++ 4 files changed, 11 insertions(+) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc index ceb49417..34051bfa 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc @@ -71,3 +71,6 @@ do_deploy() { } addtask deploy before do_build after do_install + +# Disable buildpaths QA check warnings. +INSANE_SKIP:${PN} += "buildpaths" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc index 44e428ff..1551f776 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc @@ -81,3 +81,6 @@ do_deploy() { } addtask deploy before do_build after do_install + +# Disable buildpaths QA check warnings. +INSANE_SKIP:${PN} += "buildpaths" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc index b789af5d..ed3ac959 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc @@ -80,3 +80,6 @@ do_deploy() { } addtask deploy before do_build after do_install + +# Disable buildpaths QA check warnings. +INSANE_SKIP:${PN} += "buildpaths" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc index a7acfbb7..05b2a1cc 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc @@ -82,3 +82,5 @@ do_deploy() { addtask deploy before do_build after do_install +# Disable buildpaths QA check warnings. +INSANE_SKIP:${PN} += "buildpaths" -- cgit v1.2.3-54-g00ecf From 7e6492b0ecbdf86d086ef59dc9dfdb025fbd4ecf Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 3 Mar 2023 16:12:11 -0600 Subject: Remove obsolete 2022 versions Signed-off-by: Mark Hatle --- .../reference-design/kc705-bitstream_2022.1.bb | 48 -- ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 305 ----------- ...002-clk-Add-driver-for-axi_dynclk-IP-Core.patch | 607 --------------------- ...0003-drm-xilinx-Fix-DPMS-transition-to-on.patch | 54 -- .../v2022.1/0004-minized-wifi-bluetooth.cfg | 33 -- ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 305 ----------- ...002-clk-Add-driver-for-axi_dynclk-IP-Core.patch | 607 --------------------- ...0003-drm-xilinx-Fix-DPMS-transition-to-on.patch | 54 -- .../v2022.2/0004-minized-wifi-bluetooth.cfg | 33 -- .../linux/linux-xlnx_2022.1.bbappend | 12 - .../linux/linux-xlnx_2022.2.bbappend | 12 - .../arm-trusted-firmware_2022.1.bb | 8 - .../arm-trusted-firmware_2022.2.bb | 8 - .../recipes-bsp/bootgen/bootgen_1.0.bb | 31 -- .../recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb | 78 --- meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb | 23 - .../recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb | 19 - .../recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb | 19 - .../qemu/qemu-devicetrees_2022.1.bb | 8 - .../qemu/qemu-devicetrees_2022.2.bb | 6 - .../recipes-devtools/qemu/qemu-xilinx-2022.1.inc | 4 - .../recipes-devtools/qemu/qemu-xilinx-2022.2.inc | 4 - .../qemu/qemu-xilinx-native_2022.1.bb | 9 - .../qemu/qemu-xilinx-native_2022.2.bb | 9 - .../qemu/qemu-xilinx-system-native_2022.1.bb | 26 - .../qemu/qemu-xilinx-system-native_2022.2.bb | 26 - .../recipes-devtools/qemu/qemu-xilinx_2022.1.bb | 19 - .../recipes-devtools/qemu/qemu-xilinx_2022.2.bb | 19 - .../recipes-kernel/linux/linux-xlnx_2022.1.bb | 9 - .../recipes-kernel/linux/linux-xlnx_2022.2.bb | 9 - .../recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb | 11 - .../recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb | 11 - .../recipes-bsp/embeddedsw/plm-firmware_2022.1.bb | 16 - .../recipes-bsp/embeddedsw/plm-firmware_2022.2.bb | 16 - .../recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb | 16 - .../recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb | 16 - .../recipes-bsp/embeddedsw/psm-firmware_2022.1.bb | 16 - .../recipes-bsp/embeddedsw/psm-firmware_2022.2.bb | 16 - 38 files changed, 2522 deletions(-) delete mode 100644 meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2022.1.bb delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0004-minized-wifi-bluetooth.cfg delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend delete mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend delete mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb delete mode 100644 meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb delete mode 100644 meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb delete mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2022.1.bb b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2022.1.bb deleted file mode 100644 index e512777c..00000000 --- a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2022.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "KC705 Pre-built Bitstream" -DESCRIPTION = "A Pre-built bitstream for the KC705, which is capable of booting a Linux system." -HOMEPAGE = "http://www.xilinx.com" -SECTION = "bsp" - -# The BSP package does not include any license information. -LICENSE = "Proprietary" -LICENSE_FLAGS = "xilinx" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" - -COMPATIBLE_MACHINE = "kc705-microblazeel" - -inherit deploy -inherit xilinx-fetch-restricted - -BSP_NAME = "xilinx-kc705" -BSP_FILE = "${BSP_NAME}-v${PV}-final.bsp" -SRC_URI = "https://www.xilinx.com/member/forms/download/xef.html?filename=${BSP_FILE};downloadfilename=${BSP_FILE}" -SRC_URI[md5sum] = "5c0365a8a26cc27b4419aa1d7dd82351" -SRC_URI[sha256sum] = "a909a91a37a9925ee2f972ccb10f986a26ff9785c1a71a483545a192783bf773" - -PROVIDES = "virtual/bitstream" - -FILES:${PN} += "/boot/download.bit" - -INHIBIT_DEFAULT_DEPS = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# deps needed to extract content from the .bsp file -DEPENDS += "tar-native gzip-native" - -do_compile() { - # Extract the bitstream into workdir - tar -xf ${WORKDIR}/${BSP_FILE} ${BSP_NAME}-axi-full-${PV}/pre-built/linux/images/download.bit -C ${S} - # move the bit file to ${S}/ as it is in a subdir in the tar file - for i in $(find -type f -name download.bit); do mv $i ${S}; done -} - -do_install() { - install -D ${S}/download.bit ${D}/boot/download.bit -} - -do_deploy () { - install -D ${S}/download.bit ${DEPLOYDIR}/download.bit -} - -addtask deploy before do_build after do_install - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch deleted file mode 100644 index 660bc218..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 21cc8144efdaa3cd8dbd7279f87b14fa3432fae4 Mon Sep 17 00:00:00 2001 -From: Jason Wu -Date: Sun, 10 Apr 2016 13:14:13 +1000 -Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards - -Add the dglnt_encoder driver that enables DRM support for the VGA and -HDMI output ports found on many Digilent boards. - -Upstream-Status: Pending - -Signed-off-by: Sam Bobrowicz -Signed-off-by: Jason Wu ---- - .../bindings/drm/xilinx/dglnt_encoder.txt | 23 +++ - drivers/gpu/drm/xilinx/Kconfig | 6 + - drivers/gpu/drm/xilinx/Makefile | 1 + - drivers/gpu/drm/xilinx/dglnt_encoder.c | 217 +++++++++++++++++++++ - 4 files changed, 247 insertions(+) - create mode 100644 Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt - create mode 100644 drivers/gpu/drm/xilinx/dglnt_encoder.c - -diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt -new file mode 100644 -index 0000000..242b24e ---- /dev/null -+++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt -@@ -0,0 +1,23 @@ -+Device-Tree bindings for Digilent DRM Encoder Slave -+ -+This driver provides support for VGA and HDMI outputs on Digilent FPGA boards. -+The VGA or HDMI port must be connected to a Xilinx display pipeline via an -+axi2vid IP core. -+ -+Required properties: -+ - compatible: Should be "digilent,drm-encoder". -+ -+Optional properties: -+ - dglnt,edid-i2c: The I2C device connected to the DDC bus on the video -+ connector. This is used to obtain the supported resolutions -+ of an attached monitor. If not defined, then a default -+ set of resolutions is used and the display will initialize -+ to 720p. Note most VGA connectors on Digilent boards do -+ not have the DDC bus routed out. -+ -+Example: -+ -+ encoder_0: digilent_encoder { -+ compatible = "digilent,drm-encoder"; -+ dglnt,edid-i2c = <&i2c1>; -+ }; -diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig -index 57e18a9..d9ecff2 100644 ---- a/drivers/gpu/drm/xilinx/Kconfig -+++ b/drivers/gpu/drm/xilinx/Kconfig -@@ -33,6 +33,12 @@ config DRM_XILINX_DP_SUB - help - DRM driver for Xilinx Display Port Subsystem. - -+config DRM_DIGILENT_ENCODER -+ tristate "Digilent VGA/HDMI DRM Encoder Driver" -+ depends on DRM_XILINX -+ help -+ DRM slave encoder for Video-out on Digilent boards. -+ - config DRM_XILINX_DP_SUB_DEBUG_FS - bool "Xilinx DRM DPSUB debugfs" - depends on DEBUG_FS && DRM_XILINX_DP_SUB -diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile -index 19bc154..c2717e40 100644 ---- a/drivers/gpu/drm/xilinx/Makefile -+++ b/drivers/gpu/drm/xilinx/Makefile -@@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o xilinx_drm_drv.o \ - xilinx_drm_plane.o - xilinx_drm-y += xilinx_cresample.o xilinx_osd.o xilinx_rgb2yuv.o xilinx_vtc.o - -+obj-$(CONFIG_DRM_DIGILENT_ENCODER) += dglnt_encoder.o - obj-$(CONFIG_DRM_XILINX) += xilinx_drm.o - obj-$(CONFIG_DRM_XILINX_DP) += xilinx_drm_dp.o - obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o -diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c b/drivers/gpu/drm/xilinx/dglnt_encoder.c -new file mode 100644 -index 0000000..cb9fc7d ---- /dev/null -+++ b/drivers/gpu/drm/xilinx/dglnt_encoder.c -@@ -0,0 +1,217 @@ -+/* -+ * dglnt_encoder.c - DRM slave encoder for Video-out on Digilent boards -+ * -+ * Copyright (C) 2015 Digilent -+ * Author: Sam Bobrowicz -+ * -+ * Based on udl_encoder.c and udl_connector.c, Copyright (C) 2012 Red Hat. -+ * Also based on xilinx_drm_dp.c, Copyright (C) 2014 Xilinx, Inc. -+ * -+ * This software is licensed under the terms of the GNU General Public -+ * License version 2, as published by the Free Software Foundation, and -+ * may be copied, distributed, and modified under those terms. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define DGLNT_ENC_MAX_FREQ 150000 -+#define DGLNT_ENC_MAX_H 1920 -+#define DGLNT_ENC_MAX_V 1080 -+#define DGLNT_ENC_PREF_H 1280 -+#define DGLNT_ENC_PREF_V 720 -+ -+struct dglnt_encoder { -+ struct drm_encoder *encoder; -+ struct i2c_adapter *i2c_bus; -+ bool i2c_present; -+}; -+ -+static inline struct dglnt_encoder *to_dglnt_encoder( -+ struct drm_encoder *encoder) -+{ -+ return to_encoder_slave(encoder)->slave_priv; -+} -+ -+static bool dglnt_mode_fixup(struct drm_encoder *encoder, -+ const struct drm_display_mode *mode, -+ struct drm_display_mode *adjusted_mode) -+{ -+ return true; -+} -+ -+static void dglnt_encoder_mode_set(struct drm_encoder *encoder, -+ struct drm_display_mode *mode, -+ struct drm_display_mode *adjusted_mode) -+{ -+} -+ -+static void -+dglnt_encoder_dpms(struct drm_encoder *encoder, int mode) -+{ -+} -+ -+static void dglnt_encoder_save(struct drm_encoder *encoder) -+{ -+} -+ -+static void dglnt_encoder_restore(struct drm_encoder *encoder) -+{ -+} -+ -+static int dglnt_encoder_mode_valid(struct drm_encoder *encoder, -+ struct drm_display_mode *mode) -+{ -+ if (mode && -+ !(mode->flags & ((DRM_MODE_FLAG_INTERLACE | -+ DRM_MODE_FLAG_DBLCLK) | DRM_MODE_FLAG_3D_MASK)) && -+ (mode->clock <= DGLNT_ENC_MAX_FREQ) && -+ (mode->hdisplay <= DGLNT_ENC_MAX_H) && -+ (mode->vdisplay <= DGLNT_ENC_MAX_V)) -+ return MODE_OK; -+ return MODE_BAD; -+} -+ -+static int dglnt_encoder_get_modes(struct drm_encoder *encoder, -+ struct drm_connector *connector) -+{ -+ struct dglnt_encoder *dglnt = to_dglnt_encoder(encoder); -+ struct edid *edid; -+ int num_modes = 0; -+ -+ if (dglnt->i2c_present) { -+ edid = drm_get_edid(connector, dglnt->i2c_bus); -+ drm_connector_update_edid_property(connector, edid); -+ if (edid) { -+ num_modes = drm_add_edid_modes(connector, edid); -+ kfree(edid); -+ } -+ } else { -+ num_modes = drm_add_modes_noedid(connector, DGLNT_ENC_MAX_H, -+ DGLNT_ENC_MAX_V); -+ drm_set_preferred_mode(connector, DGLNT_ENC_PREF_H, -+ DGLNT_ENC_PREF_V); -+ } -+ return num_modes; -+} -+ -+static enum drm_connector_status dglnt_encoder_detect( -+ struct drm_encoder *encoder, -+ struct drm_connector *connector) -+{ -+ struct dglnt_encoder *dglnt = to_dglnt_encoder(encoder); -+ -+ if (dglnt->i2c_present) { -+ if (drm_probe_ddc(dglnt->i2c_bus)) -+ return connector_status_connected; -+ return connector_status_disconnected; -+ } else -+ return connector_status_unknown; -+} -+ -+static struct drm_encoder_slave_funcs dglnt_encoder_slave_funcs = { -+ .dpms = dglnt_encoder_dpms, -+ .save = dglnt_encoder_save, -+ .restore = dglnt_encoder_restore, -+ .mode_fixup = dglnt_mode_fixup, -+ .mode_valid = dglnt_encoder_mode_valid, -+ .mode_set = dglnt_encoder_mode_set, -+ .detect = dglnt_encoder_detect, -+ .get_modes = dglnt_encoder_get_modes, -+}; -+ -+static int dglnt_encoder_encoder_init(struct platform_device *pdev, -+ struct drm_device *dev, -+ struct drm_encoder_slave *encoder) -+{ -+ struct dglnt_encoder *dglnt = platform_get_drvdata(pdev); -+ struct device_node *sub_node; -+ -+ encoder->slave_priv = dglnt; -+ encoder->slave_funcs = &dglnt_encoder_slave_funcs; -+ -+ dglnt->encoder = &encoder->base; -+ -+ /* get i2c adapter for edid */ -+ dglnt->i2c_present = false; -+ sub_node = of_parse_phandle(pdev->dev.of_node, "dglnt,edid-i2c", 0); -+ if (sub_node) { -+ dglnt->i2c_bus = of_find_i2c_adapter_by_node(sub_node); -+ if (!dglnt->i2c_bus) -+ DRM_INFO("failed to get the edid i2c adapter, using default modes\n"); -+ else -+ dglnt->i2c_present = true; -+ of_node_put(sub_node); -+ } -+ -+ return 0; -+} -+ -+static int dglnt_encoder_probe(struct platform_device *pdev) -+{ -+ struct dglnt_encoder *dglnt; -+ -+ dglnt = devm_kzalloc(&pdev->dev, sizeof(*dglnt), GFP_KERNEL); -+ if (!dglnt) -+ return -ENOMEM; -+ -+ platform_set_drvdata(pdev, dglnt); -+ -+ return 0; -+} -+ -+static int dglnt_encoder_remove(struct platform_device *pdev) -+{ -+ return 0; -+} -+ -+static const struct of_device_id dglnt_encoder_of_match[] = { -+ { .compatible = "digilent,drm-encoder", }, -+ { /* end of table */ }, -+}; -+MODULE_DEVICE_TABLE(of, dglnt_encoder_of_match); -+ -+static struct drm_platform_encoder_driver dglnt_encoder_driver = { -+ .platform_driver = { -+ .probe = dglnt_encoder_probe, -+ .remove = dglnt_encoder_remove, -+ .driver = { -+ .owner = THIS_MODULE, -+ .name = "dglnt-drm-enc", -+ .of_match_table = dglnt_encoder_of_match, -+ }, -+ }, -+ -+ .encoder_init = dglnt_encoder_encoder_init, -+}; -+ -+static int __init dglnt_encoder_init(void) -+{ -+ return platform_driver_register(&dglnt_encoder_driver.platform_driver); -+} -+ -+static void __exit dglnt_encoder_exit(void) -+{ -+ platform_driver_unregister(&dglnt_encoder_driver.platform_driver); -+} -+ -+module_init(dglnt_encoder_init); -+module_exit(dglnt_encoder_exit); -+ -+MODULE_AUTHOR("Digilent, Inc."); -+MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards"); -+MODULE_LICENSE("GPL v2"); --- -2.7.4 - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch deleted file mode 100644 index 9b6229db..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch +++ /dev/null @@ -1,607 +0,0 @@ -From 217e3b6f4393926b8dcad841381527ef3fc808c2 Mon Sep 17 00:00:00 2001 -From: Jason Wu -Date: Sun, 10 Apr 2016 13:16:06 +1000 -Subject: [PATCH 2/3] clk: Add driver for axi_dynclk IP Core - -Add support for the axi_dynclk IP Core available from Digilent. This IP -core dynamically configures the clock resources inside a Xilinx FPGA to -generate a clock with a software programmable frequency. - -Upstream-Status: Pending - -Signed-off-by: Sam Bobrowicz -Signed-off-by: Jason Wu ---- - drivers/clk/Kconfig | 8 + - drivers/clk/Makefile | 1 + - drivers/clk/clk-dglnt-dynclk.c | 547 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 556 insertions(+) - create mode 100644 drivers/clk/clk-dglnt-dynclk.c - -diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index dccb111100..7fe65a702b 100644 ---- a/drivers/clk/Kconfig -+++ b/drivers/clk/Kconfig -@@ -148,6 +148,14 @@ config CLK_QORIQ - This adds the clock driver support for Freescale QorIQ platforms - using common clock framework. - -+config COMMON_CLK_DGLNT_DYNCLK -+ tristate "Digilent axi_dynclk Driver" -+ depends on ARCH_ZYNQ || MICROBLAZE -+ help -+ ---help--- -+ Support for the Digilent AXI Dynamic Clock core for Xilinx -+ FPGAs. -+ - config COMMON_CLK_XGENE - bool "Clock driver for APM XGene SoC" - default y -diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index 0760449dde..45ce97d053 100644 ---- a/drivers/clk/Makefile -+++ b/drivers/clk/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o - obj-$(CONFIG_COMMON_CLK_CDCE925) += clk-cdce925.o - obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o - obj-$(CONFIG_COMMON_CLK_CS2000_CP) += clk-cs2000-cp.o -+obj-$(CONFIG_COMMON_CLK_DGLNT_DYNCLK) += clk-dglnt-dynclk.o - obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o - obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o - obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o -diff --git a/drivers/clk/clk-dglnt-dynclk.c b/drivers/clk/clk-dglnt-dynclk.c -new file mode 100644 -index 0000000000..496ad5fc90 ---- /dev/null -+++ b/drivers/clk/clk-dglnt-dynclk.c -@@ -0,0 +1,547 @@ -+/* -+ * clk-dglnt-dynclk.c - Digilent AXI Dynamic Clock (axi_dynclk) Driver -+ * -+ * Copyright (C) 2015 Digilent -+ * Author: Sam Bobrowicz -+ * -+ * Reused code from clk-axi-clkgen.c, Copyright (C) 2012-2013 Analog Devices Inc. -+ * -+ * This software is licensed under the terms of the GNU General Public -+ * License version 2, as published by the Free Software Foundation, and -+ * may be copied, distributed, and modified under those terms. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define CLK_BIT_WEDGE 13 -+#define CLK_BIT_NOCOUNT 12 -+ -+/* This value is used to signal an error */ -+#define ERR_CLKCOUNTCALC 0xFFFFFFFF -+#define ERR_CLKDIVIDER (1 << CLK_BIT_WEDGE | 1 << CLK_BIT_NOCOUNT) -+ -+#define DYNCLK_DIV_1_REGMASK 0x1041 -+/* 25 MHz (125 KHz / 5) */ -+#define DYNCLK_DEFAULT_FREQ 125000 -+ -+#define MMCM_FREQ_VCOMIN 600000 -+#define MMCM_FREQ_VCOMAX 1200000 -+#define MMCM_FREQ_PFDMIN 10000 -+#define MMCM_FREQ_PFDMAX 450000 -+#define MMCM_FREQ_OUTMIN 4000 -+#define MMCM_FREQ_OUTMAX 800000 -+#define MMCM_DIV_MAX 106 -+#define MMCM_FB_MIN 2 -+#define MMCM_FB_MAX 64 -+#define MMCM_CLKDIV_MAX 128 -+#define MMCM_CLKDIV_MIN 1 -+ -+#define OFST_DISPLAY_CTRL 0x0 -+#define OFST_DISPLAY_STATUS 0x4 -+#define OFST_DISPLAY_CLK_L 0x8 -+#define OFST_DISPLAY_FB_L 0x0C -+#define OFST_DISPLAY_FB_H_CLK_H 0x10 -+#define OFST_DISPLAY_DIV 0x14 -+#define OFST_DISPLAY_LOCK_L 0x18 -+#define OFST_DISPLAY_FLTR_LOCK_H 0x1C -+ -+static const u64 lock_lookup[64] = { -+ 0b0011000110111110100011111010010000000001, -+ 0b0011000110111110100011111010010000000001, -+ 0b0100001000111110100011111010010000000001, -+ 0b0101101011111110100011111010010000000001, -+ 0b0111001110111110100011111010010000000001, -+ 0b1000110001111110100011111010010000000001, -+ 0b1001110011111110100011111010010000000001, -+ 0b1011010110111110100011111010010000000001, -+ 0b1100111001111110100011111010010000000001, -+ 0b1110011100111110100011111010010000000001, -+ 0b1111111111111000010011111010010000000001, -+ 0b1111111111110011100111111010010000000001, -+ 0b1111111111101110111011111010010000000001, -+ 0b1111111111101011110011111010010000000001, -+ 0b1111111111101000101011111010010000000001, -+ 0b1111111111100111000111111010010000000001, -+ 0b1111111111100011111111111010010000000001, -+ 0b1111111111100010011011111010010000000001, -+ 0b1111111111100000110111111010010000000001, -+ 0b1111111111011111010011111010010000000001, -+ 0b1111111111011101101111111010010000000001, -+ 0b1111111111011100001011111010010000000001, -+ 0b1111111111011010100111111010010000000001, -+ 0b1111111111011001000011111010010000000001, -+ 0b1111111111011001000011111010010000000001, -+ 0b1111111111010111011111111010010000000001, -+ 0b1111111111010101111011111010010000000001, -+ 0b1111111111010101111011111010010000000001, -+ 0b1111111111010100010111111010010000000001, -+ 0b1111111111010100010111111010010000000001, -+ 0b1111111111010010110011111010010000000001, -+ 0b1111111111010010110011111010010000000001, -+ 0b1111111111010010110011111010010000000001, -+ 0b1111111111010001001111111010010000000001, -+ 0b1111111111010001001111111010010000000001, -+ 0b1111111111010001001111111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001 -+}; -+ -+static const u32 filter_lookup_low[64] = { -+ 0b0001011111, -+ 0b0001010111, -+ 0b0001111011, -+ 0b0001011011, -+ 0b0001101011, -+ 0b0001110011, -+ 0b0001110011, -+ 0b0001110011, -+ 0b0001110011, -+ 0b0001001011, -+ 0b0001001011, -+ 0b0001001011, -+ 0b0010110011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011 -+}; -+ -+struct dglnt_dynclk_reg; -+struct dglnt_dynclk_mode; -+struct dglnt_dynclk; -+ -+struct dglnt_dynclk_reg { -+ u32 clk0L; -+ u32 clkFBL; -+ u32 clkFBH_clk0H; -+ u32 divclk; -+ u32 lockL; -+ u32 fltr_lockH; -+}; -+ -+struct dglnt_dynclk_mode { -+ u32 freq; -+ u32 fbmult; -+ u32 clkdiv; -+ u32 maindiv; -+}; -+ -+struct dglnt_dynclk { -+ void __iomem *base; -+ struct clk_hw clk_hw; -+ unsigned long freq; -+}; -+ -+u32 dglnt_dynclk_divider(u32 divide) -+{ -+ u32 output = 0; -+ u32 highTime = 0; -+ u32 lowTime = 0; -+ -+ if ((divide < 1) || (divide > 128)) -+ return ERR_CLKDIVIDER; -+ -+ if (divide == 1) -+ return DYNCLK_DIV_1_REGMASK; -+ -+ highTime = divide / 2; -+ /* if divide is odd */ -+ if (divide & 0x1) { -+ lowTime = highTime + 1; -+ output = 1 << CLK_BIT_WEDGE; -+ } else { -+ lowTime = highTime; -+ } -+ -+ output |= 0x03F & lowTime; -+ output |= 0xFC0 & (highTime << 6); -+ return output; -+} -+ -+u32 dglnt_dynclk_count_calc(u32 divide) -+{ -+ u32 output = 0; -+ u32 divCalc = 0; -+ -+ divCalc = dglnt_dynclk_divider(divide); -+ if (divCalc == ERR_CLKDIVIDER) -+ output = ERR_CLKCOUNTCALC; -+ else -+ output = (0xFFF & divCalc) | ((divCalc << 10) & 0x00C00000); -+ return output; -+} -+ -+ -+int dglnt_dynclk_find_reg(struct dglnt_dynclk_reg *regValues, -+ struct dglnt_dynclk_mode *clkParams) -+{ -+ if ((clkParams->fbmult < 2) || clkParams->fbmult > 64) -+ return -EINVAL; -+ -+ regValues->clk0L = dglnt_dynclk_count_calc(clkParams->clkdiv); -+ if (regValues->clk0L == ERR_CLKCOUNTCALC) -+ return -EINVAL; -+ -+ regValues->clkFBL = dglnt_dynclk_count_calc(clkParams->fbmult); -+ if (regValues->clkFBL == ERR_CLKCOUNTCALC) -+ return -EINVAL; -+ -+ regValues->clkFBH_clk0H = 0; -+ -+ regValues->divclk = dglnt_dynclk_divider(clkParams->maindiv); -+ if (regValues->divclk == ERR_CLKDIVIDER) -+ return -EINVAL; -+ -+ regValues->lockL = (u32)(lock_lookup[clkParams->fbmult - 1] & -+ 0xFFFFFFFF); -+ -+ regValues->fltr_lockH = (u32)((lock_lookup[clkParams->fbmult - 1] >> -+ 32) & 0x000000FF); -+ regValues->fltr_lockH |= ((filter_lookup_low[clkParams->fbmult - 1] << -+ 16) & 0x03FF0000); -+ -+ return 0; -+} -+ -+void dglnt_dynclk_write_reg(struct dglnt_dynclk_reg *regValues, -+ void __iomem *baseaddr) -+{ -+ writel(regValues->clk0L, baseaddr + OFST_DISPLAY_CLK_L); -+ writel(regValues->clkFBL, baseaddr + OFST_DISPLAY_FB_L); -+ writel(regValues->clkFBH_clk0H, baseaddr + OFST_DISPLAY_FB_H_CLK_H); -+ writel(regValues->divclk, baseaddr + OFST_DISPLAY_DIV); -+ writel(regValues->lockL, baseaddr + OFST_DISPLAY_LOCK_L); -+ writel(regValues->fltr_lockH, baseaddr + OFST_DISPLAY_FLTR_LOCK_H); -+} -+ -+u32 dglnt_dynclk_find_mode(u32 freq, u32 parentFreq, -+ struct dglnt_dynclk_mode *bestPick) -+{ -+ u32 bestError = MMCM_FREQ_OUTMAX; -+ u32 curError; -+ u32 curClkMult; -+ u32 curFreq; -+ u32 divVal; -+ u32 curFb, curClkDiv; -+ u32 minFb = 0; -+ u32 maxFb = 0; -+ u32 curDiv = 1; -+ u32 maxDiv; -+ bool freq_found = false; -+ -+ bestPick->freq = 0; -+ if (parentFreq == 0) -+ return 0; -+ -+ /* minimum frequency is actually dictated by VCOmin */ -+ if (freq < MMCM_FREQ_OUTMIN) -+ freq = MMCM_FREQ_OUTMIN; -+ if (freq > MMCM_FREQ_OUTMAX) -+ freq = MMCM_FREQ_OUTMAX; -+ -+ if (parentFreq > MMCM_FREQ_PFDMAX) -+ curDiv = 2; -+ maxDiv = parentFreq / MMCM_FREQ_PFDMIN; -+ if (maxDiv > MMCM_DIV_MAX) -+ maxDiv = MMCM_DIV_MAX; -+ -+ while (curDiv <= maxDiv && !freq_found) { -+ minFb = curDiv * DIV_ROUND_UP(MMCM_FREQ_VCOMIN, parentFreq); -+ maxFb = curDiv * (MMCM_FREQ_VCOMAX / parentFreq); -+ if (maxFb > MMCM_FB_MAX) -+ maxFb = MMCM_FB_MAX; -+ if (minFb < MMCM_FB_MIN) -+ minFb = MMCM_FB_MIN; -+ -+ divVal = curDiv * freq; -+ /* -+ * This multiplier is used to find the best clkDiv value for -+ * each FB value -+ */ -+ curClkMult = ((parentFreq * 1000) + (divVal / 2)) / divVal; -+ -+ curFb = minFb; -+ while (curFb <= maxFb && !freq_found) { -+ curClkDiv = ((curClkMult * curFb) + 500) / 1000; -+ if (curClkDiv > MMCM_CLKDIV_MAX) -+ curClkDiv = MMCM_CLKDIV_MAX; -+ if (curClkDiv < MMCM_CLKDIV_MIN) -+ curClkDiv = MMCM_CLKDIV_MIN; -+ curFreq = (((parentFreq * curFb) / curDiv) / curClkDiv); -+ if (curFreq >= freq) -+ curError = curFreq - freq; -+ else -+ curError = freq - curFreq; -+ if (curError < bestError) { -+ bestError = curError; -+ bestPick->clkdiv = curClkDiv; -+ bestPick->fbmult = curFb; -+ bestPick->maindiv = curDiv; -+ bestPick->freq = curFreq; -+ } -+ if (!curError) -+ freq_found = true; -+ curFb++; -+ } -+ curDiv++; -+ } -+ return bestPick->freq; -+} -+ -+static struct dglnt_dynclk *clk_hw_to_dglnt_dynclk(struct clk_hw *clk_hw) -+{ -+ return container_of(clk_hw, struct dglnt_dynclk, clk_hw); -+} -+ -+ -+static int dglnt_dynclk_enable(struct clk_hw *clk_hw) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ unsigned int clock_state; -+ -+ if (dglnt_dynclk->freq) { -+ writel(1, dglnt_dynclk->base + OFST_DISPLAY_CTRL); -+ do { -+ clock_state = readl(dglnt_dynclk->base + -+ OFST_DISPLAY_STATUS); -+ } while (!clock_state); -+ } -+ return 0; -+} -+ -+static void dglnt_dynclk_disable(struct clk_hw *clk_hw) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ -+ writel(0, dglnt_dynclk->base + OFST_DISPLAY_CTRL); -+} -+ -+static int dglnt_dynclk_set_rate(struct clk_hw *clk_hw, -+ unsigned long rate, unsigned long parent_rate) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ struct dglnt_dynclk_reg clkReg; -+ struct dglnt_dynclk_mode clkMode; -+ -+ if (parent_rate == 0 || rate == 0) -+ return -EINVAL; -+ if (rate == dglnt_dynclk->freq) -+ return 0; -+ -+ /* -+ * Convert from Hz to KHz, then multiply by five to account for -+ * BUFR division -+ */ -+ rate = (rate + 100) / 200; -+ /* convert from Hz to KHz */ -+ parent_rate = (parent_rate + 500) / 1000; -+ if (!dglnt_dynclk_find_mode(rate, parent_rate, &clkMode)) -+ return -EINVAL; -+ -+ /* -+ * Write to the PLL dynamic configuration registers to configure it -+ * with the calculated parameters. -+ */ -+ dglnt_dynclk_find_reg(&clkReg, &clkMode); -+ dglnt_dynclk_write_reg(&clkReg, dglnt_dynclk->base); -+ dglnt_dynclk->freq = clkMode.freq * 200; -+ dglnt_dynclk_disable(clk_hw); -+ dglnt_dynclk_enable(clk_hw); -+ -+ return 0; -+} -+ -+static long dglnt_dynclk_round_rate(struct clk_hw *hw, unsigned long rate, -+ unsigned long *parent_rate) -+{ -+ struct dglnt_dynclk_mode clkMode; -+ -+ dglnt_dynclk_find_mode(((rate + 100) / 200), -+ ((*parent_rate) + 500) / 1000, &clkMode); -+ -+ return (clkMode.freq * 200); -+} -+ -+static unsigned long dglnt_dynclk_recalc_rate(struct clk_hw *clk_hw, -+ unsigned long parent_rate) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ -+ return dglnt_dynclk->freq; -+} -+ -+ -+static const struct clk_ops dglnt_dynclk_ops = { -+ .recalc_rate = dglnt_dynclk_recalc_rate, -+ .round_rate = dglnt_dynclk_round_rate, -+ .set_rate = dglnt_dynclk_set_rate, -+ .enable = dglnt_dynclk_enable, -+ .disable = dglnt_dynclk_disable, -+}; -+ -+static const struct of_device_id dglnt_dynclk_ids[] = { -+ { .compatible = "digilent,axi-dynclk", }, -+ { }, -+}; -+MODULE_DEVICE_TABLE(of, dglnt_dynclk_ids); -+ -+static int dglnt_dynclk_probe(struct platform_device *pdev) -+{ -+ const struct of_device_id *id; -+ struct dglnt_dynclk *dglnt_dynclk; -+ struct clk_init_data init; -+ const char *parent_name; -+ const char *clk_name; -+ struct resource *mem; -+ struct clk *clk; -+ -+ if (!pdev->dev.of_node) -+ return -ENODEV; -+ -+ id = of_match_node(dglnt_dynclk_ids, pdev->dev.of_node); -+ if (!id) -+ return -ENODEV; -+ -+ dglnt_dynclk = devm_kzalloc(&pdev->dev, sizeof(*dglnt_dynclk), -+ GFP_KERNEL); -+ if (!dglnt_dynclk) -+ return -ENOMEM; -+ -+ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ dglnt_dynclk->base = devm_ioremap_resource(&pdev->dev, mem); -+ if (IS_ERR(dglnt_dynclk->base)) -+ return PTR_ERR(dglnt_dynclk->base); -+ -+ parent_name = of_clk_get_parent_name(pdev->dev.of_node, 0); -+ if (!parent_name) -+ return -EINVAL; -+ -+ clk_name = pdev->dev.of_node->name; -+ of_property_read_string(pdev->dev.of_node, "clock-output-names", -+ &clk_name); -+ -+ init.name = clk_name; -+ init.ops = &dglnt_dynclk_ops; -+ init.flags = 0; -+ init.parent_names = &parent_name; -+ init.num_parents = 1; -+ -+ dglnt_dynclk->freq = 0; -+ dglnt_dynclk_disable(&dglnt_dynclk->clk_hw); -+ -+ dglnt_dynclk->clk_hw.init = &init; -+ clk = devm_clk_register(&pdev->dev, &dglnt_dynclk->clk_hw); -+ if (IS_ERR(clk)) -+ return PTR_ERR(clk); -+ -+ return of_clk_add_provider(pdev->dev.of_node, of_clk_src_simple_get, -+ clk); -+} -+ -+static int dglnt_dynclk_remove(struct platform_device *pdev) -+{ -+ of_clk_del_provider(pdev->dev.of_node); -+ -+ return 0; -+} -+ -+static struct platform_driver dglnt_dynclk_driver = { -+ .driver = { -+ .name = "dglnt-dynclk", -+ .owner = THIS_MODULE, -+ .of_match_table = dglnt_dynclk_ids, -+ }, -+ .probe = dglnt_dynclk_probe, -+ .remove = dglnt_dynclk_remove, -+}; -+module_platform_driver(dglnt_dynclk_driver); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_AUTHOR("Sam Bobrowicz "); -+MODULE_DESCRIPTION("CCF Driver for Digilent axi_dynclk IP Core"); --- -2.14.2 - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch deleted file mode 100644 index a98d84c5..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1a18e2b514ae9e75145597ac509a87f656c976ba Mon Sep 17 00:00:00 2001 -From: Nathan Rossi -Date: Mon, 2 May 2016 23:46:42 +1000 -Subject: [PATCH 3/3] drm: xilinx: Fix DPMS transition to on - -Fix the issues where the VTC is reset (losing its timing config). - -Also fix the issue where the plane destroys its DMA descriptors and -marks the DMA channels as inactive but never recreates the descriptors -and never updates the active state when turning DPMS back on. - -Signed-off-by: Nathan Rossi -Upstream-Status: Pending [This is a workaround] ---- - drivers/gpu/drm/xilinx/xilinx_drm_crtc.c | 1 - - drivers/gpu/drm/xilinx/xilinx_drm_plane.c | 3 ++- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c -index 631d35b921..93dbd4b58a 100644 ---- a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c -+++ b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c -@@ -88,7 +88,6 @@ static void xilinx_drm_crtc_dpms(struct drm_crtc *base_crtc, int dpms) - default: - if (crtc->vtc) { - xilinx_vtc_disable(crtc->vtc); -- xilinx_vtc_reset(crtc->vtc); - } - if (crtc->cresample) { - xilinx_cresample_disable(crtc->cresample); -diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c -index 6a248b72d4..d2518a4bdf 100644 ---- a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c -+++ b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c -@@ -140,7 +140,7 @@ void xilinx_drm_plane_commit(struct drm_plane *base_plane) - for (i = 0; i < MAX_NUM_SUB_PLANES; i++) { - struct xilinx_drm_plane_dma *dma = &plane->dma[i]; - -- if (dma->chan && dma->is_active) { -+ if (dma->chan) { - flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT; - desc = dmaengine_prep_interleaved_dma(dma->chan, - &dma->xt, -@@ -153,6 +153,7 @@ void xilinx_drm_plane_commit(struct drm_plane *base_plane) - dmaengine_submit(desc); - - dma_async_issue_pending(dma->chan); -+ dma->is_active = true; - } - } - } --- -2.14.2 - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg deleted file mode 100644 index f71e53ab..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# -# Bluetooth config -# -CONFIG_BT=y -CONFIG_BT_BREDR=y -CONFIG_BT_HS=y -CONFIG_BT_LE=y -CONFIG_BT_BCM=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCM=y -CONFIG_BT_HIDP=y -CONFIG_CFG80211=y -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_BRCMUTIL=y -CONFIG_BRCMFMAC=y -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_SDIO=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_SHA256=y - -# -# Regulator config -# -CONFIG_REGMAP_IRQ=y -CONFIG_I2C_XILINX=y -CONFIG_MFD_DA9062=y -CONFIG_REGULATOR_DA9062=y - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch deleted file mode 100644 index 660bc218..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 21cc8144efdaa3cd8dbd7279f87b14fa3432fae4 Mon Sep 17 00:00:00 2001 -From: Jason Wu -Date: Sun, 10 Apr 2016 13:14:13 +1000 -Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards - -Add the dglnt_encoder driver that enables DRM support for the VGA and -HDMI output ports found on many Digilent boards. - -Upstream-Status: Pending - -Signed-off-by: Sam Bobrowicz -Signed-off-by: Jason Wu ---- - .../bindings/drm/xilinx/dglnt_encoder.txt | 23 +++ - drivers/gpu/drm/xilinx/Kconfig | 6 + - drivers/gpu/drm/xilinx/Makefile | 1 + - drivers/gpu/drm/xilinx/dglnt_encoder.c | 217 +++++++++++++++++++++ - 4 files changed, 247 insertions(+) - create mode 100644 Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt - create mode 100644 drivers/gpu/drm/xilinx/dglnt_encoder.c - -diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt -new file mode 100644 -index 0000000..242b24e ---- /dev/null -+++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt -@@ -0,0 +1,23 @@ -+Device-Tree bindings for Digilent DRM Encoder Slave -+ -+This driver provides support for VGA and HDMI outputs on Digilent FPGA boards. -+The VGA or HDMI port must be connected to a Xilinx display pipeline via an -+axi2vid IP core. -+ -+Required properties: -+ - compatible: Should be "digilent,drm-encoder". -+ -+Optional properties: -+ - dglnt,edid-i2c: The I2C device connected to the DDC bus on the video -+ connector. This is used to obtain the supported resolutions -+ of an attached monitor. If not defined, then a default -+ set of resolutions is used and the display will initialize -+ to 720p. Note most VGA connectors on Digilent boards do -+ not have the DDC bus routed out. -+ -+Example: -+ -+ encoder_0: digilent_encoder { -+ compatible = "digilent,drm-encoder"; -+ dglnt,edid-i2c = <&i2c1>; -+ }; -diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig -index 57e18a9..d9ecff2 100644 ---- a/drivers/gpu/drm/xilinx/Kconfig -+++ b/drivers/gpu/drm/xilinx/Kconfig -@@ -33,6 +33,12 @@ config DRM_XILINX_DP_SUB - help - DRM driver for Xilinx Display Port Subsystem. - -+config DRM_DIGILENT_ENCODER -+ tristate "Digilent VGA/HDMI DRM Encoder Driver" -+ depends on DRM_XILINX -+ help -+ DRM slave encoder for Video-out on Digilent boards. -+ - config DRM_XILINX_DP_SUB_DEBUG_FS - bool "Xilinx DRM DPSUB debugfs" - depends on DEBUG_FS && DRM_XILINX_DP_SUB -diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile -index 19bc154..c2717e40 100644 ---- a/drivers/gpu/drm/xilinx/Makefile -+++ b/drivers/gpu/drm/xilinx/Makefile -@@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o xilinx_drm_drv.o \ - xilinx_drm_plane.o - xilinx_drm-y += xilinx_cresample.o xilinx_osd.o xilinx_rgb2yuv.o xilinx_vtc.o - -+obj-$(CONFIG_DRM_DIGILENT_ENCODER) += dglnt_encoder.o - obj-$(CONFIG_DRM_XILINX) += xilinx_drm.o - obj-$(CONFIG_DRM_XILINX_DP) += xilinx_drm_dp.o - obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o -diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c b/drivers/gpu/drm/xilinx/dglnt_encoder.c -new file mode 100644 -index 0000000..cb9fc7d ---- /dev/null -+++ b/drivers/gpu/drm/xilinx/dglnt_encoder.c -@@ -0,0 +1,217 @@ -+/* -+ * dglnt_encoder.c - DRM slave encoder for Video-out on Digilent boards -+ * -+ * Copyright (C) 2015 Digilent -+ * Author: Sam Bobrowicz -+ * -+ * Based on udl_encoder.c and udl_connector.c, Copyright (C) 2012 Red Hat. -+ * Also based on xilinx_drm_dp.c, Copyright (C) 2014 Xilinx, Inc. -+ * -+ * This software is licensed under the terms of the GNU General Public -+ * License version 2, as published by the Free Software Foundation, and -+ * may be copied, distributed, and modified under those terms. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define DGLNT_ENC_MAX_FREQ 150000 -+#define DGLNT_ENC_MAX_H 1920 -+#define DGLNT_ENC_MAX_V 1080 -+#define DGLNT_ENC_PREF_H 1280 -+#define DGLNT_ENC_PREF_V 720 -+ -+struct dglnt_encoder { -+ struct drm_encoder *encoder; -+ struct i2c_adapter *i2c_bus; -+ bool i2c_present; -+}; -+ -+static inline struct dglnt_encoder *to_dglnt_encoder( -+ struct drm_encoder *encoder) -+{ -+ return to_encoder_slave(encoder)->slave_priv; -+} -+ -+static bool dglnt_mode_fixup(struct drm_encoder *encoder, -+ const struct drm_display_mode *mode, -+ struct drm_display_mode *adjusted_mode) -+{ -+ return true; -+} -+ -+static void dglnt_encoder_mode_set(struct drm_encoder *encoder, -+ struct drm_display_mode *mode, -+ struct drm_display_mode *adjusted_mode) -+{ -+} -+ -+static void -+dglnt_encoder_dpms(struct drm_encoder *encoder, int mode) -+{ -+} -+ -+static void dglnt_encoder_save(struct drm_encoder *encoder) -+{ -+} -+ -+static void dglnt_encoder_restore(struct drm_encoder *encoder) -+{ -+} -+ -+static int dglnt_encoder_mode_valid(struct drm_encoder *encoder, -+ struct drm_display_mode *mode) -+{ -+ if (mode && -+ !(mode->flags & ((DRM_MODE_FLAG_INTERLACE | -+ DRM_MODE_FLAG_DBLCLK) | DRM_MODE_FLAG_3D_MASK)) && -+ (mode->clock <= DGLNT_ENC_MAX_FREQ) && -+ (mode->hdisplay <= DGLNT_ENC_MAX_H) && -+ (mode->vdisplay <= DGLNT_ENC_MAX_V)) -+ return MODE_OK; -+ return MODE_BAD; -+} -+ -+static int dglnt_encoder_get_modes(struct drm_encoder *encoder, -+ struct drm_connector *connector) -+{ -+ struct dglnt_encoder *dglnt = to_dglnt_encoder(encoder); -+ struct edid *edid; -+ int num_modes = 0; -+ -+ if (dglnt->i2c_present) { -+ edid = drm_get_edid(connector, dglnt->i2c_bus); -+ drm_connector_update_edid_property(connector, edid); -+ if (edid) { -+ num_modes = drm_add_edid_modes(connector, edid); -+ kfree(edid); -+ } -+ } else { -+ num_modes = drm_add_modes_noedid(connector, DGLNT_ENC_MAX_H, -+ DGLNT_ENC_MAX_V); -+ drm_set_preferred_mode(connector, DGLNT_ENC_PREF_H, -+ DGLNT_ENC_PREF_V); -+ } -+ return num_modes; -+} -+ -+static enum drm_connector_status dglnt_encoder_detect( -+ struct drm_encoder *encoder, -+ struct drm_connector *connector) -+{ -+ struct dglnt_encoder *dglnt = to_dglnt_encoder(encoder); -+ -+ if (dglnt->i2c_present) { -+ if (drm_probe_ddc(dglnt->i2c_bus)) -+ return connector_status_connected; -+ return connector_status_disconnected; -+ } else -+ return connector_status_unknown; -+} -+ -+static struct drm_encoder_slave_funcs dglnt_encoder_slave_funcs = { -+ .dpms = dglnt_encoder_dpms, -+ .save = dglnt_encoder_save, -+ .restore = dglnt_encoder_restore, -+ .mode_fixup = dglnt_mode_fixup, -+ .mode_valid = dglnt_encoder_mode_valid, -+ .mode_set = dglnt_encoder_mode_set, -+ .detect = dglnt_encoder_detect, -+ .get_modes = dglnt_encoder_get_modes, -+}; -+ -+static int dglnt_encoder_encoder_init(struct platform_device *pdev, -+ struct drm_device *dev, -+ struct drm_encoder_slave *encoder) -+{ -+ struct dglnt_encoder *dglnt = platform_get_drvdata(pdev); -+ struct device_node *sub_node; -+ -+ encoder->slave_priv = dglnt; -+ encoder->slave_funcs = &dglnt_encoder_slave_funcs; -+ -+ dglnt->encoder = &encoder->base; -+ -+ /* get i2c adapter for edid */ -+ dglnt->i2c_present = false; -+ sub_node = of_parse_phandle(pdev->dev.of_node, "dglnt,edid-i2c", 0); -+ if (sub_node) { -+ dglnt->i2c_bus = of_find_i2c_adapter_by_node(sub_node); -+ if (!dglnt->i2c_bus) -+ DRM_INFO("failed to get the edid i2c adapter, using default modes\n"); -+ else -+ dglnt->i2c_present = true; -+ of_node_put(sub_node); -+ } -+ -+ return 0; -+} -+ -+static int dglnt_encoder_probe(struct platform_device *pdev) -+{ -+ struct dglnt_encoder *dglnt; -+ -+ dglnt = devm_kzalloc(&pdev->dev, sizeof(*dglnt), GFP_KERNEL); -+ if (!dglnt) -+ return -ENOMEM; -+ -+ platform_set_drvdata(pdev, dglnt); -+ -+ return 0; -+} -+ -+static int dglnt_encoder_remove(struct platform_device *pdev) -+{ -+ return 0; -+} -+ -+static const struct of_device_id dglnt_encoder_of_match[] = { -+ { .compatible = "digilent,drm-encoder", }, -+ { /* end of table */ }, -+}; -+MODULE_DEVICE_TABLE(of, dglnt_encoder_of_match); -+ -+static struct drm_platform_encoder_driver dglnt_encoder_driver = { -+ .platform_driver = { -+ .probe = dglnt_encoder_probe, -+ .remove = dglnt_encoder_remove, -+ .driver = { -+ .owner = THIS_MODULE, -+ .name = "dglnt-drm-enc", -+ .of_match_table = dglnt_encoder_of_match, -+ }, -+ }, -+ -+ .encoder_init = dglnt_encoder_encoder_init, -+}; -+ -+static int __init dglnt_encoder_init(void) -+{ -+ return platform_driver_register(&dglnt_encoder_driver.platform_driver); -+} -+ -+static void __exit dglnt_encoder_exit(void) -+{ -+ platform_driver_unregister(&dglnt_encoder_driver.platform_driver); -+} -+ -+module_init(dglnt_encoder_init); -+module_exit(dglnt_encoder_exit); -+ -+MODULE_AUTHOR("Digilent, Inc."); -+MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards"); -+MODULE_LICENSE("GPL v2"); --- -2.7.4 - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch deleted file mode 100644 index 9b6229db..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch +++ /dev/null @@ -1,607 +0,0 @@ -From 217e3b6f4393926b8dcad841381527ef3fc808c2 Mon Sep 17 00:00:00 2001 -From: Jason Wu -Date: Sun, 10 Apr 2016 13:16:06 +1000 -Subject: [PATCH 2/3] clk: Add driver for axi_dynclk IP Core - -Add support for the axi_dynclk IP Core available from Digilent. This IP -core dynamically configures the clock resources inside a Xilinx FPGA to -generate a clock with a software programmable frequency. - -Upstream-Status: Pending - -Signed-off-by: Sam Bobrowicz -Signed-off-by: Jason Wu ---- - drivers/clk/Kconfig | 8 + - drivers/clk/Makefile | 1 + - drivers/clk/clk-dglnt-dynclk.c | 547 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 556 insertions(+) - create mode 100644 drivers/clk/clk-dglnt-dynclk.c - -diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index dccb111100..7fe65a702b 100644 ---- a/drivers/clk/Kconfig -+++ b/drivers/clk/Kconfig -@@ -148,6 +148,14 @@ config CLK_QORIQ - This adds the clock driver support for Freescale QorIQ platforms - using common clock framework. - -+config COMMON_CLK_DGLNT_DYNCLK -+ tristate "Digilent axi_dynclk Driver" -+ depends on ARCH_ZYNQ || MICROBLAZE -+ help -+ ---help--- -+ Support for the Digilent AXI Dynamic Clock core for Xilinx -+ FPGAs. -+ - config COMMON_CLK_XGENE - bool "Clock driver for APM XGene SoC" - default y -diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index 0760449dde..45ce97d053 100644 ---- a/drivers/clk/Makefile -+++ b/drivers/clk/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o - obj-$(CONFIG_COMMON_CLK_CDCE925) += clk-cdce925.o - obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o - obj-$(CONFIG_COMMON_CLK_CS2000_CP) += clk-cs2000-cp.o -+obj-$(CONFIG_COMMON_CLK_DGLNT_DYNCLK) += clk-dglnt-dynclk.o - obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o - obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o - obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o -diff --git a/drivers/clk/clk-dglnt-dynclk.c b/drivers/clk/clk-dglnt-dynclk.c -new file mode 100644 -index 0000000000..496ad5fc90 ---- /dev/null -+++ b/drivers/clk/clk-dglnt-dynclk.c -@@ -0,0 +1,547 @@ -+/* -+ * clk-dglnt-dynclk.c - Digilent AXI Dynamic Clock (axi_dynclk) Driver -+ * -+ * Copyright (C) 2015 Digilent -+ * Author: Sam Bobrowicz -+ * -+ * Reused code from clk-axi-clkgen.c, Copyright (C) 2012-2013 Analog Devices Inc. -+ * -+ * This software is licensed under the terms of the GNU General Public -+ * License version 2, as published by the Free Software Foundation, and -+ * may be copied, distributed, and modified under those terms. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define CLK_BIT_WEDGE 13 -+#define CLK_BIT_NOCOUNT 12 -+ -+/* This value is used to signal an error */ -+#define ERR_CLKCOUNTCALC 0xFFFFFFFF -+#define ERR_CLKDIVIDER (1 << CLK_BIT_WEDGE | 1 << CLK_BIT_NOCOUNT) -+ -+#define DYNCLK_DIV_1_REGMASK 0x1041 -+/* 25 MHz (125 KHz / 5) */ -+#define DYNCLK_DEFAULT_FREQ 125000 -+ -+#define MMCM_FREQ_VCOMIN 600000 -+#define MMCM_FREQ_VCOMAX 1200000 -+#define MMCM_FREQ_PFDMIN 10000 -+#define MMCM_FREQ_PFDMAX 450000 -+#define MMCM_FREQ_OUTMIN 4000 -+#define MMCM_FREQ_OUTMAX 800000 -+#define MMCM_DIV_MAX 106 -+#define MMCM_FB_MIN 2 -+#define MMCM_FB_MAX 64 -+#define MMCM_CLKDIV_MAX 128 -+#define MMCM_CLKDIV_MIN 1 -+ -+#define OFST_DISPLAY_CTRL 0x0 -+#define OFST_DISPLAY_STATUS 0x4 -+#define OFST_DISPLAY_CLK_L 0x8 -+#define OFST_DISPLAY_FB_L 0x0C -+#define OFST_DISPLAY_FB_H_CLK_H 0x10 -+#define OFST_DISPLAY_DIV 0x14 -+#define OFST_DISPLAY_LOCK_L 0x18 -+#define OFST_DISPLAY_FLTR_LOCK_H 0x1C -+ -+static const u64 lock_lookup[64] = { -+ 0b0011000110111110100011111010010000000001, -+ 0b0011000110111110100011111010010000000001, -+ 0b0100001000111110100011111010010000000001, -+ 0b0101101011111110100011111010010000000001, -+ 0b0111001110111110100011111010010000000001, -+ 0b1000110001111110100011111010010000000001, -+ 0b1001110011111110100011111010010000000001, -+ 0b1011010110111110100011111010010000000001, -+ 0b1100111001111110100011111010010000000001, -+ 0b1110011100111110100011111010010000000001, -+ 0b1111111111111000010011111010010000000001, -+ 0b1111111111110011100111111010010000000001, -+ 0b1111111111101110111011111010010000000001, -+ 0b1111111111101011110011111010010000000001, -+ 0b1111111111101000101011111010010000000001, -+ 0b1111111111100111000111111010010000000001, -+ 0b1111111111100011111111111010010000000001, -+ 0b1111111111100010011011111010010000000001, -+ 0b1111111111100000110111111010010000000001, -+ 0b1111111111011111010011111010010000000001, -+ 0b1111111111011101101111111010010000000001, -+ 0b1111111111011100001011111010010000000001, -+ 0b1111111111011010100111111010010000000001, -+ 0b1111111111011001000011111010010000000001, -+ 0b1111111111011001000011111010010000000001, -+ 0b1111111111010111011111111010010000000001, -+ 0b1111111111010101111011111010010000000001, -+ 0b1111111111010101111011111010010000000001, -+ 0b1111111111010100010111111010010000000001, -+ 0b1111111111010100010111111010010000000001, -+ 0b1111111111010010110011111010010000000001, -+ 0b1111111111010010110011111010010000000001, -+ 0b1111111111010010110011111010010000000001, -+ 0b1111111111010001001111111010010000000001, -+ 0b1111111111010001001111111010010000000001, -+ 0b1111111111010001001111111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001, -+ 0b1111111111001111101011111010010000000001 -+}; -+ -+static const u32 filter_lookup_low[64] = { -+ 0b0001011111, -+ 0b0001010111, -+ 0b0001111011, -+ 0b0001011011, -+ 0b0001101011, -+ 0b0001110011, -+ 0b0001110011, -+ 0b0001110011, -+ 0b0001110011, -+ 0b0001001011, -+ 0b0001001011, -+ 0b0001001011, -+ 0b0010110011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001010011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0001100011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010010011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011, -+ 0b0010100011 -+}; -+ -+struct dglnt_dynclk_reg; -+struct dglnt_dynclk_mode; -+struct dglnt_dynclk; -+ -+struct dglnt_dynclk_reg { -+ u32 clk0L; -+ u32 clkFBL; -+ u32 clkFBH_clk0H; -+ u32 divclk; -+ u32 lockL; -+ u32 fltr_lockH; -+}; -+ -+struct dglnt_dynclk_mode { -+ u32 freq; -+ u32 fbmult; -+ u32 clkdiv; -+ u32 maindiv; -+}; -+ -+struct dglnt_dynclk { -+ void __iomem *base; -+ struct clk_hw clk_hw; -+ unsigned long freq; -+}; -+ -+u32 dglnt_dynclk_divider(u32 divide) -+{ -+ u32 output = 0; -+ u32 highTime = 0; -+ u32 lowTime = 0; -+ -+ if ((divide < 1) || (divide > 128)) -+ return ERR_CLKDIVIDER; -+ -+ if (divide == 1) -+ return DYNCLK_DIV_1_REGMASK; -+ -+ highTime = divide / 2; -+ /* if divide is odd */ -+ if (divide & 0x1) { -+ lowTime = highTime + 1; -+ output = 1 << CLK_BIT_WEDGE; -+ } else { -+ lowTime = highTime; -+ } -+ -+ output |= 0x03F & lowTime; -+ output |= 0xFC0 & (highTime << 6); -+ return output; -+} -+ -+u32 dglnt_dynclk_count_calc(u32 divide) -+{ -+ u32 output = 0; -+ u32 divCalc = 0; -+ -+ divCalc = dglnt_dynclk_divider(divide); -+ if (divCalc == ERR_CLKDIVIDER) -+ output = ERR_CLKCOUNTCALC; -+ else -+ output = (0xFFF & divCalc) | ((divCalc << 10) & 0x00C00000); -+ return output; -+} -+ -+ -+int dglnt_dynclk_find_reg(struct dglnt_dynclk_reg *regValues, -+ struct dglnt_dynclk_mode *clkParams) -+{ -+ if ((clkParams->fbmult < 2) || clkParams->fbmult > 64) -+ return -EINVAL; -+ -+ regValues->clk0L = dglnt_dynclk_count_calc(clkParams->clkdiv); -+ if (regValues->clk0L == ERR_CLKCOUNTCALC) -+ return -EINVAL; -+ -+ regValues->clkFBL = dglnt_dynclk_count_calc(clkParams->fbmult); -+ if (regValues->clkFBL == ERR_CLKCOUNTCALC) -+ return -EINVAL; -+ -+ regValues->clkFBH_clk0H = 0; -+ -+ regValues->divclk = dglnt_dynclk_divider(clkParams->maindiv); -+ if (regValues->divclk == ERR_CLKDIVIDER) -+ return -EINVAL; -+ -+ regValues->lockL = (u32)(lock_lookup[clkParams->fbmult - 1] & -+ 0xFFFFFFFF); -+ -+ regValues->fltr_lockH = (u32)((lock_lookup[clkParams->fbmult - 1] >> -+ 32) & 0x000000FF); -+ regValues->fltr_lockH |= ((filter_lookup_low[clkParams->fbmult - 1] << -+ 16) & 0x03FF0000); -+ -+ return 0; -+} -+ -+void dglnt_dynclk_write_reg(struct dglnt_dynclk_reg *regValues, -+ void __iomem *baseaddr) -+{ -+ writel(regValues->clk0L, baseaddr + OFST_DISPLAY_CLK_L); -+ writel(regValues->clkFBL, baseaddr + OFST_DISPLAY_FB_L); -+ writel(regValues->clkFBH_clk0H, baseaddr + OFST_DISPLAY_FB_H_CLK_H); -+ writel(regValues->divclk, baseaddr + OFST_DISPLAY_DIV); -+ writel(regValues->lockL, baseaddr + OFST_DISPLAY_LOCK_L); -+ writel(regValues->fltr_lockH, baseaddr + OFST_DISPLAY_FLTR_LOCK_H); -+} -+ -+u32 dglnt_dynclk_find_mode(u32 freq, u32 parentFreq, -+ struct dglnt_dynclk_mode *bestPick) -+{ -+ u32 bestError = MMCM_FREQ_OUTMAX; -+ u32 curError; -+ u32 curClkMult; -+ u32 curFreq; -+ u32 divVal; -+ u32 curFb, curClkDiv; -+ u32 minFb = 0; -+ u32 maxFb = 0; -+ u32 curDiv = 1; -+ u32 maxDiv; -+ bool freq_found = false; -+ -+ bestPick->freq = 0; -+ if (parentFreq == 0) -+ return 0; -+ -+ /* minimum frequency is actually dictated by VCOmin */ -+ if (freq < MMCM_FREQ_OUTMIN) -+ freq = MMCM_FREQ_OUTMIN; -+ if (freq > MMCM_FREQ_OUTMAX) -+ freq = MMCM_FREQ_OUTMAX; -+ -+ if (parentFreq > MMCM_FREQ_PFDMAX) -+ curDiv = 2; -+ maxDiv = parentFreq / MMCM_FREQ_PFDMIN; -+ if (maxDiv > MMCM_DIV_MAX) -+ maxDiv = MMCM_DIV_MAX; -+ -+ while (curDiv <= maxDiv && !freq_found) { -+ minFb = curDiv * DIV_ROUND_UP(MMCM_FREQ_VCOMIN, parentFreq); -+ maxFb = curDiv * (MMCM_FREQ_VCOMAX / parentFreq); -+ if (maxFb > MMCM_FB_MAX) -+ maxFb = MMCM_FB_MAX; -+ if (minFb < MMCM_FB_MIN) -+ minFb = MMCM_FB_MIN; -+ -+ divVal = curDiv * freq; -+ /* -+ * This multiplier is used to find the best clkDiv value for -+ * each FB value -+ */ -+ curClkMult = ((parentFreq * 1000) + (divVal / 2)) / divVal; -+ -+ curFb = minFb; -+ while (curFb <= maxFb && !freq_found) { -+ curClkDiv = ((curClkMult * curFb) + 500) / 1000; -+ if (curClkDiv > MMCM_CLKDIV_MAX) -+ curClkDiv = MMCM_CLKDIV_MAX; -+ if (curClkDiv < MMCM_CLKDIV_MIN) -+ curClkDiv = MMCM_CLKDIV_MIN; -+ curFreq = (((parentFreq * curFb) / curDiv) / curClkDiv); -+ if (curFreq >= freq) -+ curError = curFreq - freq; -+ else -+ curError = freq - curFreq; -+ if (curError < bestError) { -+ bestError = curError; -+ bestPick->clkdiv = curClkDiv; -+ bestPick->fbmult = curFb; -+ bestPick->maindiv = curDiv; -+ bestPick->freq = curFreq; -+ } -+ if (!curError) -+ freq_found = true; -+ curFb++; -+ } -+ curDiv++; -+ } -+ return bestPick->freq; -+} -+ -+static struct dglnt_dynclk *clk_hw_to_dglnt_dynclk(struct clk_hw *clk_hw) -+{ -+ return container_of(clk_hw, struct dglnt_dynclk, clk_hw); -+} -+ -+ -+static int dglnt_dynclk_enable(struct clk_hw *clk_hw) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ unsigned int clock_state; -+ -+ if (dglnt_dynclk->freq) { -+ writel(1, dglnt_dynclk->base + OFST_DISPLAY_CTRL); -+ do { -+ clock_state = readl(dglnt_dynclk->base + -+ OFST_DISPLAY_STATUS); -+ } while (!clock_state); -+ } -+ return 0; -+} -+ -+static void dglnt_dynclk_disable(struct clk_hw *clk_hw) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ -+ writel(0, dglnt_dynclk->base + OFST_DISPLAY_CTRL); -+} -+ -+static int dglnt_dynclk_set_rate(struct clk_hw *clk_hw, -+ unsigned long rate, unsigned long parent_rate) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ struct dglnt_dynclk_reg clkReg; -+ struct dglnt_dynclk_mode clkMode; -+ -+ if (parent_rate == 0 || rate == 0) -+ return -EINVAL; -+ if (rate == dglnt_dynclk->freq) -+ return 0; -+ -+ /* -+ * Convert from Hz to KHz, then multiply by five to account for -+ * BUFR division -+ */ -+ rate = (rate + 100) / 200; -+ /* convert from Hz to KHz */ -+ parent_rate = (parent_rate + 500) / 1000; -+ if (!dglnt_dynclk_find_mode(rate, parent_rate, &clkMode)) -+ return -EINVAL; -+ -+ /* -+ * Write to the PLL dynamic configuration registers to configure it -+ * with the calculated parameters. -+ */ -+ dglnt_dynclk_find_reg(&clkReg, &clkMode); -+ dglnt_dynclk_write_reg(&clkReg, dglnt_dynclk->base); -+ dglnt_dynclk->freq = clkMode.freq * 200; -+ dglnt_dynclk_disable(clk_hw); -+ dglnt_dynclk_enable(clk_hw); -+ -+ return 0; -+} -+ -+static long dglnt_dynclk_round_rate(struct clk_hw *hw, unsigned long rate, -+ unsigned long *parent_rate) -+{ -+ struct dglnt_dynclk_mode clkMode; -+ -+ dglnt_dynclk_find_mode(((rate + 100) / 200), -+ ((*parent_rate) + 500) / 1000, &clkMode); -+ -+ return (clkMode.freq * 200); -+} -+ -+static unsigned long dglnt_dynclk_recalc_rate(struct clk_hw *clk_hw, -+ unsigned long parent_rate) -+{ -+ struct dglnt_dynclk *dglnt_dynclk = clk_hw_to_dglnt_dynclk(clk_hw); -+ -+ return dglnt_dynclk->freq; -+} -+ -+ -+static const struct clk_ops dglnt_dynclk_ops = { -+ .recalc_rate = dglnt_dynclk_recalc_rate, -+ .round_rate = dglnt_dynclk_round_rate, -+ .set_rate = dglnt_dynclk_set_rate, -+ .enable = dglnt_dynclk_enable, -+ .disable = dglnt_dynclk_disable, -+}; -+ -+static const struct of_device_id dglnt_dynclk_ids[] = { -+ { .compatible = "digilent,axi-dynclk", }, -+ { }, -+}; -+MODULE_DEVICE_TABLE(of, dglnt_dynclk_ids); -+ -+static int dglnt_dynclk_probe(struct platform_device *pdev) -+{ -+ const struct of_device_id *id; -+ struct dglnt_dynclk *dglnt_dynclk; -+ struct clk_init_data init; -+ const char *parent_name; -+ const char *clk_name; -+ struct resource *mem; -+ struct clk *clk; -+ -+ if (!pdev->dev.of_node) -+ return -ENODEV; -+ -+ id = of_match_node(dglnt_dynclk_ids, pdev->dev.of_node); -+ if (!id) -+ return -ENODEV; -+ -+ dglnt_dynclk = devm_kzalloc(&pdev->dev, sizeof(*dglnt_dynclk), -+ GFP_KERNEL); -+ if (!dglnt_dynclk) -+ return -ENOMEM; -+ -+ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ dglnt_dynclk->base = devm_ioremap_resource(&pdev->dev, mem); -+ if (IS_ERR(dglnt_dynclk->base)) -+ return PTR_ERR(dglnt_dynclk->base); -+ -+ parent_name = of_clk_get_parent_name(pdev->dev.of_node, 0); -+ if (!parent_name) -+ return -EINVAL; -+ -+ clk_name = pdev->dev.of_node->name; -+ of_property_read_string(pdev->dev.of_node, "clock-output-names", -+ &clk_name); -+ -+ init.name = clk_name; -+ init.ops = &dglnt_dynclk_ops; -+ init.flags = 0; -+ init.parent_names = &parent_name; -+ init.num_parents = 1; -+ -+ dglnt_dynclk->freq = 0; -+ dglnt_dynclk_disable(&dglnt_dynclk->clk_hw); -+ -+ dglnt_dynclk->clk_hw.init = &init; -+ clk = devm_clk_register(&pdev->dev, &dglnt_dynclk->clk_hw); -+ if (IS_ERR(clk)) -+ return PTR_ERR(clk); -+ -+ return of_clk_add_provider(pdev->dev.of_node, of_clk_src_simple_get, -+ clk); -+} -+ -+static int dglnt_dynclk_remove(struct platform_device *pdev) -+{ -+ of_clk_del_provider(pdev->dev.of_node); -+ -+ return 0; -+} -+ -+static struct platform_driver dglnt_dynclk_driver = { -+ .driver = { -+ .name = "dglnt-dynclk", -+ .owner = THIS_MODULE, -+ .of_match_table = dglnt_dynclk_ids, -+ }, -+ .probe = dglnt_dynclk_probe, -+ .remove = dglnt_dynclk_remove, -+}; -+module_platform_driver(dglnt_dynclk_driver); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_AUTHOR("Sam Bobrowicz "); -+MODULE_DESCRIPTION("CCF Driver for Digilent axi_dynclk IP Core"); --- -2.14.2 - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch deleted file mode 100644 index a98d84c5..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1a18e2b514ae9e75145597ac509a87f656c976ba Mon Sep 17 00:00:00 2001 -From: Nathan Rossi -Date: Mon, 2 May 2016 23:46:42 +1000 -Subject: [PATCH 3/3] drm: xilinx: Fix DPMS transition to on - -Fix the issues where the VTC is reset (losing its timing config). - -Also fix the issue where the plane destroys its DMA descriptors and -marks the DMA channels as inactive but never recreates the descriptors -and never updates the active state when turning DPMS back on. - -Signed-off-by: Nathan Rossi -Upstream-Status: Pending [This is a workaround] ---- - drivers/gpu/drm/xilinx/xilinx_drm_crtc.c | 1 - - drivers/gpu/drm/xilinx/xilinx_drm_plane.c | 3 ++- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c -index 631d35b921..93dbd4b58a 100644 ---- a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c -+++ b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c -@@ -88,7 +88,6 @@ static void xilinx_drm_crtc_dpms(struct drm_crtc *base_crtc, int dpms) - default: - if (crtc->vtc) { - xilinx_vtc_disable(crtc->vtc); -- xilinx_vtc_reset(crtc->vtc); - } - if (crtc->cresample) { - xilinx_cresample_disable(crtc->cresample); -diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c -index 6a248b72d4..d2518a4bdf 100644 ---- a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c -+++ b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c -@@ -140,7 +140,7 @@ void xilinx_drm_plane_commit(struct drm_plane *base_plane) - for (i = 0; i < MAX_NUM_SUB_PLANES; i++) { - struct xilinx_drm_plane_dma *dma = &plane->dma[i]; - -- if (dma->chan && dma->is_active) { -+ if (dma->chan) { - flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT; - desc = dmaengine_prep_interleaved_dma(dma->chan, - &dma->xt, -@@ -153,6 +153,7 @@ void xilinx_drm_plane_commit(struct drm_plane *base_plane) - dmaengine_submit(desc); - - dma_async_issue_pending(dma->chan); -+ dma->is_active = true; - } - } - } --- -2.14.2 - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0004-minized-wifi-bluetooth.cfg b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0004-minized-wifi-bluetooth.cfg deleted file mode 100644 index f71e53ab..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0004-minized-wifi-bluetooth.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# -# Bluetooth config -# -CONFIG_BT=y -CONFIG_BT_BREDR=y -CONFIG_BT_HS=y -CONFIG_BT_LE=y -CONFIG_BT_BCM=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCM=y -CONFIG_BT_HIDP=y -CONFIG_CFG80211=y -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_BRCMUTIL=y -CONFIG_BRCMFMAC=y -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_SDIO=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_SHA256=y - -# -# Regulator config -# -CONFIG_REGMAP_IRQ=y -CONFIG_I2C_XILINX=y -CONFIG_MFD_DA9062=y -CONFIG_REGULATOR_DA9062=y - diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend deleted file mode 100644 index c789c7a9..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}:" - -# Note: These patches are very old and doesn't apply on top of 5.x -# kernel. For more details refer README.md file. - -#SRC_URI:append:zybo-linux-bd-zynq7 = " \ -# file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \ -# file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \ -# file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \ -# " - -SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg" diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend deleted file mode 100644 index c789c7a9..00000000 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}:" - -# Note: These patches are very old and doesn't apply on top of 5.x -# kernel. For more details refer README.md file. - -#SRC_URI:append:zybo-linux-bd-zynq7 = " \ -# file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \ -# file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \ -# file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \ -# " - -SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg" diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb deleted file mode 100644 index f02bb879..00000000 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -ATF_VERSION = "2.6" -SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84" -BRANCH = "xlnx_rebase_v2.6" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - - -include arm-trusted-firmware.inc - diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb deleted file mode 100644 index 5ef2e6ac..00000000 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -ATF_VERSION = "2.6" -SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa" -BRANCH = "xlnx_rebase_v2.6" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - - -include arm-trusted-firmware.inc - diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb deleted file mode 100644 index fdf28f41..00000000 --- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Building and installing bootgen" -DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1" - -S = "${WORKDIR}/git" - -DEPENDS += "openssl" -RDEPENDS:${PN} += "openssl" - -REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https" -BRANCH ?= "xlnx_rel_v2022.2" -SRCREV = "cf4ba93b99644dc4429ef633471a639e1382f0e7" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG}" - -EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}' -CXXFLAGS:append = " -std=c++0x" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} - install -Dm 0755 ${S}/bootgen ${D}${bindir} -} - -FILES:${PN} = "${bindir}/bootgen" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb deleted file mode 100644 index fcfeff1e..00000000 --- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "Xilinx dfx-mgr libraries" -DESCRIPTION = "Xilinx Runtime User Space Libraries and Binaries" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d67bcef754e935bf77b6d7051bd62b5e" - -REPO ?= "git://github.com/Xilinx/dfx-mgr.git;protocol=https" -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG}" - -BRANCH = "xlnx_rel_v2022.2" -SRCREV = "350f937d49d2ff83f7e025973683a5be727d2ee6" -SOMAJOR = "1" -SOMINOR = "0" -SOVERSION = "${SOMAJOR}.${SOMINOR}" - -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" -COMPATIBLE_MACHINE:versal = "versal" - -S = "${WORKDIR}/git" - -inherit cmake update-rc.d systemd - -DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" -RDEPENDS:${PN} += " fru-print" -EXTRA_OECMAKE += " \ - -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ - " - -# Workaround for: the comparison will always evaluate as 'true' for the address of 'defaul_accel_name' will never be NULL [-Werror=address] -CFLAGS += "-Wno-address" - -# Workaround for: '__builtin_strncpy' specified bound depends on the length of the source argument [-Werror=stringop-truncation] -CFLAGS += "-Wno-stringop-truncation" - -INITSCRIPT_NAME = "dfx-mgr.sh" -INITSCRIPT_PARAMS = "start 99 S ." - -SYSTEMD_PACKAGES="${PN}" -SYSTEMD_SERVICE:${PN}="dfx-mgr.service" -SYSTEMD_AUTO_ENABLE:${PN}="enable" - - -do_install(){ - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${includedir} - install -d ${D}${base_libdir}/firmware/xilinx - install -d ${D}${sysconfdir}/dfx-mgrd - - cp ${B}/example/sys/linux/dfx-mgrd-static ${D}${bindir}/dfx-mgrd - cp ${B}/example/sys/linux/dfx-mgr-client-static ${D}${bindir}/dfx-mgr-client - chrpath -d ${D}${bindir}/dfx-mgrd - chrpath -d ${D}${bindir}/dfx-mgr-client - install -m 0644 ${S}/src/dfxmgr_client.h ${D}${includedir} - - oe_soinstall ${B}/src/libdfx-mgr.so.${SOVERSION} ${D}${libdir} - - install -m 0755 ${S}/src/daemon.conf ${D}${sysconfdir}/dfx-mgrd/ - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${S}/src/dfx-mgr.sh ${D}${sysconfdir}/init.d/ - fi - - install -m 0755 ${S}/src/dfx-mgr.sh ${D}${bindir} - install -m 0755 ${S}/src/scripts/xlnx-firmware-detect ${D}${bindir} - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/src/dfx-mgr.service ${D}${systemd_system_unitdir} -} - -PACKAGES =+ "libdfx-mgr" - -FILES:${PN} += "${base_libdir}/firmware/xilinx" -FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${sysconfdir}/init.d/dfx-mgr.sh', '', d)} ${systemd_system_unitdir}" -FILES:libdfx-mgr = "${libdir}/libdfx-mgr.so.${SOVERSION} ${libdir}/libdfx-mgr.so.${SOMAJOR}" diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb deleted file mode 100644 index 2c180561..00000000 --- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Xilinx libdfx library" -DESCRIPTION = "Xilinx libdfx Library and headers" - -LICENSE = "MIT & GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=94aba86aec117f003b958a52f019f1a7" - -BRANCH ?= "xlnx_rel_v2022.2" -REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https" -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG}" -SRCREV = "f2b7bbca9d6936141024becfb92266600eeefc2b" - -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" -COMPATIBLE_MACHINE:versal = "versal" - -S = "${WORKDIR}/git" - -inherit cmake - -# Due to an update where the soname/version was defined, we need to use an RREPLACES -# so updates will work properly. -RREPLACES:${PN} = "libdfx" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb deleted file mode 100644 index 7b109f50..00000000 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -UBOOT_VERSION = "v2021.01" - -UBRANCH ?= "xlnx_rebase_v2022.01_2022.1_update" - -SRCREV = "91ad7924e7f59584d597353e1bb86794341e0a7e" - -include u-boot-xlnx.inc -include u-boot-spl-zynq-init.inc - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" - -# u-boot-xlnx has support for these -HAS_PLATFORM_INIT ?= " \ - xilinx_zynqmp_virt_config \ - xilinx_zynq_virt_defconfig \ - xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \ - " - diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb deleted file mode 100644 index 3fdc3840..00000000 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -UBOOT_VERSION = "v2021.01" - -UBRANCH ?= "xlnx_rebase_v2022.01" - -SRCREV = "b31476685debf5512ed0d4e8000fa5167a22f530" - -include u-boot-xlnx.inc -include u-boot-spl-zynq-init.inc - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" - -# u-boot-xlnx has support for these -HAS_PLATFORM_INIT ?= " \ - xilinx_zynqmp_virt_config \ - xilinx_zynq_virt_defconfig \ - xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \ - " - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb deleted file mode 100644 index 7c734cd6..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb +++ /dev/null @@ -1,8 +0,0 @@ - -require qemu-devicetrees.inc - -BRANCH ?= "xlnx_rel_v2022.1" -SRCREV ?= "0499324af1178057c3730b0989c8fb5c5bbc4cf8" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append = " file://0001-Makefile-Use-python3-instead-of-python.patch" 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 deleted file mode 100644 index 6675ba3e..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb +++ /dev/null @@ -1,6 +0,0 @@ - -require qemu-devicetrees.inc - -BRANCH ?= "xlnx_rel_v2022.2" -SRCREV ?= "cf5d357e16c13ac447861f908e83951ffb7b4301" - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc deleted file mode 100644 index 62a221f4..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc +++ /dev/null @@ -1,4 +0,0 @@ -XILINX_QEMU_VERSION = "v6.1.0" -BRANCH = "xlnx_rel_v2022.2" -SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc deleted file mode 100644 index 62a221f4..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc +++ /dev/null @@ -1,4 +0,0 @@ -XILINX_QEMU_VERSION = "v6.1.0" -BRANCH = "xlnx_rel_v2022.2" -SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb deleted file mode 100644 index e0edd965..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qemu-xilinx-2022.1.inc -require qemu-xilinx-native.inc -require qemu-native-alt.inc - -BPN = "qemu-xilinx" - -EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" - -PACKAGECONFIG ??= "pie" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb deleted file mode 100644 index 21b9e9bf..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qemu-xilinx-2022.2.inc -require qemu-xilinx-native.inc -require qemu-native-alt.inc - -BPN = "qemu-xilinx" - -EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" - -PACKAGECONFIG ??= "pie" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb deleted file mode 100644 index ea7d6830..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -require qemu-system-native-alt.inc -require qemu-xilinx-2022.1.inc -require qemu-xilinx-native.inc - -PROVIDES = "qemu-system-native" - -EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" - -PACKAGECONFIG ??= "fdt alsa kvm pie slirp" - -PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" - -DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native" -DEPENDS += "qemu-xilinx-multiarch-helper-native" - -do_install:append() { - # The following is also installed by qemu-native - rm -f ${D}${datadir}/qemu/trace-events-all - rm -rf ${D}${datadir}/qemu/keymaps - rm -rf ${D}${datadir}/icons - rm -rf ${D}${includedir}/qemu-plugin.h - - # Install qmp.py to be used with testimage - install -d ${D}${libdir}/qemu-python/qmp/ - install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/ -} diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb deleted file mode 100644 index 540ec51a..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -require qemu-system-native-alt.inc -require qemu-xilinx-2022.2.inc -require qemu-xilinx-native.inc - -PROVIDES = "qemu-system-native" - -EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" - -PACKAGECONFIG ??= "fdt alsa kvm pie slirp" - -PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" - -DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native" -DEPENDS += "qemu-xilinx-multiarch-helper-native" - -do_install:append() { - # The following is also installed by qemu-native - rm -f ${D}${datadir}/qemu/trace-events-all - rm -rf ${D}${datadir}/qemu/keymaps - rm -rf ${D}${datadir}/icons - rm -rf ${D}${includedir}/qemu-plugin.h - - # Install qmp.py to be used with testimage - install -d ${D}${libdir}/qemu-python/qmp/ - install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/ -} diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb deleted file mode 100644 index 3503e2f4..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -require qemu-xilinx-2022.1.inc -require recipes-devtools/qemu/qemu.inc -require qemu-xilinx.inc -require qemu-alt.inc - -BBCLASSEXTEND = "nativesdk" - -RDEPENDS:${PN}:class-target += "bash" - -PROVIDES:class-nativesdk = "nativesdk-qemu" -RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu" - -EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" - -do_install:append:class-nativesdk() { - ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} -} diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb deleted file mode 100644 index 31b9c41d..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require qemu-xilinx-2022.2.inc -require recipes-devtools/qemu/qemu.inc -require qemu-xilinx.inc -require qemu-alt.inc - -BBCLASSEXTEND = "nativesdk" - -RDEPENDS:${PN}:class-target += "bash" - -PROVIDES:class-nativesdk = "nativesdk-qemu" -RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu" - -EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" - -do_install:append:class-nativesdk() { - ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} -} diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb deleted file mode 100644 index 41c1ffe2..00000000 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -LINUX_VERSION = "5.15.19" -KBRANCH="xlnx_rebase_v5.15_LTS_2022.1_update" -SRCREV = "75872fda9ad270b611ee6ae2433492da1e22b688" - -KCONF_AUDIT_LEVEL="0" - -include linux-xlnx.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb deleted file mode 100644 index 260224b8..00000000 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -LINUX_VERSION = "5.15.36" -KBRANCH="xlnx_rebase_v5.15_LTS" -SRCREV = "19984dd147fa7fbb7cb14b17400263ad0925c189" - -KCONF_AUDIT_LEVEL="0" - -include linux-xlnx.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb deleted file mode 100644 index 3f9740a0..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require fsbl-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://fsbl-fixups.patch \ - " - -# This version does not build for zynq -COMPATIBLE_MACHINE:zynq = "none" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb deleted file mode 100644 index 3f9740a0..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require fsbl-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://fsbl-fixups.patch \ - " - -# This version does not build for zynq -COMPATIBLE_MACHINE:zynq = "none" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb deleted file mode 100644 index cc810241..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require plm-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://0001-versal_fw-Fixup-core-makefiles.patch \ - " - -EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" - -do_compile() { - oe_runmake - - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin -} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb deleted file mode 100644 index cc810241..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -require plm-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://0001-versal_fw-Fixup-core-makefiles.patch \ - " - -EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" - -do_compile() { - oe_runmake - - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin -} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb deleted file mode 100644 index 2c554d6d..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require pmu-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ - " - -EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" - -do_compile() { - oe_runmake - - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin -} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb deleted file mode 100644 index 2c554d6d..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -require pmu-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ - " - -EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" - -do_compile() { - oe_runmake - - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin -} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb deleted file mode 100644 index d861fb1c..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require psm-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://0001-versal_fw-Fixup-core-makefiles.patch \ - " - -EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" - -do_compile() { - oe_runmake - - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin -} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb deleted file mode 100644 index d861fb1c..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -require psm-firmware.inc - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" - -SRC_URI += " \ - file://makefile-skip-copy_bsp.sh.patch \ - file://0001-versal_fw-Fixup-core-makefiles.patch \ - " - -EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" - -do_compile() { - oe_runmake - - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin -} -- cgit v1.2.3-54-g00ecf From 84bcd7a4dc5ba55fa74bec1bee0786ce45c049ee Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 3 Mar 2023 16:27:59 -0600 Subject: xlnx-embeddedsw: Move branch to 2023.1 release Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index fb37a1b4..dd8c567a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -5,12 +5,12 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2_update" -ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" +ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" -ESW_REV[2023.1] = "14809f266c6ec79b517d976f882ba496be3e1998" +ESW_REV[2023.1] = "53e35139d56609e56451d2a7d7fe89e8040c9e52" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" @@ -19,7 +19,7 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' LIC_FILES_CHKSUM[xlnx_rel_v2022.2_update] = 'ce611484168a6000bd35df68fc4f4290' -LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = '15386ea7656d3b83815bce88c0bbe66d' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1] = '15386ea7656d3b83815bce88c0bbe66d' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From 9d0c8619aedbd43c094180ddd6738ba0525f7cc4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 3 Mar 2023 16:36:47 -0600 Subject: xlnx-embeddedsw: Remove obsolete embeddedsw branches Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 6 ------ 1 file changed, 6 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index dd8c567a..f65a02d8 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -3,13 +3,9 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master' REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" -ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" -ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2_update" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" -ESW_REV[2022.2] = "d820775d2492edb524ae8b25d2728c0ac2ee2c28" ESW_REV[2023.1] = "53e35139d56609e56451d2a7d7fe89e8040c9e52" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" @@ -17,8 +13,6 @@ EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH' EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" -LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' -LIC_FILES_CHKSUM[xlnx_rel_v2022.2_update] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM[xlnx_rel_v2023.1] = '15386ea7656d3b83815bce88c0bbe66d' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" -- cgit v1.2.3-54-g00ecf From 062ebd451466afcefff24799b391a2bb78686de3 Mon Sep 17 00:00:00 2001 From: Manikanta Sreeram Date: Mon, 6 Mar 2023 02:45:29 -0700 Subject: Revert "xlnx-embeddedsw: Move branch to 2023.1 release" reverting as we still need to continue to use xlnx_rel_v2023.1-next branch This reverts commit 84bcd7a4dc5ba55fa74bec1bee0786ce45c049ee. Conflicts: meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index f65a02d8..2291e525 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -3,17 +3,17 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master' REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" -ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1" +ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "53e35139d56609e56451d2a7d7fe89e8040c9e52" +ESW_REV[2023.1] = "14809f266c6ec79b517d976f882ba496be3e1998" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" -LIC_FILES_CHKSUM[xlnx_rel_v2023.1] = '15386ea7656d3b83815bce88c0bbe66d' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = '15386ea7656d3b83815bce88c0bbe66d' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From 7b00991accbe4f2c0e0bd2c1f7cbfb3553068c17 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 7 Mar 2023 20:50:20 +0530 Subject: Updated SRCREV for 2023.1_4307 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc | 2 +- .../recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb | 2 +- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc index 862b15d4..4090cebb 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc @@ -3,7 +3,7 @@ SECTION = "libs" REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https" BRANCH ?= "xlnx_rel_v2023.1" -SRCREV ?= "f6dc74eacbac3cd1839f36b8b494dcd5211942a2" +SRCREV ?= "a6b55e54e9af4856e7eead1bbf06f4b1afb64c0f" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM ?= "file://license.txt;md5=b81abf1f508952331dd7d2ab36408f5b" diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb index d9d8db7a..cbc3c393 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb @@ -1,5 +1,5 @@ ATF_VERSION = "2.8" -SRCREV = "9c3b04f7b996b21428ff4c64da01d12a4526a1b8" +SRCREV = "d13532732868806527768547e8c4af6f74f627d1" BRANCH = "xlnx_rebase_v2.8" LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index ad25cd1d..93bd1c4b 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "f32d07b9b511736649314d505f6b1caaf8d4ac75" +SRCREV = "b9b420510dc1e083ae3a8fec9c01b6bedc52057a" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 717696cf..d3a64fe7 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "943565167d57362181d853ade7ae551488036754" +SRCREV = "1f32394ff220656017d3ed6fdced01e587566097" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 2291e525..01940e12 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "14809f266c6ec79b517d976f882ba496be3e1998" +ESW_REV[2023.1] = "5d75b745952f39bc4f37189257f2f228d99089f3" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From be54059330fd467224d558f7c45ece6722c6cdb2 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 8 Mar 2023 15:08:59 +0530 Subject: Updated SRCREV for 2023.1_6391 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index d3a64fe7..e1ff86b9 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "1f32394ff220656017d3ed6fdced01e587566097" +SRCREV = "90cfb53ea56cce5fce0553cfb984412293795556" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 01940e12..fc853456 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "5d75b745952f39bc4f37189257f2f228d99089f3" +ESW_REV[2023.1] = "f41578ac326a27fdd8a89b5a3888406d8255e009" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From aa4f0ed11e558e9750e6d972a10a91b12585fd68 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 10 Mar 2023 19:07:26 +0530 Subject: Updated SRCREV for 2023.1_8595 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index fc853456..bf02379c 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "f41578ac326a27fdd8a89b5a3888406d8255e009" +ESW_REV[2023.1] = "1bfaaff1a4bdc0ccae4e207825a4718c822dde9e" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From fc4ee2aae0ee10b79662b19c0f6a2b69b70d089f Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 14 Mar 2023 16:03:42 +0530 Subject: Updated SRCREV for 2023.1_3471 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index 456b75ee..fd51561a 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "18de37abc0106da4a2ded81648fa7e33e00c539b" +SRCREV = "8624651f9ae49d326e29d9ec9a80a881a769640a" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index e1ff86b9..d369b93e 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "90cfb53ea56cce5fce0553cfb984412293795556" +SRCREV = "952c167632ed184e5f9d5bac3203b8e32e82af30" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index bf02379c..0ad04072 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "1bfaaff1a4bdc0ccae4e207825a4718c822dde9e" +ESW_REV[2023.1] = "0ced1a286899feee51ead06a69304060e5906975" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From b74933e9aa5b832e303a98fe3f67a063c249194e Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 15 Mar 2023 15:41:40 +0530 Subject: Updated SRCREV for 2023.1_6167 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 0ad04072..964341bd 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "0ced1a286899feee51ead06a69304060e5906975" +ESW_REV[2023.1] = "f81f2fb1bf0aa0fc0e893fe9e10cdb49c63af064" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 3c072fb12717fcb615f24167fe9ba6c8cb03e6e3 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Tue, 14 Mar 2023 15:20:55 -0600 Subject: README: Update standalone layer langdale release info Update meta-xilinx-standalone README with langdale release info. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-standalone/README.md | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/README.md b/meta-xilinx-standalone/README.md index 8834a87b..aa672b1d 100644 --- a/meta-xilinx-standalone/README.md +++ b/meta-xilinx-standalone/README.md @@ -13,11 +13,11 @@ The software in this layer may be used in either a standard single configuration build, or a multiconfig build. A multiconfig build, along with the MACHINES defined in meta-xilinx-bsps will automate the generation of certain firmwares. - +--- ## Standalone Firmware -The standalone firmware is a genericly configured firmware, it can be -build either in a single standalong configuration, or via an automated +The standalone firmware is a generically configured firmware, it can be +build either in a single standalone configuration, or via an automated multiconfig approach only when needed. * multiconfig setup @@ -29,32 +29,43 @@ standalone firmware on demand. Edit the conf/local.conf file, add: +``` # For zynqmp-generic BBMULTICONFIG += "fsbl-fw zynqmp-pmufw" +``` +``` # For versal-generic BBMULTICONFIG += "versal-fw" +``` -To build: +**To build:** +``` # For zynqmp, select a zynqmp machine or the generic one -MACHINE=zynqmp-generic bitbake fsbl pmufw +$ MACHINE=zynqmp-generic bitbake fsbl pmufw +``` +``` # For versal, select a versal machine or the generic one -MACHINE=versal-generic bitbake plmfw psmfw - +$ MACHINE=versal-generic bitbake plmfw psmfw +``` +--- ## Dependencies This layer depends on: - URI: git://git.openembedded.org/bitbake + URI: https://git.yoctoproject.org/poky + layers: meta, meta-poky + branch: langdale - URI: git://git.openembedded.org/openembedded-core - layers: meta - branch: master or xilinx current release version (e.g. hosister) + URI: https://git.openembedded.org/meta-openembedded + layers: meta-oe + branch: langdale - URI: git://git.yoctoproject.org/meta-xilinx.git + URI: + https://git.yoctoproject.org/meta-xilinx (official version) + https://github.com/Xilinx/meta-xilinx (development and amd xilinx release) layers: meta-xilinx-microblaze, meta-xilinx-core, meta-xilinx-bsp - branch: master or xilinx current release version (e.g. hosister) - + branch: langdale or amd xilinx release version (e.g. rel-v2023.1) -- cgit v1.2.3-54-g00ecf From 1a93ddaa7bc2ce61a2e25f1934be8ebb6a644a4a Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 16 Mar 2023 15:56:40 +0530 Subject: Updated SRCREV for 2023.1_9627 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index d369b93e..fdd0b73b 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "952c167632ed184e5f9d5bac3203b8e32e82af30" +SRCREV = "c3a3550b2d20d2fd38bd64a733e85b931e49ec04" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 964341bd..28aeeb3e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "f81f2fb1bf0aa0fc0e893fe9e10cdb49c63af064" +ESW_REV[2023.1] = "56cb02cfad3cb39404491d2f3719e89df235c26b" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From d5e7e01ca6979d0ce1d8f5158bcffbf565a56c65 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 17 Mar 2023 15:44:25 +0530 Subject: Updated SRCREV for 2023.1_2631 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index fdd0b73b..87a51983 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "c3a3550b2d20d2fd38bd64a733e85b931e49ec04" +SRCREV = "e409860b5c5e78417eccf058261a6f00dc29a44a" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 28aeeb3e..57748c3a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "56cb02cfad3cb39404491d2f3719e89df235c26b" +ESW_REV[2023.1] = "2e9f85579e203d76b983ff21c4294a8c3d578942" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From a9a9fd14d6229e43cc9b4654eadcb27cd8857d51 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 20 Mar 2023 16:18:10 +0530 Subject: Updated SRCREV for 2023.1_4139 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 57748c3a..4fe527b6 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "2e9f85579e203d76b983ff21c4294a8c3d578942" +ESW_REV[2023.1] = "b9eb8a0b4cf7372dfa7bec75a7684250680eab29" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 94aa2407d788a5a2f9daf0ca81d9d953d23c614e Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 21 Mar 2023 16:52:17 +0530 Subject: Updated SRCREV for 2023.1_5359 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 87a51983..e258af5c 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "e409860b5c5e78417eccf058261a6f00dc29a44a" +SRCREV = "4d9224895c20772cc2b9a6f9bf7926b846cde1c5" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 4fe527b6..97099378 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "b9eb8a0b4cf7372dfa7bec75a7684250680eab29" +ESW_REV[2023.1] = "0766639ebcb35fcd0851bcb337882446558d2c06" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From b5e90d2aa8c98c02112a6d74b6e617eb17e3c518 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 27 Mar 2023 16:00:52 +0530 Subject: Updated SRCREV for 2023.1_8995 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 97099378..862aab92 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "0766639ebcb35fcd0851bcb337882446558d2c06" +ESW_REV[2023.1] = "e79da608e46888ac40a13f8d62bacb71be9143ab" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From b703a42e6fdd8616b9af71388ee9cd0a96b1a3f1 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 28 Mar 2023 12:51:15 +0530 Subject: Updated SRCREV for 2023.1_5199 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 862aab92..e02a2e42 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "e79da608e46888ac40a13f8d62bacb71be9143ab" +ESW_REV[2023.1] = "ea6d53a6156ca8060d18003388430e9aeb1d676f" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 58affd45adcbf87a70d89c331d96fafe79be06bf Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 29 Mar 2023 16:36:34 +0530 Subject: Updated SRCREV for 2023.1_8447 Signed-off-by: Siva Addepalli --- .../recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb index 91e9760c..454fbe86 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb @@ -1,5 +1,5 @@ ATF_VERSION = "2.8" -SRCREV = "81e24ae0b74742e5902aac9fba7fb7117f12664a" +SRCREV = "6fcc6b179dc14de0f6ba19a1829e597b60f7aee5" BRANCH = "xlnx_rebase_v2.8" LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 8be1de42..d47fc10c 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "e3bd0ec15583300d1ae3babc43b6fbd2a141e7ad" +SRCREV = "421f19b8bd9659dbbfea3d9252c93633de642134" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index e02a2e42..1735c51c 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "ea6d53a6156ca8060d18003388430e9aeb1d676f" +ESW_REV[2023.1] = "2aafc903aa8430f169f2a4a20ec5efa15fe32961" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 246f2a6145aad5ee3c8e9a08febf5c302df3b22c Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 30 Mar 2023 16:01:43 +0530 Subject: Updated SRCREV for 2023.1_7463 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index fd51561a..01082966 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" UBRANCH = "xlnx_rebase_v2023.01" -SRCREV = "8624651f9ae49d326e29d9ec9a80a881a769640a" +SRCREV = "40a08d69e749c0472103551c85c02c41f979453d" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 1735c51c..d968c32a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "2aafc903aa8430f169f2a4a20ec5efa15fe32961" +ESW_REV[2023.1] = "6e115bf7dd9729621f82a9c5f5c7346728ddfab5" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 97f93ad0648519e7770f56ff1316fd4bfd76ae01 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 31 Mar 2023 15:08:33 +0530 Subject: Updated SRCREV for 2023.1_9395 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index d968c32a..5ce8ddd1 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "6e115bf7dd9729621f82a9c5f5c7346728ddfab5" +ESW_REV[2023.1] = "752c50f83dd46c6e30325a5d550bd3c4b5dc55d3" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 78cacd09f1578ead91815dc67351df0b4c075634 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 4 Apr 2023 15:23:11 +0530 Subject: Updated SRCREV for 2023.1_9027 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 5ce8ddd1..6474dd22 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "752c50f83dd46c6e30325a5d550bd3c4b5dc55d3" +ESW_REV[2023.1] = "cb7af9c855370ff4576f4beb1f1fcb6f8293d50b" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From d3481de271a170b43dfdd2badf10dc102381b404 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 6 Apr 2023 12:50:40 +0530 Subject: Updated SRCREV for 2023.1_4191 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc index faa36026..16cc64fa 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc @@ -3,7 +3,7 @@ SECTION = "libs" REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https" BRANCH ?= "xlnx_rel_v2023.1" -SRCREV ?= "d38076ebe407cf53f73ab15b9e6947937f0430ae" +SRCREV ?= "4368b65e3ac1ecdc6dc24ae31e01d57cd02cce0d" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM ?= "file://license.txt;md5=b81abf1f508952331dd7d2ab36408f5b" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 6474dd22..e51599de 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "cb7af9c855370ff4576f4beb1f1fcb6f8293d50b" +ESW_REV[2023.1] = "61b7f3569eea652c085eb1385802515dd527e962" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 55a1b989030d3b6114d75a66481d0e744fa62115 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Sun, 9 Apr 2023 11:06:56 +0530 Subject: Updated SRCREV for 2023.1_5883 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index e51599de..9693ff95 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "61b7f3569eea652c085eb1385802515dd527e962" +ESW_REV[2023.1] = "310a6b20fc1f5149c34a9f8465ffcffedb9ccf21" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From edefcd2e199131cee98aa8788fca9f28b794dd82 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 20 Apr 2023 13:19:37 +0530 Subject: Updated SRCREV for 2023.1_5299 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 53352d41..1e661638 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb @@ -1,7 +1,7 @@ LINUX_VERSION = "6.1.5" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "775101cac2889f9a39b39954ce1ee5db4212b631" +SRCREV = "4cb76a1bc5220131b5a4f85460b43f09ad1611e9" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 9693ff95..0be0ead6 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "310a6b20fc1f5149c34a9f8465ffcffedb9ccf21" +ESW_REV[2023.1] = "f3857dc0cb6adfe40c3deb12062eaa2dfeb0eb17" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 94add4258a4e5cc8b2e5ee5e76a592ff6fb8718a Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Fri, 21 Apr 2023 11:03:53 +0530 Subject: Updated SRCREV for 2023.1_6227 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 0be0ead6..ed9445c5 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "f3857dc0cb6adfe40c3deb12062eaa2dfeb0eb17" +ESW_REV[2023.1] = "23a4741bd519699e9b4c641c280529ff160cd674" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 2f4ccec0bebac4a1a3f070f7cde6fe6ff39f81e2 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 26 Apr 2023 12:19:49 +0530 Subject: Updated SRCREV for 2023.1_7943 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index ed9445c5..9257901e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "23a4741bd519699e9b4c641c280529ff160cd674" +ESW_REV[2023.1] = "033d75b405953d2aba0e7a6e85bbcf4d93f5b127" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 2d11f9db1bafbee073e79b2bc90a036f2e12e8ea Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Wed, 26 Apr 2023 12:47:02 +0530 Subject: Updated SRCREV for 2023.1_5363 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 9257901e..e020b7a6 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -13,7 +13,7 @@ EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH' EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" -LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = '15386ea7656d3b83815bce88c0bbe66d' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = '3c310a3ee2197a4c92c6a0e2937c207c' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From 2ba0c89b9aae7459b3d9e3c328c1db3fea4dc617 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 27 Apr 2023 13:42:59 -0500 Subject: xlnx-embeddedsw: Move to release branch and commit Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index e020b7a6..5ea2e088 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -3,17 +3,17 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master' REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" -ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" +ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "033d75b405953d2aba0e7a6e85bbcf4d93f5b127" +ESW_REV[2023.1] = "e24fe92b5517ee447e560790e798cad792f53bab" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" -LIC_FILES_CHKSUM[xlnx_rel_v2023.1-next] = '3c310a3ee2197a4c92c6a0e2937c207c' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1] = '3c310a3ee2197a4c92c6a0e2937c207c' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From d4732aa636e6764c64030083a20975283c2352d5 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 1 May 2023 12:51:02 +0530 Subject: Updated SRCREV for 2023.1_5339 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 5ea2e088..e74e7dfa 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -6,7 +6,7 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" -ESW_REV[2023.1] = "e24fe92b5517ee447e560790e798cad792f53bab" +ESW_REV[2023.1] = "86f54b77641f325042a1101fead96b2714e6d3ef" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf