Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate meta-xilinx - Remove the LmP direct support #1553

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions meta-lmp-base/conf/distro/include/lmp.inc
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,9 @@ MIRRORS =+ "\
# Compatibility with other layers
BBMASK += " \
/meta-virtualization/recipes-kernel/linux/linux-%.bbappend \
/meta-virtualization/dynamic-layers/xilinx/recipes-extended/xen/xen_4.14.bbappend \
/meta-security/meta-integrity/recipes-core/systemd/systemd_%.bbappend \
/meta-st-stm32mp/recipes-st/images/st-image-bootfs-efi.bb \
"

# meta-xilinx/meta-xilinx-tools: mask recipes not required for lmp
BBMASK += " \
/meta-xilinx-tools/recipes-bsp/ai-engine/aiefal_1.0.bb \
/meta-xilinx-tools/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend \
"
# meta-st-stm32mp: mask recipes and appends that are not required by lmp
BBMASK += " \
/meta-st-stm32mp/recipes-core/busybox/busybox_%.bbappend \
Expand All @@ -145,9 +138,6 @@ BBMASK += " \
/meta-ti/meta-ti-bsp/recipes-security/optee \
"

# disable xsct tarball by default (xilinx)
USE_XSCT_TARBALL = "0"

# QA check settings - follow poky, which is stricter than the OE-Core defaults
WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \
installed-vs-shipped ldflags pn-overrides rpaths staticdev \
Expand Down
6 changes: 0 additions & 6 deletions meta-lmp-base/conf/distro/include/non-clangable.inc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ TOOLCHAIN:pn-edk2-firmware = "gcc"

# imx8mm-lpddr4-evk-sec
# imx8mp-lpddr4-evk-sec
# uz3eg-iocc-ebbr-sec
# /srv/oe/build/conf/../../layers/meta-lmp/meta-lmp-base/recipes-security/optee/optee-fiovb_git.bb:do_compile
TOOLCHAIN:pn-optee-fiovb = "gcc"

Expand All @@ -159,11 +158,6 @@ TOOLCHAIN:pn-optee-os-fio-mfgtool = "gcc"
TOOLCHAIN:pn-imx-atf = "gcc"
TOOLCHAIN:pn-qoriq-atf = "gcc"

# kv260
# vck190-versal
# uz3eg-iocc-ebbr-sec
TOOLCHAIN:pn-arm-trusted-firmware = "gcc"

# am64xx-evm
TOOLCHAIN:pn-ti-sci-fw = "gcc"
TOOLCHAIN:pn-trusted-firmware-a = "gcc"
Expand Down
6 changes: 0 additions & 6 deletions meta-lmp-bsp/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,4 @@ BBFILES_DYNAMIC += " \
stm-st-stm32mp:${LAYERDIR}/dynamic-layers/stm-st-stm32mp/*/*/*.bbappend \
tegra:${LAYERDIR}/dynamic-layers/tegra/*/*/*.bb \
tegra:${LAYERDIR}/dynamic-layers/tegra/*/*/*.bbappend \
xilinx:${LAYERDIR}/dynamic-layers/xilinx/*/*/*.bb \
xilinx:${LAYERDIR}/dynamic-layers/xilinx/*/*/*.bbappend \
xilinx-standalone:${LAYERDIR}/dynamic-layers/xilinx-standalone/*/*/*.bb \
xilinx-standalone:${LAYERDIR}/dynamic-layers/xilinx-standalone/*/*/*.bbappend \
xilinx-tools:${LAYERDIR}/dynamic-layers/xilinx-tools/*/*/*.bb \
xilinx-tools:${LAYERDIR}/dynamic-layers/xilinx-tools/*/*/*.bbappend \
"
31 changes: 0 additions & 31 deletions meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
Original file line number Diff line number Diff line change
Expand Up @@ -668,37 +668,6 @@ KERNEL_DEVICETREE:stm32mp15-disco = "${LMPSTAGING_KERN_ADD_ST_SUBDIR}stm32mp157c
## stm32mp15-eval-sec
SOTA_CLIENT_FEATURES:remove:sota:stm32mp15-eval-sec = "ubootenv"

