ultra96: Deprecate and remove support for ultra96

Signed-off-by: John Toomey <john.toomey@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

5 files changed, 3 insertions, 127 deletions

diff --git a/meta-xilinx-vendor/README.md b/meta-xilinx-vendor/README.md
index 1903df17..7e8136f0 100644
--- a/meta-xilinx-vendor/README.md
+++ b/meta-xilinx-vendor/README.md
@@ -9,12 +9,10 @@ ZynqMP and Versal devices and provides related metadata.
 
 > **Variable usage examples:**
 >
-> Machine Configuration file: `MACHINE = "ultra96-zynqmp"`
+> Machine Configuration file: `MACHINE = "microzed-zynq7"`
 >
-> Reference XSA: `HDF_MACHINE = "ultra96-zynqmp"`
+> Reference XSA: `HDF_MACHINE = "microzed-zynq7"`
 >
-> HW Board Device tree: `YAML_DT_BOARD_FLAGS = "{BOARD avnet-ultra96-rev1}"`
-
 | Devices    | Vendor Evaluation Board                                                                                           | Machine Configuration file                                   | Reference XSA    | HW Board Device tree | QEMU tested | HW tested |
 |------------|-------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|------------------|----------------------|-------------|-----------|
 | MicroBlaze | NA                                                                                                                | NA                                                           | NA               | NA                   | No          | No        |
