From 97d5fd955343d22b2b7614586195e6c976106900 Mon Sep 17 00:00:00 2001
From: Kinsey Moore <kinsey.moore@oarcorp.com>
Date: Wed, 30 Jun 2021 07:42:13 -0500
Subject: Revert "bsps/zynqmp: Allow any or all CGEMs to be enabled"

This reverts commit 10041a4cfc00d5f6876d3d6cfc30c23347b4cf42.

This type of configuration does not belong in RTEMS and is better
constrained to libbsd where the defines are actually being used.
---
 spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml      |  8 --------
 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem0.yml | 16 ----------------
 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem1.yml | 16 ----------------
 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem2.yml | 16 ----------------
 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem3.yml | 16 ----------------
 5 files changed, 72 deletions(-)
 delete mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem0.yml
 delete mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem1.yml
 delete mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem2.yml
 delete mode 100644 spec/build/bsps/aarch64/xilinx-zynqmp/optcgem3.yml

(limited to 'spec/build')

diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
index e13e2443c0..03ccdbbc8b 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
@@ -29,14 +29,6 @@ links:
   uid: optramori
 - role: build-dependency
   uid: optclkuart
-- role: build-dependency
-  uid: optcgem0
-- role: build-dependency
-  uid: optcgem1
-- role: build-dependency
-  uid: optcgem2
-- role: build-dependency
-  uid: optcgem3
 - role: build-dependency
   uid: ../../optconminor
 - role: build-dependency
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem0.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem0.yml
deleted file mode 100644
index fc878fda60..0000000000
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem0.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- env-enable: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2021 On-Line Applications Research
-default: false
-default-by-variant: []
-description: |
-  Enable support for CGEM0
-enabled-by: true
-links: []
-name: BSP_XILINX_ZYNQMP_USE_CGEM0
-type: build
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem1.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem1.yml
deleted file mode 100644
index 6d5096bbde..0000000000
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem1.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- env-enable: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2021 On-Line Applications Research
-default: false
-default-by-variant: []
-description: |
-  Enable support for CGEM1
-enabled-by: true
-links: []
-name: BSP_XILINX_ZYNQMP_USE_CGEM1
-type: build
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem2.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem2.yml
deleted file mode 100644
index a8aca3ebbd..0000000000
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem2.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- env-enable: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2021 On-Line Applications Research
-default: false
-default-by-variant: []
-description: |
-  Enable support for CGEM2
-enabled-by: true
-links: []
-name: BSP_XILINX_ZYNQMP_USE_CGEM2
-type: build
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem3.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem3.yml
deleted file mode 100644
index 8275ad3440..0000000000
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/optcgem3.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- env-enable: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2021 On-Line Applications Research
-default: true
-default-by-variant: []
-description: |
-  Enable support for CGEM3
-enabled-by: true
-links: []
-name: BSP_XILINX_ZYNQMP_USE_CGEM3
-type: build
-- 
cgit v1.2.3