| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Apr 05 15:28:33 2019 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Apr 05 19:31:28 2019 +0000 |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b [diff] |
reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
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 17041e4..0000000 --- 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 225fa65..cbfa47b 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_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 847e071..3432c1f 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 @@ # 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}"