From 19fcaae0cd78ad73b85d2c213d194be70ac77d36 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 12 Oct 2021 20:28:34 -0500 Subject: meta-evb-enclustra: remove unusable evb-zx3-pm3 machine This machine is unbuildable and has not been updated in the requisite 2 months per https://lore.kernel.org/openbmc/YRUW7cazmCjW8VpP@heinlein/, so it is being deleted. Signed-off-by: Patrick Williams Change-Id: Ifd83af863ed6211fbaa167a9862ef426c2120f09 --- .../meta-evb-zx3-pm3/conf/bblayers.conf.sample | 37 ---------------------- .../meta-evb-zx3-pm3/conf/conf-notes.txt | 2 -- .../meta-evb-zx3-pm3/conf/layer.conf | 10 ------ .../meta-evb-zx3-pm3/conf/local.conf.sample | 20 ------------ .../meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf | 37 ---------------------- 5 files changed, 106 deletions(-) delete mode 100644 meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/bblayers.conf.sample delete mode 100644 meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/conf-notes.txt delete mode 100644 meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf delete mode 100644 meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample delete mode 100644 meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf (limited to 'meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf') diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/bblayers.conf.sample b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/bblayers.conf.sample deleted file mode 100644 index 122192f9a..000000000 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/bblayers.conf.sample +++ /dev/null @@ -1,37 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "8" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-xilinx/meta-xilinx-bsp/ \ - ##OEROOT##/meta-evb \ - ##OEROOT##/meta-evb/meta-evb-enclustra \ - ##OEROOT##/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3 \ - " -BBLAYERS_NON_REMOVABLE ?= " \ -##OEROOT##/meta \ -##OEROOT##/meta-poky \ -##OEROOT##/meta-openembedded/meta-oe \ -##OEROOT##/meta-openembedded/meta-networking \ -##OEROOT##/meta-openembedded/meta-perl \ -##OEROOT##/meta-openembedded/meta-python \ -##OEROOT##/meta-openembedded/meta-webserver \ -##OEROOT##/meta-security \ -##OEROOT##/meta-phosphor \ -##OEROOT##/meta-xilinx/meta-xilinx-bsp/ \ -##OEROOT##/meta-evb \ -##OEROOT##/meta-evb/meta-evb-enclustra \ -##OEROOT##/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3 \ - " diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/conf-notes.txt b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf deleted file mode 100644 index d9944132d..000000000 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "evb-zx3-pm3" -BBFILE_PATTERN_evb-zx3-pm3 = "" -LAYERSERIES_COMPAT_evb-zx3-pm3 = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample deleted file mode 100644 index bd13d5717..000000000 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample +++ /dev/null @@ -1,20 +0,0 @@ -MACHINE ??= "evb-zx3-pm3" -DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_ipk" -SANITY_TESTED_DISTROS:append ?= " *" -EXTRA_IMAGE_FEATURES ?= "debug-tweaks" -USER_CLASSES ?= "buildstats" -PATCHRESOLVE = "noop" -BB_DISKMON_DIRS ??= "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" -CONF_VERSION = "2" - -# Set the root password to '0penBmc' -# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf deleted file mode 100644 index 62716cd42..000000000 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf +++ /dev/null @@ -1,37 +0,0 @@ -SOC_VARIANT ?= "7z" - -require conf/machine/include/tune-zynq.inc -require conf/machine/include/machine-xilinx-overrides.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc -require conf/machine/include/machine-xilinx-qemu.inc -require conf/machine/include/obmc-bsp-common.inc - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -# u-boot configuration -UBOOT_MACHINE = "zynq_zc702_config" -SPL_BINARY = "spl/boot.bin" - -EXTRA_IMAGEDEPENDS += " \ - u-boot-zynq-uenv \ - virtual/boot-bin \ - " - -SERIAL_CONSOLE = "115200 ttyPS0" - -KERNEL_DEVICETREE = "zynq-zc702.dtb" - -IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zc702.dtb" - -# Overwrite flash offsets -FLASH_UBOOT_OFFSET = "0" -FLASH_KERNEL_OFFSET = "6144" -FLASH_UBI_OFFSET = "${FLASH_KERNEL_OFFSET}" -FLASH_ROFS_OFFSET = "12288" -FLASH_RWFS_OFFSET = "65024" -FLASH_SIZE = "65536" - -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "evb-zx3-pm3-led-manager-config-native" -PREFERRED_PROVIDER_u-boot = "u-boot-xlnx" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -- cgit v1.2.3