From ab21befaf5d7da45bed6d3ce4de5cfdb17dabb99 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 16 Dec 2021 14:23:49 -0800 Subject: Move board specific items from meta-xilinx-tools Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/layer.conf | 9 ++++- .../conf/machine/include/board/ultra96.inc | 6 +++ .../recipes-bsp/device-tree/device-tree.bbappend | 44 ++++++++++++++++++++++ .../recipes-bsp/embeddedsw/pmu-firmware_%.bbappend | 4 ++ 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend create mode 100644 meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx-bsp/conf/layer.conf index 1fd6379a..b5bb3b19 100644 --- a/meta-xilinx-bsp/conf/layer.conf +++ b/meta-xilinx-bsp/conf/layer.conf @@ -5,10 +5,15 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" BBFILES += "${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES_DYNAMIC += " \ +xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bb \ +xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend \ +" + BBFILE_COLLECTIONS += "xilinx-bsp" BBFILE_PATTERN_xilinx-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_xilinx-bsp = "5" -LAYERDEPENDS_xilinx = "xilinx" +LAYERDEPENDS_xilinx-bsp = "xilinx" -LAYERSERIES_COMPAT_xilinx = "honister" +LAYERSERIES_COMPAT_xilinx-bsp = "honister" diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc index 0ff5e3d5..98f04158 100644 --- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc +++ b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc @@ -2,6 +2,12 @@ PACKAGE_ARCH:pn-linux-xlnx:ultra96 = "${BOARDVARIANT_ARCH}" KERNEL_DEVICETREE:ultra96 = "xilinx/zynqmp-zcu100-revC.dtb" +# Affects meta-xilinx-tools xsctyaml.bbclass related items +YAML_SERIAL_CONSOLE_STDIN:ultra96 ?= "psu_uart_1" +YAML_SERIAL_CONSOLE_STDOUT:ultra96 ?= "psu_uart_1" + +YAML_COMPILER_FLAGS:append:ultra96 = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 " + # Enable bluetooth and wifi module #MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append:ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl181x" diff --git a/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend new file mode 100644 index 00000000..75c6bf88 --- /dev/null +++ b/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend @@ -0,0 +1,44 @@ +SRC_URI:append:ultra96 = "${@bb.utils.contains('MACHINE_FEATURES', 'mipi', ' file://mipi-support-ultra96.dtsi file://pl.dtsi', '', d)}" +YAML_MAIN_MEMORY_CONFIG:ultra96 ?= "psu_ddr_0" +YAML_CONSOLE_DEVICE_CONFIG:ultra96 ?= "psu_uart_1" +YAML_DT_BOARD_FLAGS:ultra96 ?= "{BOARD avnet-ultra96-rev1}" + +YAML_MAIN_MEMORY_CONFIG:kc705 ?= "mig_7series_0" +YAML_CONSOLE_DEVICE_CONFIG:kc705 ?= "axi_uartlite_0" +YAML_DT_BOARD_FLAGS:kc705 ?= "{BOARD kc705-full}" + +YAML_DT_BOARD_FLAGS:zcu102 ?= "{BOARD zcu102-rev1.0}" +YAML_DT_BOARD_FLAGS:zcu106 ?= "{BOARD zcu106-reva}" +YAML_DT_BOARD_FLAGS:zc702 ?= "{BOARD zc702}" +YAML_DT_BOARD_FLAGS:zc706 ?= "{BOARD zc706}" +YAML_DT_BOARD_FLAGS:zedboard ?= "{BOARD zedboard}" +YAML_DT_BOARD_FLAGS:zc1254 ?= "{BOARD zc1254-reva}" +YAML_DT_BOARD_FLAGS:zcu104 ?= "{BOARD zcu104-revc}" +YAML_DT_BOARD_FLAGS:zcu111 ?= "{BOARD zcu111-reva}" +YAML_DT_BOARD_FLAGS:zcu1275 ?= "{BOARD zcu1275-revb}" +YAML_DT_BOARD_FLAGS:zcu1285 ?= "{BOARD zcu1285-reva}" +YAML_DT_BOARD_FLAGS:zcu216 ?= "{BOARD zcu216-reva}" +YAML_DT_BOARD_FLAGS:zcu208 ?= "{BOARD zcu208-reva}" +YAML_DT_BOARD_FLAGS:virt-versal ?= "{BOARD versal-virt}" +YAML_DT_BOARD_FLAGS:vck-sc ?= "{BOARD zynqmp-e-a2197-00-reva}" +YAML_DT_BOARD_FLAGS:v350 ?= "{BOARD versal-v350-reva}" +YAML_DT_BOARD_FLAGS:vck5000 ?= "{BOARD versal-vck5000-reva}" +YAML_DT_BOARD_FLAGS:vck190 ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" +YAML_DT_BOARD_FLAGS:vmk180 ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}" +YAML_DT_BOARD_FLAGS:vc-p-a2197-00 ?= "{BOARD versal-vc-p-a2197-00-reva-x-prc-01-reva}" +YAML_DT_BOARD_FLAGS:ac701 ?= "{BOARD ac701-full}" +YAML_DT_BOARD_FLAGS:kcu105 ?= "{BOARD kcu105}" +YAML_DT_BOARD_FLAGS:sp701 ?= "{BOARD sp701-rev1.0}" +YAML_DT_BOARD_FLAGS:vcu118 ?= "{BOARD vcu118-rev2.0}" +YAML_DT_BOARD_FLAGS:k26 ?= "{BOARD zynqmp-sm-k26-reva}" +YAML_DT_BOARD_FLAGS:zcu670 ?= "{BOARD zcu670-revb}" +YAML_DT_BOARD_FLAGS:vpk120 ?= "{BOARD versal-vpk120-reva}" +YAML_DT_BOARD_FLAGS:vpk-sc ?= "{BOARD zynqmp-vpk120-reva}" + +do_configure:append:ultra96() { + if [ -e ${WORKDIR}/mipi-support-ultra96.dtsi ]; then + cp ${WORKDIR}/mipi-support-ultra96.dtsi ${DT_FILES_PATH}/mipi-support-ultra96.dtsi + cp ${WORKDIR}/pl.dtsi ${DT_FILES_PATH}/pl.dtsi + echo '/include/ "mipi-support-ultra96.dtsi"' >> ${DT_FILES_PATH}/${BASE_DTS}.dts + fi +} diff --git a/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend b/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend new file mode 100644 index 00000000..93caf4e4 --- /dev/null +++ b/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend @@ -0,0 +1,4 @@ +ULTRA96_VERSION ?= "1" +YAML_COMPILER_FLAGS:append:ultra96 = " -DENABLE_MOD_ULTRA96 ${@bb.utils.contains('ULTRA96_VERSION', '2', ' -DULTRA96_VERSION=2 ', ' -DULTRA96_VERSION=1 ', d)}" +YAML_COMPILER_FLAGS:append:k26 = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP -DOVERTEMP_DEGC=90.0 " + -- cgit v1.2.3-54-g00ecf