diff options
Diffstat (limited to 'meta-xilinx')
3 files changed, 4 insertions, 5 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc deleted file mode 100644 index 17041e41af..0000000000 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc +++ /dev/null @@ -1,4 +0,0 @@ -# Default Xilinx Board settings - -EXTRA_IMAGEDEPENDS += "virtual/bootloader" - diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc index 225fa65cfe..cbfa47b892 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc @@ -8,7 +8,7 @@ SOC_FAMILY ?= "zynqmp" SOC_VARIANT ?= "eg" -require conf/machine/include/arm/arch-armv8.inc +require conf/machine/include/arm/arch-armv8a.inc require conf/machine/include/soc-family.inc # Linux Configuration diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb index 847e07187f..3432c1f2dd 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb +++ b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb @@ -23,6 +23,9 @@ do_configure() { # manually do the copy_bsp step first, so as to be able to fix up use of # mb-* commands ${S}/../misc/copy_bsp.sh + + # fix xilfpga to include the zynqmp backend + mv ${S}/../misc/zynqmp_pmufw_bsp/psu_pmu_0/libsrc/xilfpga/src/interface/zynqmp/* ${S}/../misc/zynqmp_pmufw_bsp/psu_pmu_0/libsrc/xilfpga/src } COMPILER = "${CC}" |