# Xilinx
USE_XSCT_TARBALL:zynqmp = "1"
## Avnet UltraZed with secure boot support
UBOOT_SIGN_ENABLE:sota:uz3eg-iocc-sec = "1"
SOTA_CLIENT_FEATURES:remove:sota:uz3eg-iocc-sec = "ubootenv"
LMP_BOOT_FIRMWARE_VERSION:uz3eg-iocc-sec = "8"
## Avnet UltraZed with secure boot support and EBBR
UBOOT_SPL_SIGN_ENABLE:sota:uz3eg-iocc-ebbr-sec = "1"
UBOOT_SIGN_ENABLE:sota:uz3eg-iocc-ebbr-sec = "0"

## Xilinx Versal
USE_XSCT_TARBALL:versal = "1"
PREFERRED_PROVIDER_u-boot:versal = "u-boot-xlnx"
PREFERRED_PROVIDER_u-boot-fw-utils:versal = "libubootenv"
PREFERRED_RPROVIDER_u-boot-fw-utils:versal = "libubootenv"
SOTA_CLIENT_FEATURES:append:versal = " ubootenv"
WKS_FILE_DEPENDS:append:sota:versal = " u-boot-default-script"
PREFERRED_PROVIDER_u-boot-default-script:versal = "u-boot-base-scr"
PREFERRED_PROVIDER_u-boot-default-script:sota:versal = "u-boot-ostree-scr-fit"
PREFERRED_PROVIDER_virtual/kernel:versal = "linux-lmp-xlnx"
PREFERRED_PROVIDER_virtual/dtb:versal = "device-tree"
PREFERRED_PROVIDER_virtual/trusted-firmware-a:versal = "arm-trusted-firmware"
MACHINE_FEATURES:append:versal = " optee"
EXTRA_IMAGEDEPENDS:remove:versal = "qemu-devicetrees"
UBOOT_ENTRYPOINT:versal = "0x18000000"
OSTREE_KERNEL_ARGS:versal ?= "console=ttyAMA0,115200 earlycon=pl011,mmio32,0xFF000000,115200n8 clk_ignore_unused ${OSTREE_KERNEL_ARGS_COMMON}"
KERNEL_IMAGETYPE:sota:versal = "fitImage"
KERNEL_CLASSES:sota:versal = "kernel-lmp-fitimage"
IMAGE_BOOT_FILES:sota:versal = "boot.bin boot.itb"
WKS_FILES:sota:versal = "sdimage-sota.wks"

# TI Generic (BSP)
TI_COMMON_DEPLOY = "${DEPLOY_DIR}"
DEPLOY_DIR_SPDX:append = "${@'/${MACHINE}' if 'ti-soc' in (d.getVar('SOC_FAMILY') or '').split(':') else ''}"
Expand Down
5 changes: 0 additions & 5 deletions meta-lmp-bsp/conf/machine/include/ultrazed-lmp.inc

This file was deleted.

67 changes: 0 additions & 67 deletions meta-lmp-bsp/conf/machine/include/zynqmp-lmp.inc

This file was deleted.

16 changes: 0 additions & 16 deletions meta-lmp-bsp/conf/machine/kv260-ebbr.conf

This file was deleted.

43 changes: 0 additions & 43 deletions meta-lmp-bsp/conf/machine/kv260.conf

This file was deleted.

10 changes: 0 additions & 10 deletions meta-lmp-bsp/conf/machine/uz3eg-iocc-ebbr-sec.conf

This file was deleted.

12 changes: 0 additions & 12 deletions meta-lmp-bsp/conf/machine/uz3eg-iocc-ebbr.conf

This file was deleted.

22 changes: 0 additions & 22 deletions meta-lmp-bsp/conf/machine/uz3eg-iocc-sec.conf

This file was deleted.

23 changes: 0 additions & 23 deletions meta-lmp-bsp/conf/machine/uz3eg-iocc.conf

This file was deleted.

This file was deleted.

Loading