[PATCH 2/3] rtems/bsps: Update the buildset defines to be arch/bsp

[chrisj at rtems.org]

From: Chris Johns <chrisj at rtems.org>

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

diff --git a/rtems/config/bsps/atsamv.bset b/rtems/config/bsps/atsamv.bset
index 6b2dcf5..a301da3 100644
--- a/rtems/config/bsps/atsamv.bset
+++ b/rtems/config/bsps/atsamv.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp atsamv
+%define with_rtems_bsp arm/atsamv
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/beagleboneblack.bset b/rtems/config/bsps/beagleboneblack.bset
index 33954d8..b30fc45 100644
--- a/rtems/config/bsps/beagleboneblack.bset
+++ b/rtems/config/bsps/beagleboneblack.bset
@@ -11,7 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp beagleboneblack
+%define with_rtems_bsp arm/beagleboneblack
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
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..050e2c4 100644
--- a/rtems/config/bsps/gr712rc.bset
+++ b/rtems/config/bsps/gr712rc.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp gr712rc
+%define with_rtems_bsp sparc/gr712rc
 %define rtems_target   sparc-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/gr740.bset b/rtems/config/bsps/gr740.bset
index 79b8ef1..88026cd 100644
--- a/rtems/config/bsps/gr740.bset
+++ b/rtems/config/bsps/gr740.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp gr740
+%define with_rtems_bsp sparc/gr740
 %define rtems_target   sparc-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/imx7.bset b/rtems/config/bsps/imx7.bset
index e49e979..a9922bb 100644
--- a/rtems/config/bsps/imx7.bset
+++ b/rtems/config/bsps/imx7.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp imx7
+%define with_rtems_bsp arm/imx7
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/pc.bset b/rtems/config/bsps/pc.bset
index 57212f6..efcceb8 100644
--- a/rtems/config/bsps/pc.bset
+++ b/rtems/config/bsps/pc.bset
@@ -11,7 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp pc686
+%define with_rtems_bsp i386/pc686
 %define rtems_target   i386-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/qoriq_e500.bset b/rtems/config/bsps/qoriq_e500.bset
index 2011d75..4a4ae46 100644
--- a/rtems/config/bsps/qoriq_e500.bset
+++ b/rtems/config/bsps/qoriq_e500.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp qoriq_e500
+%define with_rtems_bsp powerpc/qoriq_e500
 %define rtems_target   powerpc-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/qoriq_e6500_32.bset b/rtems/config/bsps/qoriq_e6500_32.bset
index 419f334..8968f04 100644
--- a/rtems/config/bsps/qoriq_e6500_32.bset
+++ b/rtems/config/bsps/qoriq_e6500_32.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp qoriq_e6500_32
+%define with_rtems_bsp powerpc/qoriq_e6500_32
 %define rtems_target   powerpc-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/qoriq_e6500_64.bset b/rtems/config/bsps/qoriq_e6500_64.bset
index 2d02b26..c6fbab1 100644
--- a/rtems/config/bsps/qoriq_e6500_64.bset
+++ b/rtems/config/bsps/qoriq_e6500_64.bset
@@ -1,6 +1,6 @@
 %define mail_single_report 1
 
-%define with_rtems_bsp qoriq_e6500_64
+%define with_rtems_bsp powerpc/qoriq_e6500_64
 %define rtems_target   powerpc-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/raspberrypi2.bset b/rtems/config/bsps/raspberrypi2.bset
index 83b12ea..c83b479 100644
--- a/rtems/config/bsps/raspberrypi2.bset
+++ b/rtems/config/bsps/raspberrypi2.bset
@@ -11,7 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp raspberrypi2
+%define with_rtems_bsp arm/raspberrypi2
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/xilinx_zynq_zc702.bset b/rtems/config/bsps/xilinx_zynq_zc702.bset
index 295c841..0b22c6f 100644
--- a/rtems/config/bsps/xilinx_zynq_zc702.bset
+++ b/rtems/config/bsps/xilinx_zynq_zc702.bset
@@ -11,7 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp xilinx_zynq_zc702
+%define with_rtems_bsp arm/xilinx_zynq_zc702
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/xilinx_zynq_zc706.bset b/rtems/config/bsps/xilinx_zynq_zc706.bset
index 8b493cf..46e8a6d 100644
--- a/rtems/config/bsps/xilinx_zynq_zc706.bset
+++ b/rtems/config/bsps/xilinx_zynq_zc706.bset
@@ -11,7 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp xilinx_zynq_zc706
+%define with_rtems_bsp arm/xilinx_zynq_zc706
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
diff --git a/rtems/config/bsps/xilinx_zynq_zedboard.bset b/rtems/config/bsps/xilinx_zynq_zedboard.bset
index 801c6c9..ec9f304 100644
--- a/rtems/config/bsps/xilinx_zynq_zedboard.bset
+++ b/rtems/config/bsps/xilinx_zynq_zedboard.bset
@@ -11,7 +11,7 @@
 
 %define mail_single_report 1
 
-%define with_rtems_bsp xilinx_zynq_zedboard
+%define with_rtems_bsp arm/xilinx_zynq_zedboard
 %define rtems_target   arm-rtems%{rtems_version}
 %define rtems_host     %{rtems_target}
 
-- 
2.24.1