From 012289df614b30b414a7f5f5269f9f93ea760f26 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 14:23:06 -0500 Subject: openamp: Add in development 2023.1 version Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 33dd732c..6350fecc 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -16,6 +16,8 @@ chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bbappend \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ +openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bb \ +openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bbappend \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bb \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bbappend \ xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bb \ -- cgit v1.2.3-54-g00ecf From 7716b3c31fdd8fd98518f943fa9b556af3942de1 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 17:23:36 -0700 Subject: pmu-rom-native: This is a binary download, remove versioning Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 1 - .../recipes-bsp/pmu-firmware/pmu-rom-native.bb | 27 ++++++++++++++++++++++ .../pmu-firmware/pmu-rom-native_2022.1.bb | 27 ---------------------- .../pmu-firmware/pmu-rom-native_2022.2.bb | 27 ---------------------- 4 files changed, 27 insertions(+), 55 deletions(-) create mode 100644 meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb delete mode 100644 meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.2.bb (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 6350fecc..42d74d6c 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -56,5 +56,4 @@ PREFERRED_VERSION_qemu-xilinx-system-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_V PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" PREFERRED_VERSION_arm-trusted-firmware ?= "2.6-xilinx-${XILINX_RELEASE_VERSION}%" PREFERRED_VERSION_u-boot-xlnx ?= "v2021.01-xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_VERSION_pmu-rom-native ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}" PREFERRED_VERSION_linux-xlnx ?= "${@'5.15.19' if d.getVar("XILINX_RELEASE_VERSION") == 'v2022.1' else '5.15.36'}%" diff --git a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb new file mode 100644 index 00000000..44ad9368 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb @@ -0,0 +1,27 @@ +SUMMARY = "PMU ROM for QEMU" +DESCRIPTION = "The ZynqMP PMU ROM for QEMU emulation" +HOMEPAGE = "http://www.xilinx.com" +SECTION = "bsp" + +LICENSE = "Proprietary" +LICENSE_FLAGS = "xilinx" +LIC_FILES_CHKSUM = "file://PMU_ROM-LICENSE.txt;md5=d43d49bc1eb1c907fc6f4ea75abafdfc" + +SRC_URI = "https://www.xilinx.com/bin/public/openDownload?filename=PMU_ROM.tar.gz" +SRC_URI[sha256sum] = "f9a450ef960979463ea0a87a35fafb4a5b62d3a741de30cbcef04c8edc22a7cf" + +S = "${WORKDIR}/PMU_ROM" + +inherit deploy native + +INHIBIT_DEFAULT_DEPS = "1" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_install[noexec] = "1" + +do_deploy () { + install -D ${S}/pmu-rom.elf ${DEPLOYDIR}/pmu-rom.elf +} + +addtask deploy before do_build after do_install diff --git a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.1.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.1.bb deleted file mode 100644 index 44ad9368..00000000 --- a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "PMU ROM for QEMU" -DESCRIPTION = "The ZynqMP PMU ROM for QEMU emulation" -HOMEPAGE = "http://www.xilinx.com" -SECTION = "bsp" - -LICENSE = "Proprietary" -LICENSE_FLAGS = "xilinx" -LIC_FILES_CHKSUM = "file://PMU_ROM-LICENSE.txt;md5=d43d49bc1eb1c907fc6f4ea75abafdfc" - -SRC_URI = "https://www.xilinx.com/bin/public/openDownload?filename=PMU_ROM.tar.gz" -SRC_URI[sha256sum] = "f9a450ef960979463ea0a87a35fafb4a5b62d3a741de30cbcef04c8edc22a7cf" - -S = "${WORKDIR}/PMU_ROM" - -inherit deploy native - -INHIBIT_DEFAULT_DEPS = "1" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_install[noexec] = "1" - -do_deploy () { - install -D ${S}/pmu-rom.elf ${DEPLOYDIR}/pmu-rom.elf -} - -addtask deploy before do_build after do_install diff --git a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.2.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.2.bb deleted file mode 100644 index 44ad9368..00000000 --- a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native_2022.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "PMU ROM for QEMU" -DESCRIPTION = "The ZynqMP PMU ROM for QEMU emulation" -HOMEPAGE = "http://www.xilinx.com" -SECTION = "bsp" - -LICENSE = "Proprietary" -LICENSE_FLAGS = "xilinx" -LIC_FILES_CHKSUM = "file://PMU_ROM-LICENSE.txt;md5=d43d49bc1eb1c907fc6f4ea75abafdfc" - -SRC_URI = "https://www.xilinx.com/bin/public/openDownload?filename=PMU_ROM.tar.gz" -SRC_URI[sha256sum] = "f9a450ef960979463ea0a87a35fafb4a5b62d3a741de30cbcef04c8edc22a7cf" - -S = "${WORKDIR}/PMU_ROM" - -inherit deploy native - -INHIBIT_DEFAULT_DEPS = "1" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_install[noexec] = "1" - -do_deploy () { - install -D ${S}/pmu-rom.elf ${DEPLOYDIR}/pmu-rom.elf -} - -addtask deploy before do_build after do_install -- cgit v1.2.3-54-g00ecf From 4844bb6668ef6b3fb94830bfd54bfa04205595b3 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 19:35:54 -0700 Subject: layer.conf: Revise the PREFERRED_VERSION operations Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 42d74d6c..6e6045be 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -50,10 +50,26 @@ XILINX_RELEASE_VERSION ??= "v2022.2" BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION" -PREFERRED_VERSION_qemu-xilinx ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_VERSION_qemu-xilinx-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_VERSION_qemu-xilinx-system-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" +XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" +XILINX_QEMU_VERSION[v2023.1] = "v6.1.0-xilinx-v2023.1%" +PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" +PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" +PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_VERSION_arm-trusted-firmware ?= "2.6-xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_VERSION_u-boot-xlnx ?= "v2021.01-xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_VERSION_linux-xlnx ?= "${@'5.15.19' if d.getVar("XILINX_RELEASE_VERSION") == 'v2022.1' else '5.15.36'}%" + +XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%" +XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%" +XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" +PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" + +XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" +XILINX_UBOOT_VERSION[v2022.2] = "v2021.01-xilinx-v2022.2%" +XILINX_UBOOT_VERSION[v2023.1] = "v2021.01-xilinx-v2023.1%" + +PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" + +XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" +XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" +XILINX_LINUX_VERSION[v2023.1] = "5.15.0-xilinx-v2023.1%" +PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" -- cgit v1.2.3-54-g00ecf From fd3b24af4b5f6e78b917752557daa09c4f9a054c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 19:57:07 -0700 Subject: layer.conf: Move XILINX_RELEASE_VERSION to 2023.1 Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 6e6045be..8b6dff9a 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -46,7 +46,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ *->xserver-xorg \ " -XILINX_RELEASE_VERSION ??= "v2022.2" +XILINX_RELEASE_VERSION ??= "v2023.1" BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION" -- cgit v1.2.3-54-g00ecf From bb779bb4c241ba4b04c0b9609aeb861e03550c00 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 14 Nov 2022 11:20:20 -0800 Subject: meta-xilinx-core: layer.conf: Temporarily set ATG for the 2022.2 version Due to issues with xlnx_rebase_v2.8, we revert back to xlnx_rebase_v2.6, which is the 2022.2 version. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 0bc04c75..bd5848cd 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -60,7 +60,7 @@ PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%" XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%" -XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" +XILINX_ATF_VERSION[v2023.1] = "2.6-xilinx-v2022.2%" PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" -- cgit v1.2.3-54-g00ecf From 664913cec261af758ae6c44dd046b87d11d049bf Mon Sep 17 00:00:00 2001 From: Raju Kumar Pothuraju Date: Wed, 16 Nov 2022 17:04:36 +0530 Subject: layer.conf: Gen-machine-conf support Update layer.conf file to export the gen-machine-conf PATH. gen-machine-conf bbclass is to update the PATH in esdk. Signed-off-by: Raju Kumar Pothuraju Change from INHERIT to IMAGE_CLASSES Signed-off-by: Mark Hatle --- meta-xilinx-core/classes/gen-machine-conf.bbclass | 6 ++++++ meta-xilinx-core/conf/layer.conf | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 meta-xilinx-core/classes/gen-machine-conf.bbclass (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/classes/gen-machine-conf.bbclass b/meta-xilinx-core/classes/gen-machine-conf.bbclass new file mode 100644 index 00000000..d1b46f48 --- /dev/null +++ b/meta-xilinx-core/classes/gen-machine-conf.bbclass @@ -0,0 +1,6 @@ +#Add scripts path with the tools to PATH to be able to use from eSDK +sdk_ext_postinst:append() { + if [ -d $target_sdk_dir/layers/meta-xilinx/gen-machine-conf ]; then + echo "export PATH=$target_sdk_dir/layers/meta-xilinx/gen-machine-conf:\$PATH" >> $env_setup_script + fi +} diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index bd5848cd..c90b19da 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -73,3 +73,7 @@ XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" XILINX_LINUX_VERSION[v2023.1] = "5.15.0-xilinx-v2023.1%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" + +# Add support to eSDK for gen-machine-conf if it exists +PLNX_SCRIPTS_PATH = "${LAYERDIR}/../gen-machine-conf/gen-machine-scripts" +IMAGE_CLASSES += "gen-machine-conf" -- cgit v1.2.3-54-g00ecf From 072981c562718c53f3b31084d43bb139792b48fd Mon Sep 17 00:00:00 2001 From: Raju Kumar Pothuraju Date: Fri, 18 Nov 2022 20:16:13 +0530 Subject: Move gen-machine-conf to meta-xilinx-core meta-xilinx/gen-machine-conf will not packed into eSDK as its not a layer moving to meta-xilinx-core. Signed-off-by: Raju Kumar Pothuraju Added a symlink for the gen-machine-conf directory Signed-off-by: Mark Hatle --- .gitmodules | 2 +- gen-machine-conf | 2 +- meta-xilinx-core/classes/gen-machine-conf.bbclass | 4 ++-- meta-xilinx-core/conf/layer.conf | 2 +- meta-xilinx-core/gen-machine-conf | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) mode change 160000 => 120000 gen-machine-conf create mode 160000 meta-xilinx-core/gen-machine-conf (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/.gitmodules b/.gitmodules index c4f27225..23c05b53 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "gen-machine-conf"] - path = gen-machine-conf + path = meta-xilinx-core/gen-machine-conf url = https://gitenterprise.xilinx.com/Petalinux/gen-machine-conf.git branch = master diff --git a/gen-machine-conf b/gen-machine-conf deleted file mode 160000 index 9d58879b..00000000 --- a/gen-machine-conf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d58879b496d0f9bcd26d11658d96a4eaf8c45d2 diff --git a/gen-machine-conf b/gen-machine-conf new file mode 120000 index 00000000..3fe520d6 --- /dev/null +++ b/gen-machine-conf @@ -0,0 +1 @@ +meta-xilinx-core/gen-machine-conf \ No newline at end of file diff --git a/meta-xilinx-core/classes/gen-machine-conf.bbclass b/meta-xilinx-core/classes/gen-machine-conf.bbclass index d1b46f48..25960cd1 100644 --- a/meta-xilinx-core/classes/gen-machine-conf.bbclass +++ b/meta-xilinx-core/classes/gen-machine-conf.bbclass @@ -1,6 +1,6 @@ #Add scripts path with the tools to PATH to be able to use from eSDK sdk_ext_postinst:append() { - if [ -d $target_sdk_dir/layers/meta-xilinx/gen-machine-conf ]; then - echo "export PATH=$target_sdk_dir/layers/meta-xilinx/gen-machine-conf:\$PATH" >> $env_setup_script + if [ -d $target_sdk_dir/layers/meta-xilinx/meta-xilinx-core/gen-machine-conf ]; then + echo "export PATH=$target_sdk_dir/layers/meta-xilinx/meta-xilinx-core/gen-machine-conf:\$PATH" >> $env_setup_script fi } diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index c90b19da..70b0c682 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -75,5 +75,5 @@ XILINX_LINUX_VERSION[v2023.1] = "5.15.0-xilinx-v2023.1%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" # Add support to eSDK for gen-machine-conf if it exists -PLNX_SCRIPTS_PATH = "${LAYERDIR}/../gen-machine-conf/gen-machine-scripts" +PLNX_SCRIPTS_PATH = "${LAYERDIR}/gen-machine-conf/gen-machine-scripts" IMAGE_CLASSES += "gen-machine-conf" diff --git a/meta-xilinx-core/gen-machine-conf b/meta-xilinx-core/gen-machine-conf new file mode 160000 index 00000000..9d58879b --- /dev/null +++ b/meta-xilinx-core/gen-machine-conf @@ -0,0 +1 @@ +Subproject commit 9d58879b496d0f9bcd26d11658d96a4eaf8c45d2 -- cgit v1.2.3-54-g00ecf From 433d7867f7a28d96688399d0cd837e73cddf6f78 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 25 Nov 2022 10:58:30 -0600 Subject: Drop meta-browser support Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 4 +--- .../recipes-browser/chromium/chromium-x11_%.bbappend | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 70b0c682..26e1c49b 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -12,8 +12,6 @@ BBFILE_PRIORITY_xilinx = "5" BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bbappend \ -chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bb \ -chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bbappend \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bb \ @@ -25,7 +23,7 @@ xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend " LAYERDEPENDS_xilinx = "core" -LAYERRECOMMENDS_xilinx = "openembedded-layer chromium-browser-layer" +LAYERRECOMMENDS_xilinx = "openembedded-layer" LAYERSERIES_COMPAT_xilinx = "langdale" diff --git a/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend deleted file mode 100644 index 53475f64..00000000 --- a/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Has a dependency on libmali -PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf From 7c7b36b6386496005be4b1ff313377653e4b7ba7 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 30 Nov 2022 16:24:16 -0600 Subject: meta-xilinx-core: Move to ATF 2.8 2023.1 version Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 26e1c49b..7663ce2f 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -58,7 +58,7 @@ PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%" XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%" -XILINX_ATF_VERSION[v2023.1] = "2.6-xilinx-v2022.2%" +XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" -- cgit v1.2.3-54-g00ecf From 2cd661a8e5920599c88a988b7bece107a09b37f8 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 14 Dec 2022 10:31:50 -0600 Subject: linux-xlnx: Move 2023.1 version to Linux 6.1.0 Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- .../recipes-kernel/linux/linux-microblaze.inc | 1 - .../mb-no-tree-loop-distribute-patterns.patch | 47 ---------------------- .../recipes-kernel/linux/linux-xlnx_2023.1.bb | 6 ++- 4 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 7663ce2f..e8145be8 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -69,7 +69,7 @@ PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getV XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" -XILINX_LINUX_VERSION[v2023.1] = "5.15.0-xilinx-v2023.1%" +XILINX_LINUX_VERSION[v2023.1] = "6.1.0-xilinx-v2023.1%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" # Add support to eSDK for gen-machine-conf if it exists diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc b/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc index efd21a18..96c801f1 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc @@ -1,5 +1,4 @@ SRC_URI += " \ - file://mb-no-tree-loop-distribute-patterns.patch \ file://microblaze_generic.cfg \ " diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch deleted file mode 100644 index 5a4d203d..00000000 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch +++ /dev/null @@ -1,47 +0,0 @@ -Disable tree-loop-distribute-patterns CFLAG - -Issue: CR-1086247 - -GCC 10.2.0 added -ftree-loop-distribute-patterns by default with -O2. This -is causing a condition where the kernel will no longer boot. - -This is a temporary workaround until we can identify the true cause of -the boot failure. - -Symtoms: - -earlycon: uartlite_a0 at MMIO 0x40600000 (options '115200n8') -printk: bootconsole [uartlite_a0] enabled -cma: Reserved 16 MiB at 0xaec00000 -Linux version 5.10.0-xilinx-v2020.2 (oe-user@oe-host) (microblazeel-xilinx-linux-gcc (GCC) 10.2.0, GNU ld (GNU Binutils) 2.35.0.20200730) #1 Mon Mar 1 12:58:36 UTC 2021 -setup_memory: max_mapnr: 0x40000 -setup_memory: min_low_pfn: 0x80000 -setup_memory: max_low_pfn: 0xb0000 -setup_memory: max_pfn: 0xc0000 -Zone ranges: - DMA [mem 0x0000000080000000-0x00000000afffffff] - Normal empty - HighMem [mem 0x00000000b0000000-0x00000000bfffffff] -Movable zone start for each node -Early memory node ranges - node 0: [mem 0x0000000080000000-0x00000000bfffffff] -Initmem setup node 0 [mem 0x0000000080000000-0x00000000bfffffff] - - -Signed-off-by: Mark Hatle - -diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile -index bb980891816d..e368c35ad21c 100644 ---- a/arch/microblaze/Makefile -+++ b/arch/microblaze/Makefile -@@ -48,6 +48,10 @@ CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) - # r31 holds current when in kernel mode - KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2) - -+# GCC 10.x now has -ftree-loop-distribute-patterns by default in -O2 -+# This causes a boot failure, so disable it -+KBUILD_CFLAGS += -fno-tree-loop-distribute-patterns -+ - head-y := arch/microblaze/kernel/head.o - libs-y += arch/microblaze/lib/ - core-y += arch/microblaze/kernel/ 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 5a1a85db..3fc51ac1 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,8 @@ -LINUX_VERSION = "5.15.0" +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 = "a876c5230ea6ad568ddf2443bdf0e05c655a0236" +SRCREV = "bdf00302ed29141c201e9c05b7338db698b2dce9" +SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" -- cgit v1.2.3-54-g00ecf From 38a28f24d52ce2bfb608e544dc943c68982e8a0a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 22 Dec 2022 02:32:16 -0800 Subject: qemu-xilinx: Refactor to enable qemu 2023.1 ver 7.1 Refactor QEMU integration as the versions now match the Langdale core version. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- .../recipes-devtools/qemu/files/cross.patch | 40 ---------------------- .../recipes-devtools/qemu/qemu-xilinx-2023.1.inc | 5 ++- .../qemu/qemu-xilinx-6.1.0/cross.patch | 40 ++++++++++++++++++++++ .../qemu/qemu-xilinx-7.1.0/cross.patch | 38 ++++++++++++++++++++ .../recipes-devtools/qemu/qemu-xilinx-7.1.inc | 32 +++++++++++++++++ .../qemu/qemu-xilinx-native-7.1.inc | 4 +++ .../qemu/qemu-xilinx-native_2023.1.bb | 2 +- .../qemu/qemu-xilinx-system-native_2023.1.bb | 5 ++- .../recipes-devtools/qemu/qemu-xilinx.inc | 2 +- .../recipes-devtools/qemu/qemu-xilinx_2023.1.bb | 2 +- 11 files changed, 122 insertions(+), 50 deletions(-) delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/files/cross.patch create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index e8145be8..6c1c2423 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -50,7 +50,7 @@ BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" -XILINX_QEMU_VERSION[v2023.1] = "v6.1.0-xilinx-v2023.1%" +XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%" PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch deleted file mode 100644 index bdb77ec7..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Tue, 5 Jan 2021 23:00:14 +0000 -Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0 - -We need to be able to trigger configure's cross code but we don't want -to set cross_prefix as it does other things we don't want. Patch things -so we can do what we need in the target config case. - -Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] -Signed-off-by: Richard Purdie ---- - configure | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/configure b/configure -index 9a79a004d..563b7827f 100755 ---- a/configure -+++ b/configure -@@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then - fi - echo "strip = [$(meson_quote $strip)]" >> $cross - echo "windres = [$(meson_quote $windres)]" >> $cross -- if test "$cross_compile" = "yes"; then - cross_arg="--cross-file config-meson.cross" - echo "[host_machine]" >> $cross - if test "$mingw32" = "yes" ; then -@@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then - else - echo "endian = 'little'" >> $cross - fi -- else -- cross_arg="--native-file config-meson.cross" -- fi - mv $cross config-meson.cross - - rm -rf meson-private meson-info meson-logs --- -2.17.1 - 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 fc5689bf..97e2a094 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,4 +1,3 @@ -XILINX_QEMU_VERSION = "v6.1.0" +XILINX_QEMU_VERSION = "v7.1.0" BRANCH = "master" -SRCREV = "fe535c44759cc43a4beea9b08a66c2ba869add7b" - +SRCREV = "ed2e270398ef10d8a40cf26eb2bd7704e24fe451" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch new file mode 100644 index 00000000..bdb77ec7 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch @@ -0,0 +1,40 @@ +From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 5 Jan 2021 23:00:14 +0000 +Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0 + +We need to be able to trigger configure's cross code but we don't want +to set cross_prefix as it does other things we don't want. Patch things +so we can do what we need in the target config case. + +Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] +Signed-off-by: Richard Purdie +--- + configure | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure b/configure +index 9a79a004d..563b7827f 100755 +--- a/configure ++++ b/configure +@@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then + fi + echo "strip = [$(meson_quote $strip)]" >> $cross + echo "windres = [$(meson_quote $windres)]" >> $cross +- if test "$cross_compile" = "yes"; then + cross_arg="--cross-file config-meson.cross" + echo "[host_machine]" >> $cross + if test "$mingw32" = "yes" ; then +@@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then + else + echo "endian = 'little'" >> $cross + fi +- else +- cross_arg="--native-file config-meson.cross" +- fi + mv $cross config-meson.cross + + rm -rf meson-private meson-info meson-logs +-- +2.17.1 + diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch new file mode 100644 index 00000000..ca2ad361 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch @@ -0,0 +1,38 @@ +From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 5 Jan 2021 23:00:14 +0000 +Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0 + +We need to be able to trigger configure's cross code but we don't want +to set cross_prefix as it does other things we don't want. Patch things +so we can do what we need in the target config case. + +Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] +Signed-off-by: Richard Purdie + +--- + configure | 4 ---- + 1 file changed, 4 deletions(-) + +Index: qemu-7.1.0/configure +=================================================================== +--- qemu-7.1.0.orig/configure ++++ qemu-7.1.0/configure +@@ -2710,7 +2710,6 @@ if test "$skip_meson" = no; then + echo "strip = [$(meson_quote $strip)]" >> $cross + echo "widl = [$(meson_quote $widl)]" >> $cross + echo "windres = [$(meson_quote $windres)]" >> $cross +- if test "$cross_compile" = "yes"; then + cross_arg="--cross-file config-meson.cross" + echo "[host_machine]" >> $cross + echo "system = '$targetos'" >> $cross +@@ -2728,9 +2727,6 @@ if test "$skip_meson" = no; then + else + echo "endian = 'little'" >> $cross + fi +- else +- cross_arg="--native-file config-meson.cross" +- fi + mv $cross config-meson.cross + + rm -rf meson-private meson-info meson-logs diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc new file mode 100644 index 00000000..595b988d --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc @@ -0,0 +1,32 @@ +SUMMARY = "Xilinx's fork of a fast open source processor emulator" +HOMEPAGE = "https://github.com/xilinx/qemu/" + +# x86_64 is needed to build nativesdks +QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64" + +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ + file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f \ + " +DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" + +FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-7.1.0:" + +PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" +REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" + +BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" +SRC_URI = "${REPO};${BRANCHARG}" + +SRC_URI:append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + fdt sdl kvm gcrypt pie slirp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ +" +PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm gcrypt pie slirp" + +DISABLE_STATIC:pn-${PN} = "" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc new file mode 100644 index 00000000..e664a580 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc @@ -0,0 +1,4 @@ +require recipes-devtools/qemu/qemu-native.inc +require qemu-xilinx-7.1.inc + +DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb index 04d91948..06711fd9 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb @@ -1,5 +1,5 @@ require qemu-xilinx-2023.1.inc -require qemu-xilinx-native.inc +require qemu-xilinx-native-7.1.inc require qemu-native-alt.inc BPN = "qemu-xilinx" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb index 1fb51cdd..1e738530 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb @@ -1,12 +1,12 @@ require qemu-system-native-alt.inc require qemu-xilinx-2023.1.inc -require qemu-xilinx-native.inc +require qemu-xilinx-native-7.1.inc PROVIDES = "qemu-system-native" EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" -PACKAGECONFIG ??= "fdt alsa kvm pie slirp" +PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp" PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" @@ -24,4 +24,3 @@ do_install:append() { 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.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index 7dc0b84b..788a3fe0 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ " DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-6.1.0:" PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb index 8bca9fdc..bc7b17b2 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb @@ -1,6 +1,6 @@ require qemu-xilinx-2023.1.inc require recipes-devtools/qemu/qemu.inc -require qemu-xilinx.inc +require qemu-xilinx-7.1.inc require qemu-alt.inc BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf From cb1d5159773f41b9778ad9631573e6fdb912c3eb Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 10 Jan 2023 09:28:30 -0800 Subject: u-boot-xlnx: Update 2023.1 version Add u-boot-tools-xlnx as well. Update the PREFERRED VERSION to select the new u-boot version, add preferred provider for u-boot-tools to be u-boot-tools-xlnx. Needed to split the microblaze configs to older and newer versions as well. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 3 +- .../machine/include/machine-xilinx-default.inc | 3 + .../recipes-bsp/u-boot/u-boot-tools%.bbappend | 23 ++++++ .../recipes-bsp/u-boot/u-boot-tools-xlnx.inc | 7 ++ .../recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb | 6 ++ .../u-boot-v2021.01/microblaze-generic-top.h | 10 +++ .../u-boot/u-boot-v2021.01/microblaze-generic.cfg | 81 +++++++++++++++++++++ .../u-boot-v2023.01/microblaze-generic-top.h | 8 +++ .../u-boot/u-boot-v2023.01/microblaze-generic.cfg | 83 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 17 +++++ .../recipes-bsp/u-boot/u-boot-xlnx-common.inc | 19 +++++ .../recipes-bsp/u-boot/u-boot-xlnx.inc | 22 +----- .../recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb | 21 +----- .../u-boot/u-boot/microblaze-generic-top.h | 10 --- .../u-boot/u-boot/microblaze-generic.cfg | 81 --------------------- 15 files changed, 265 insertions(+), 129 deletions(-) create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx.inc create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic-top.h create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic.cfg create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc create mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc delete mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic-top.h delete mode 100644 meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic.cfg (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 6c1c2423..a2c9438d 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -63,9 +63,10 @@ PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" XILINX_UBOOT_VERSION[v2022.2] = "v2021.01-xilinx-v2022.2%" -XILINX_UBOOT_VERSION[v2023.1] = "v2021.01-xilinx-v2023.1%" +XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%" PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" +PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index dc6ab05c..0cbd4249 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -16,6 +16,9 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx" # U-Boot Configuration PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" PREFERRED_PROVIDER_virtual/boot-bin ??= "xilinx-bootbin" +PREFERRED_PROVIDER_u-boot-tools ??= "u-boot-tools-xlnx" +PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native" +PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx" do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend new file mode 100644 index 00000000..65b6ad9d --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools%.bbappend @@ -0,0 +1,23 @@ +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for libmetal. This avoids network access required by +# the use of AUTOREV SRCREVs, which may be the default for some recipes. +python () { + if bb.data.inherits_class('native', d): + if (not d.getVar("PREFERRED_PROVIDER_u-boot-tools-native") and "u-boot-tools-native" != d.getVar("PN")) or \ + (d.getVar("PREFERRED_PROVIDER_u-boot-tools-native") and d.getVar("PREFERRED_PROVIDER_u-boot-tools-native") != d.getVar("PN")): + d.delVar("BB_DONT_CACHE") + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_u-boot-tools-native to %s to enable it" % (d.getVar("PN"))) + + elif bb.data.inherits_class('nativesdk', d): + if (not d.getVar("PREFERRED_PROVIDER_nativesdk-u-boot-tools") and "nativesdk-u-boot-tools" != d.getVar("PN")) or \ + (d.getVar("PREFERRED_PROVIDER_nativesdk-u-boot-tools") and d.getVar("PREFERRED_PROVIDER_nativesdk-u-boot-tools") != d.getVar("PN")): + d.delVar("BB_DONT_CACHE") + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_nativesdk-u-boot-tools to %s to enable it" % (d.getVar("PN"))) + + else: + if (not d.getVar("PREFERRED_PROVIDER_u-boot-tools") and "u-boot-tools" != d.getVar("PN")) or \ + (d.getVar("PREFERRED_PROVIDER_u-boot-tools") and d.getVar("PREFERRED_PROVIDER_u-boot-tools") != d.getVar("PN")): + d.delVar("BB_DONT_CACHE") + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_u-boot-tools to %s to enable it" % (d.getVar("PN"))) +} + diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx.inc new file mode 100644 index 00000000..af26594c --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx.inc @@ -0,0 +1,7 @@ +require recipes-bsp/u-boot/u-boot-common.inc +require recipes-bsp/u-boot/u-boot-tools.inc + +require u-boot-xlnx-common.inc + +PROVIDES:append = " u-boot-tools" +RPROVIDES:${PN}:append = " u-boot-tools" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb new file mode 100644 index 00000000..95f73164 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb @@ -0,0 +1,6 @@ +require u-boot-tools-xlnx.inc +require u-boot-xlnx-2023.1.inc + +# MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct +# bmp_logo.h +SED_CONFIG_EFI:append = ' -e "s/CONFIG_VIDEO=.*/# CONFIG_VIDEO is not set/"' diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h new file mode 100644 index 00000000..08c1c16c --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h @@ -0,0 +1,10 @@ +/* + * This file is use for addition u-boot configurations for microblaze. + */ +#include + +/* Core microblaze boot configurations */ +#define XILINX_USE_DCACHE 1 +#define CONFIG_CMD_IRQ +#define CONFIG_DCACHE +#define CONFIG_ICACHE \ No newline at end of file diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg new file mode 100644 index 00000000..0f784f73 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg @@ -0,0 +1,81 @@ +# SPDX-License-Identifier: MIT + +#........................................................................ +# WARNING +# +# This file is a u-boot configuration fragment, and not a full u-boot +# configuration file. The final u-boot configuration is made up of +# an assembly of processed fragments, each of which is designed to +# capture a specific part of the final configuration (e.g. platform +# configuration, feature configuration, and board specific hardware +# configuration). For more information on u-boot configuration, please +# refer the product documentation. +# +#....................................................................... + +# +# Definitions for Generic Microbalze machine. +# +CONFIG_BOOTDELAY=4 +CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_SYS_CONFIG_NAME="microblaze-generic-top" +CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000 +# CONFIG_SYS_NS16550 is not set +# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set +# CONFIG_SYS_FLASH_CFI is not set +# CONFIG_FLASH_CFI_DRIVER is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_MTD_NOR_FLASH is not set +# CONFIG_MTD_DEVICE is not set +# CONFIG_SYS_FLASH_PROTECTION is not set +# CONFIG_SPI_FLASH_SST is not set +# CONFIG_XILINX_EMACLITE is not set +# CONFIG_PHY_VITESSE is not set +# CONFIG_CMD_EXT2 is not set +# CONFIG_CMD_EXT4 is not set +# CONFIG_CMD_EXT4_WRITE is not set +# CONFIG_CMD_FAT is not set +# CONFIG_DOS_PARTITION is not set +# CONFIG_FAT_WRITE is not set +CONFIG_DM=y +CONFIG_SYS_MALLOC_F=y +CONFIG_XILINX_UARTLITE=y +CONFIG_XILINX_AXIEMAC=y +CONFIG_PHY_XILINX=y +CONFIG_PHY_TI=y +CONFIG_NET=y +CONFIG_PHY_GIGE=y +CONFIG_NETDEVICES=y +CONFIG_CMD_NET=y +CONFIG_DM_ETH=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_PHYLIB=y +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_NFS=y +CONFIG_CMD_MII=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_NATSEMI=y +CONFIG_XILINX_SPI=y +CONFIG_CMD_SPI=y +CONFIG_CMD_SF=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_DM_SPI_FLASH=y +CONFIG_DM_SPI=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI=y +CONFIG_SPI_FLASH_ISSI=y +# CONFIG_BOOTARGS is not set +# CONFIG_USE_BOOTARGS is not set +# CONFIG_SPL is not set +# CONFIG_I2C_EEPROM is not set +# CONFIG_CMD_EEPROM is not set +# CONFIG_SYS_I2C_EEPROM_ADDR is not set +# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic-top.h new file mode 100644 index 00000000..be823421 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic-top.h @@ -0,0 +1,8 @@ +/* + * This file is use for addition u-boot configurations for microblaze. + */ +#include + +/* Core microblaze boot configurations */ +#define XILINX_USE_ICACHE 1 +#define XILINX_USE_DCACHE 1 diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic.cfg new file mode 100644 index 00000000..a2ab516b --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2023.01/microblaze-generic.cfg @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: MIT + +#........................................................................ +# WARNING +# +# This file is a u-boot configuration fragment, and not a full u-boot +# configuration file. The final u-boot configuration is made up of +# an assembly of processed fragments, each of which is designed to +# capture a specific part of the final configuration (e.g. platform +# configuration, feature configuration, and board specific hardware +# configuration). For more information on u-boot configuration, please +# refer the product documentation. +# +#....................................................................... + +# +# Definitions for Generic Microbalze machine. +# +CONFIG_BOOTDELAY=4 +CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_SYS_CONFIG_NAME="microblaze-generic-top" +CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000 +# CONFIG_SYS_NS16550 is not set +# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set +# CONFIG_SYS_FLASH_CFI is not set +# CONFIG_FLASH_CFI_DRIVER is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_MTD_NOR_FLASH is not set +# CONFIG_MTD_DEVICE is not set +# CONFIG_SYS_FLASH_PROTECTION is not set +# CONFIG_SPI_FLASH_SST is not set +# CONFIG_XILINX_EMACLITE is not set +# CONFIG_PHY_VITESSE is not set +# CONFIG_CMD_EXT2 is not set +# CONFIG_CMD_EXT4 is not set +# CONFIG_CMD_EXT4_WRITE is not set +# CONFIG_CMD_FAT is not set +# CONFIG_DOS_PARTITION is not set +# CONFIG_FAT_WRITE is not set +CONFIG_DM=y +CONFIG_SYS_MALLOC_F=y +CONFIG_XILINX_UARTLITE=y +CONFIG_XILINX_AXIEMAC=y +CONFIG_PHY_XILINX=y +CONFIG_PHY_TI=y +CONFIG_NET=y +CONFIG_PHY_GIGE=y +CONFIG_NETDEVICES=y +CONFIG_CMD_NET=y +CONFIG_DM_ETH=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_PHYLIB=y +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_NFS=y +CONFIG_CMD_MII=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_NATSEMI=y +CONFIG_XILINX_SPI=y +CONFIG_CMD_SPI=y +CONFIG_CMD_SF=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_DM_SPI_FLASH=y +CONFIG_DM_SPI=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI=y +CONFIG_SPI_FLASH_ISSI=y +# CONFIG_BOOTARGS is not set +# CONFIG_USE_BOOTARGS is not set +# CONFIG_SPL is not set +# CONFIG_I2C_EEPROM is not set +# CONFIG_CMD_EEPROM is not set +# CONFIG_SYS_I2C_EEPROM_ADDR is not set +# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set +CONFIG_DCACHE=y +CONFIG_ICACHE=y 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 new file mode 100644 index 00000000..6ff4243f --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -0,0 +1,17 @@ +UBOOT_VERSION = "v2023.01" + +UBRANCH ?= "xlnx_rebase_v2023.01-next" + +SRCREV = "1fe11bde7b765024eb7a49584e7c65015ae90bac" + +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 \ + " + +DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc new file mode 100644 index 00000000..b447c92a --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc @@ -0,0 +1,19 @@ +# Use the name of the .bb for the extension +UBOOT_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}" +PV = "${UBOOT_VERSION}${UBOOT_VERSION_EXTENSION}+git${SRCPV}" + +UBOOTURI ?= "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https" +UBRANCH ?= "" +UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) != '']}" + +SRC_URI = "${UBOOTURI};${UBRANCHARG}" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-${UBOOT_VERSION}:" + +UBOOT_MB_INC = "" +UBOOT_MB_INC:microblaze = "u-boot-xlnx-microblaze.inc" +require ${UBOOT_MB_INC} + diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc index 183ebe31..38d8e492 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc @@ -1,25 +1,9 @@ +require recipes-bsp/u-boot/u-boot-common.inc require recipes-bsp/u-boot/u-boot.inc -DEPENDS += "bc-native dtc-native bison-native xxd-native" +DEPENDS += "bc-native dtc-native python3-setuptools-native bison-native xxd-native" -# Use the name of the .bb for the extension -UBOOT_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}" -PV = "${UBOOT_VERSION}${UBOOT_VERSION_EXTENSION}+git${SRCPV}" - -UBOOTURI ?= "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https" -UBRANCH ?= "" -UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) != '']}" - -SRC_URI = "${UBOOTURI};${UBRANCHARG}" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:" - -UBOOT_MB_INC = "" -UBOOT_MB_INC:microblaze = "u-boot-xlnx-microblaze.inc" -require ${UBOOT_MB_INC} +require u-boot-xlnx-common.inc SYSROOT_DIRS += "/boot" 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 9f2592d5..fd76bc51 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 @@ -1,19 +1,4 @@ -UBOOT_VERSION = "v2021.01" - -UBRANCH ?= "master" - -SRCREV = "d706060b431d6799d0564be6053f896cd6778ddb" - -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 \ - " +require u-boot-xlnx.inc +require u-boot-spl-zynq-init.inc +require u-boot-xlnx-2023.1.inc diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic-top.h deleted file mode 100644 index 08c1c16c..00000000 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic-top.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This file is use for addition u-boot configurations for microblaze. - */ -#include - -/* Core microblaze boot configurations */ -#define XILINX_USE_DCACHE 1 -#define CONFIG_CMD_IRQ -#define CONFIG_DCACHE -#define CONFIG_ICACHE \ No newline at end of file diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic.cfg deleted file mode 100644 index 0f784f73..00000000 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot/microblaze-generic.cfg +++ /dev/null @@ -1,81 +0,0 @@ -# SPDX-License-Identifier: MIT - -#........................................................................ -# WARNING -# -# This file is a u-boot configuration fragment, and not a full u-boot -# configuration file. The final u-boot configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on u-boot configuration, please -# refer the product documentation. -# -#....................................................................... - -# -# Definitions for Generic Microbalze machine. -# -CONFIG_BOOTDELAY=4 -CONFIG_SYS_TEXT_BASE=0x80100000 -CONFIG_SYS_PROMPT="U-Boot>" -CONFIG_SYS_CONFIG_NAME="microblaze-generic-top" -CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000 -# CONFIG_SYS_NS16550 is not set -# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set -# CONFIG_SYS_FLASH_CFI is not set -# CONFIG_FLASH_CFI_DRIVER is not set -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_IMLS is not set -# CONFIG_MTD_NOR_FLASH is not set -# CONFIG_MTD_DEVICE is not set -# CONFIG_SYS_FLASH_PROTECTION is not set -# CONFIG_SPI_FLASH_SST is not set -# CONFIG_XILINX_EMACLITE is not set -# CONFIG_PHY_VITESSE is not set -# CONFIG_CMD_EXT2 is not set -# CONFIG_CMD_EXT4 is not set -# CONFIG_CMD_EXT4_WRITE is not set -# CONFIG_CMD_FAT is not set -# CONFIG_DOS_PARTITION is not set -# CONFIG_FAT_WRITE is not set -CONFIG_DM=y -CONFIG_SYS_MALLOC_F=y -CONFIG_XILINX_UARTLITE=y -CONFIG_XILINX_AXIEMAC=y -CONFIG_PHY_XILINX=y -CONFIG_PHY_TI=y -CONFIG_NET=y -CONFIG_PHY_GIGE=y -CONFIG_NETDEVICES=y -CONFIG_CMD_NET=y -CONFIG_DM_ETH=y -CONFIG_CMD_PING=y -CONFIG_CMD_DHCP=y -CONFIG_PHYLIB=y -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_NFS=y -CONFIG_CMD_MII=y -CONFIG_PHY_MARVELL=y -CONFIG_PHY_REALTEK=y -CONFIG_PHY_NATSEMI=y -CONFIG_XILINX_SPI=y -CONFIG_CMD_SPI=y -CONFIG_CMD_SF=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_BAR=y -CONFIG_DM_SPI_FLASH=y -CONFIG_DM_SPI=y -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI=y -CONFIG_SPI_FLASH_ISSI=y -# CONFIG_BOOTARGS is not set -# CONFIG_USE_BOOTARGS is not set -# CONFIG_SPL is not set -# CONFIG_I2C_EEPROM is not set -# CONFIG_CMD_EEPROM is not set -# CONFIG_SYS_I2C_EEPROM_ADDR is not set -# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set -- cgit v1.2.3-54-g00ecf From ae8d2c3baa1f3213d90589322480614e21e36a71 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 9 Feb 2023 16:52:17 -0800 Subject: meta-xilinx-core: Adjust PREFERRED VERSION to match kernel Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index a2c9438d..350b1af1 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -70,7 +70,7 @@ PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" -XILINX_LINUX_VERSION[v2023.1] = "6.1.0-xilinx-v2023.1%" +XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" # Add support to eSDK for gen-machine-conf if it exists -- cgit v1.2.3-54-g00ecf From 4327da7545dd0760f802b99983f24f8625e8d783 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 9 Feb 2023 16:52:17 -0800 Subject: meta-xilinx-core: No longer ignore mesa, mesa-gl or virgl dependencies As we now support enabling for libmali and lima, we want to ensure that the components are rebuilt if/when we switch between the configurations. This is especially true on a non-graphics optimized part. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 3 --- 1 file changed, 3 deletions(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 350b1af1..57a76049 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -37,10 +37,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ *->libglu \ *->libsdl \ *->libsdl2 \ - *->mesa \ - *->mesa-gl \ *->qemu \ - *->virglrenderer \ *->xserver-xorg \ " -- cgit v1.2.3-54-g00ecf