From 679d2b7946ac42c1dae3789c15b0d77ddafc3044 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 9 Sep 2022 17:54:57 +1000
Subject: rtems/bsps: Update the buildset defines to be arch/bsp

- Remove the unused defines
---
 rtems/config/bsps/atsamv.bset               | 4 +---
 rtems/config/bsps/beagleboneblack.bset      | 4 +---
 rtems/config/bsps/erc32.bset                | 4 +---
 rtems/config/bsps/gr712rc.bset              | 4 +---
 rtems/config/bsps/gr740.bset                | 4 +---
 rtems/config/bsps/imx7.bset                 | 4 +---
 rtems/config/bsps/pc.bset                   | 4 +---
 rtems/config/bsps/qoriq_e500.bset           | 4 +---
 rtems/config/bsps/qoriq_e6500_32.bset       | 4 +---
 rtems/config/bsps/qoriq_e6500_64.bset       | 4 +---
 rtems/config/bsps/raspberrypi2.bset         | 4 +---
 rtems/config/bsps/xilinx_zynq_zc702.bset    | 4 +---
 rtems/config/bsps/xilinx_zynq_zc706.bset    | 4 +---
 rtems/config/bsps/xilinx_zynq_zedboard.bset | 4 +---
 14 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/rtems/config/bsps/atsamv.bset b/rtems/config/bsps/atsamv.bset
index 6b2dcf5..c26886b 100644
--- a/rtems/config/bsps/atsamv.bset
+++ b/rtems/config/bsps/atsamv.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp atsamv
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/atsamv
 
 6/rtems-arm
 6/rtems-kernel
diff --git a/rtems/config/bsps/beagleboneblack.bset b/rtems/config/bsps/beagleboneblack.bset
index 33954d8..2518c96 100644
--- a/rtems/config/bsps/beagleboneblack.bset
+++ b/rtems/config/bsps/beagleboneblack.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp beagleboneblack
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/beagleboneblack
 
 6/rtems-arm
 6/rtems-kernel
diff --git a/rtems/config/bsps/erc32.bset b/rtems/config/bsps/erc32.bset
index bd27833..fd937cd 100644
--- a/rtems/config/bsps/erc32.bset
+++ b/rtems/config/bsps/erc32.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp erc32
-%define rtems_target   sparc-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp sparc/erc32
 
 6/rtems-sparc
 6/rtems-kernel
diff --git a/rtems/config/bsps/gr712rc.bset b/rtems/config/bsps/gr712rc.bset
index e74a984..c6ae58a 100644
--- a/rtems/config/bsps/gr712rc.bset
+++ b/rtems/config/bsps/gr712rc.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp gr712rc
-%define rtems_target   sparc-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp sparc/gr712rc
 
 6/rtems-sparc
 6/rtems-kernel
diff --git a/rtems/config/bsps/gr740.bset b/rtems/config/bsps/gr740.bset
index 79b8ef1..7ead2bd 100644
--- a/rtems/config/bsps/gr740.bset
+++ b/rtems/config/bsps/gr740.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp gr740
-%define rtems_target   sparc-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp sparc/gr740
 
 6/rtems-sparc
 6/rtems-kernel
diff --git a/rtems/config/bsps/imx7.bset b/rtems/config/bsps/imx7.bset
index e49e979..8cf89cd 100644
--- a/rtems/config/bsps/imx7.bset
+++ b/rtems/config/bsps/imx7.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp imx7
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/imx7
 
 6/rtems-arm
 6/rtems-kernel
diff --git a/rtems/config/bsps/pc.bset b/rtems/config/bsps/pc.bset
index 57212f6..e47e702 100644
--- a/rtems/config/bsps/pc.bset
+++ b/rtems/config/bsps/pc.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp pc686
-%define rtems_target   i386-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp i386/pc686
 
 6/rtems-i386
 6/rtems-kernel
diff --git a/rtems/config/bsps/qoriq_e500.bset b/rtems/config/bsps/qoriq_e500.bset
index 2011d75..be3a332 100644
--- a/rtems/config/bsps/qoriq_e500.bset
+++ b/rtems/config/bsps/qoriq_e500.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp qoriq_e500
-%define rtems_target   powerpc-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp powerpc/qoriq_e500
 
 6/rtems-powerpc
 6/rtems-kernel
diff --git a/rtems/config/bsps/qoriq_e6500_32.bset b/rtems/config/bsps/qoriq_e6500_32.bset
index 419f334..d072293 100644
--- a/rtems/config/bsps/qoriq_e6500_32.bset
+++ b/rtems/config/bsps/qoriq_e6500_32.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp qoriq_e6500_32
-%define rtems_target   powerpc-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp powerpc/qoriq_e6500_32
 
 6/rtems-powerpc
 6/rtems-kernel
diff --git a/rtems/config/bsps/qoriq_e6500_64.bset b/rtems/config/bsps/qoriq_e6500_64.bset
index 2d02b26..7bcd3b8 100644
--- a/rtems/config/bsps/qoriq_e6500_64.bset
+++ b/rtems/config/bsps/qoriq_e6500_64.bset
@@ -1,8 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp qoriq_e6500_64
-%define rtems_target   powerpc-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp powerpc/qoriq_e6500_64
 
 6/rtems-powerpc
 6/rtems-kernel
diff --git a/rtems/config/bsps/raspberrypi2.bset b/rtems/config/bsps/raspberrypi2.bset
index 83b12ea..c1d0f35 100644
--- a/rtems/config/bsps/raspberrypi2.bset
+++ b/rtems/config/bsps/raspberrypi2.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp raspberrypi2
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/raspberrypi2
 
 6/rtems-arm
 6/rtems-kernel
diff --git a/rtems/config/bsps/xilinx_zynq_zc702.bset b/rtems/config/bsps/xilinx_zynq_zc702.bset
index 295c841..147bb7a 100644
--- a/rtems/config/bsps/xilinx_zynq_zc702.bset
+++ b/rtems/config/bsps/xilinx_zynq_zc702.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp xilinx_zynq_zc702
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/xilinx_zynq_zc702
 
 6/rtems-arm
 6/rtems-kernel
diff --git a/rtems/config/bsps/xilinx_zynq_zc706.bset b/rtems/config/bsps/xilinx_zynq_zc706.bset
index 8b493cf..24d2e20 100644
--- a/rtems/config/bsps/xilinx_zynq_zc706.bset
+++ b/rtems/config/bsps/xilinx_zynq_zc706.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp xilinx_zynq_zc706
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/xilinx_zynq_zc706
 
 6/rtems-arm
 6/rtems-kernel
diff --git a/rtems/config/bsps/xilinx_zynq_zedboard.bset b/rtems/config/bsps/xilinx_zynq_zedboard.bset
index 801c6c9..60d4e75 100644
--- a/rtems/config/bsps/xilinx_zynq_zedboard.bset
+++ b/rtems/config/bsps/xilinx_zynq_zedboard.bset
@@ -11,9 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp xilinx_zynq_zedboard
-%define rtems_target   arm-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
+%define with_rtems_bsp arm/xilinx_zynq_zedboard
 
 6/rtems-arm
 6/rtems-kernel
-- 
cgit v1.2.3