diff options
3 files changed, 0 insertions, 20 deletions
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}" | |||
2 | 2 | ||
3 | inherit python3native xlnx-embeddedsw pkgconfig cmake | 3 | inherit python3native xlnx-embeddedsw pkgconfig cmake |
4 | 4 | ||
5 | # Override xlnx-embeddedsw with out version | ||
6 | require conf/dtb-embeddedsw.inc | ||
7 | |||
8 | SRCREV_FORMAT = "src_decouple" | 5 | SRCREV_FORMAT = "src_decouple" |
9 | 6 | ||
10 | S = "${WORKDIR}/git" | 7 | 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 @@ | |||
1 | # The format of this file must be compatible with | ||
2 | # meta-xilinx/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | ||
3 | |||
4 | # Make it clear decoupling is 'experimental' in the version | ||
5 | ESW_VER = "2023_sdt_experimental" | ||
6 | |||
7 | REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https" | ||
8 | |||
9 | ESW_BRANCH[2023_sdt_experimental] = "xlnx_rel_v2023.2_sdt" | ||
10 | ESW_REV[2023_sdt_experimental] = "742a608800e7621fb7c376daf5124333b5826d6d" | ||
11 | LIC_FILES_CHKSUM[master] = '7c92de7a21a6613265035c28f4a92f48' | ||
12 | LIC_FILES_CHKSUM[xlnx_rel_v2022.1_sdt_experimental_beta] = 'e26f53a7d6f58f4b1a9687099417225c' | ||
13 | LIC_FILES_CHKSUM[xlnx_rel_v2023.1_sdt_experimental] = 'ce611484168a6000bd35df68fc4f4290' | ||
14 | 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 @@ | |||
1 | # Can't depend on esw since this is needed for setup! | 1 | # Can't depend on esw since this is needed for setup! |
2 | inherit xlnx-embeddedsw | 2 | inherit xlnx-embeddedsw |
3 | 3 | ||
4 | # We need to override the inherit | ||
5 | require conf/dtb-embeddedsw.inc | ||
6 | |||
7 | S = "${WORKDIR}/git" | 4 | S = "${WORKDIR}/git" |
8 | B = "${WORKDIR}/build" | 5 | B = "${WORKDIR}/build" |
9 | 6 | ||