@@ -24,13 +22,12 @@ ZynqMP and Versal devices and provides related metadata.
 |            | [Avnet/Digilent ZedBoard](https://www.xilinx.com/products/boards-and-kits/1-8dyf-11.html)                         | [zedboard-zynq7](conf/machine/zedboard-zynq7.conf)           | NA               | NA                   | No          | No        |
 |            | [Digilent Zybo](https://www.xilinx.com/support/university/boards-portfolio/xup-boards/DigilentZYBO.html)          | [zybo-zynq7](conf/machine/zybo-zynq7.conf)                   | NA               | `zynq-zybo.dtb`      | No          | No        |
 |            | [Digilent Zybo Linux BD](https://www.xilinx.com/support/university/boards-portfolio/xup-boards/DigilentZYBO.html) | [zybo-linux-bd-zynq7](conf/machine/zybo-linux-bd-zynq7.conf) | NA               | NA                   | No          | No        |
-| ZynqMP     | [Avent Ultra96 v1](https://www.xilinx.com/products/boards-and-kits/1-vad4rl.html)                                 | [ultra96-zynqmp](conf/machine/ultra96-zynqmp.conf)           | `ultra96-zynqmp` | `avnet-ultra96-rev1` | Yes         | Yes       |
 | Versal     | NA                                                                                                                | NA                                                           | NA               | NA                   | NA          | NA        |
 
 > **Note:** 
 ```
 1. For Zybo Linux BD reference design refer meta-xilinx-contrib layer.
-2. Ultra96 Machine configuration file is unsupported and is compatible with v1 board only. Refer to meta-avnet for v2 board.
+2. Ultra96 v1 is no longer supported. Refer to meta-avnet for v2 board.
 ```
 
 ## Dependencies
diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
deleted file mode 100644
index d0b95cac..00000000
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-#@TYPE: Machine
-#@NAME: ultra96-zynqmp
-#@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
-
-#### Preamble
-MACHINEOVERRIDES =. "${@['', 'ultra96-zynqmp:']['ultra96-zynqmp' !='${MACHINE}']}"
-#### Regular settings follow
-
-# Variables that changes based on hw design or board specific requirement must be
-# defined before calling the required inclusion file else pre-expansion value
-# defined in zynqmp-generic.conf will be set.
-
-# Yocto device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_1"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD avnet-ultra96-rev1}"
-
-# Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE ?= "cadence1"
-TFA_BL33_LOAD ?= "0x8000000"
-
-# Yocto PMUFW variables
-YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_1"
-YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_1"
-
-# Yocto FSBL variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_1"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_1"
-
-# Yocto KERNEL Variables
-UBOOT_ENTRYPOINT  ?= "0x200000"
-UBOOT_LOADADDRESS ?= "0x200000"
-
-# ultra96-zynqmp Serial Console
-# In Ultra96 uart1 is the primary uart device but DTG set the serial0 alias
-# to uart1, hence we are using ttyPS0 for Ultra96.
-SERIAL_CONSOLES ?= "115200;ttyPS1 115200;ttyPS0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
-
-# Required generic machine inclusion
-# Ultra96 board uses ZynqMP EG device hence use soc variant based generic machine
-# inclusion
-require conf/machine/zynqmp-eg-generic.conf
-
-# This eval board machine conf file uses ultra96-zynqmp xsa as reference input.
-# User can override with ultra96 custom xsa using HDF_BASE and HDF_PATH variables
-# from local.conf.
-HDF_MACHINE = "ultra96-zynqmp"
-
-# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match
-# the xsa. User can enable explicitly if required from local.conf.
-# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
-
-# Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G,
-# Hence set QB_MEM to 2GB.
-QB_MEM = "-m 2G"
-
-# Ultra96 board uses ultra96-arm.dtb as QEMU HW PS DTB.
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/ultra96-arm.dtb"
-
-# Both psu_uart_0 and psu_uart_1 are defined, but 1 is the primary uart.
-#
-# hw ps7_uart_0 (0xFF000000) - linux serial1 (ttyPS1)
-# hw ps7_uart_1 (0xFF010000) - linux serial0 (ttyPS0)
-# ? dcc / axi_uart16550_0 ?  - linux serial2
-QB_XILINX_SERIAL = "-serial null -serial mon:stdio"
-
-# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match
-# the xsa. User can enable explicitly if required from local.conf.
-# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
-
-# Enable bluetooth and wifi module
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
-    linux-firmware-wl18xx \
-    linux-firmware-ti-bt-wl180x \
-    "
-
-#### No additional settings should be after the Postamble
-#### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', ' ultra96_zynqmp']['ultra96-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend b/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend
deleted file mode 100644
index f2c2c09f..00000000
--- a/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# Ultra96 Compiler Flags
-ULTRA96_VERSION ?= "1"
-YAML_COMPILER_FLAGS:append:ultra96-zynqmp = " \
-    -DBOARD_SHUTDOWN_PIN=2 \
-    -DBOARD_SHUTDOWN_PIN_STATE=0 \
-    -DENABLE_MOD_ULTRA96 \
-    ${@bb.utils.contains('ULTRA96_VERSION', '2', ' -DULTRA96_VERSION=2 ', ' -DULTRA96_VERSION=1 ', d)} \
-    "
diff --git a/meta-xilinx-vendor/recipes-core/init-ifupdown/files/interfaces b/meta-xilinx-vendor/recipes-core/init-ifupdown/files/interfaces
deleted file mode 100644
index 8daba016..00000000
--- a/meta-xilinx-vendor/recipes-core/init-ifupdown/files/interfaces
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-auto lo
-iface lo inet loopback
-
-# Wireless interfaces
-auto wlan0
-iface wlan0 inet dhcp
-        wireless_mode managed
-        wireless_essid any
-        wpa-driver wext
-        wpa-conf /etc/wpa_supplicant.conf
-
-iface atml0 inet dhcp
-
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
-iface eth1 inet dhcp
-
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-        address 192.168.7.2
-        netmask 255.255.255.0
-        network 192.168.7.0
-        gateway 192.168.7.1
-
-# Bluetooth networking
-iface bnep0 inet dhcp
-
diff --git a/meta-xilinx-vendor/recipes-core/init-ifupdown/init-ifupdown_%.bbappend b/meta-xilinx-vendor/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
deleted file mode 100644
index 2638026c..00000000
--- a/meta-xilinx-vendor/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS:prepend:ultra96 := "${THISDIR}/files:"