From afc541e9833850ebaa28494ec1d5924479b13d22 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 19 Oct 2023 12:08:50 -0500 Subject: meta-xilinx-standalone-experimental: Remove custom ESW repository The experimental support has been merged into the base ESW repository defined in meta-xilinx-standalone. Signed-off-by: Mark Hatle --- meta-xilinx-standalone-experimental/classes/esw.bbclass | 3 --- .../conf/dtb-embeddedsw.inc | 14 -------------- .../recipes-bsp/embeddedsw/esw-conf_2024.1.bb | 3 --- 3 files changed, 20 deletions(-) delete mode 100644 meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index a597a81c..2f4d7277 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass @@ -2,9 +2,6 @@ PV = "${ESW_VER}" inherit python3native xlnx-embeddedsw pkgconfig cmake -# Override xlnx-embeddedsw with out version -require conf/dtb-embeddedsw.inc - SRCREV_FORMAT = "src_decouple" S = "${WORKDIR}/git" diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc deleted file mode 100644 index 2ddb173d..00000000 --- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc +++ /dev/null @@ -1,14 +0,0 @@ -# The format of this file must be compatible with -# meta-xilinx/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass - -# Make it clear decoupling is 'experimental' in the version -ESW_VER = "2023_sdt_experimental" - -REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https" - -ESW_BRANCH[2023_sdt_experimental] = "xlnx_rel_v2023.2_sdt" -ESW_REV[2023_sdt_experimental] = "742a608800e7621fb7c376daf5124333b5826d6d" -LIC_FILES_CHKSUM[master] = '7c92de7a21a6613265035c28f4a92f48' -LIC_FILES_CHKSUM[xlnx_rel_v2022.1_sdt_experimental_beta] = 'e26f53a7d6f58f4b1a9687099417225c' -LIC_FILES_CHKSUM[xlnx_rel_v2023.1_sdt_experimental] = 'ce611484168a6000bd35df68fc4f4290' -LIC_FILES_CHKSUM[xlnx_rel_v2023.2_sdt] = 'ce611484168a6000bd35df68fc4f4290' diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb index e6cf1d8b..f99db010 100644 --- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb +++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb @@ -1,9 +1,6 @@ # Can't depend on esw since this is needed for setup! inherit xlnx-embeddedsw -# We need to override the inherit -require conf/dtb-embeddedsw.inc - S = "${WORKDIR}/git" B = "${WORKDIR}/build" -- cgit v1.2.3-54-g00ecf