summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2021-11-07 16:15:52 -0600
committerJoel Sherrill <joel@rtems.org>2021-11-09 11:12:25 -0600
commit6bc7cacf35f0ed28299b544226168da81ef81cd6 (patch)
treeeb976ceed401dcde153cbf94a57bc14c18e81a8b
parentrtems-tools-6.cfg: Bump rtems-tools hash (diff)
downloadrtems-source-builder-6bc7cacf35f0ed28299b544226168da81ef81cd6.tar.bz2
config/[67]/rtems-*.bset: Move dtc to default set
-rw-r--r--rtems/config/6/rtems-default.bset2
-rw-r--r--rtems/config/6/rtems-microblaze.bset2
-rw-r--r--rtems/config/6/rtems-moxie.bset1
-rw-r--r--rtems/config/7/rtems-default.bset2
-rw-r--r--rtems/config/7/rtems-moxie.bset1
5 files changed, 4 insertions, 4 deletions
diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
index 8bf6922..5ee1daf 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -8,6 +8,8 @@
# GDB needs expat so it needs to be built before.
#
+devel/dtc-1.6.0-1
+
devel/expat-2.1.0-1
devel/gmp-6.1.0
tools/rtems-gdb-10
diff --git a/rtems/config/6/rtems-microblaze.bset b/rtems/config/6/rtems-microblaze.bset
index 3eb7a89..4e88043 100644
--- a/rtems/config/6/rtems-microblaze.bset
+++ b/rtems/config/6/rtems-microblaze.bset
@@ -6,8 +6,6 @@
#
%include 6/rtems-base.bset
-devel/dtc-1.6.0-1
-
#
# Build gdb first to raise the Python install error as early as possible.
# GDB needs expat so it needs to be built before.
diff --git a/rtems/config/6/rtems-moxie.bset b/rtems/config/6/rtems-moxie.bset
index a191c5d..c86777e 100644
--- a/rtems/config/6/rtems-moxie.bset
+++ b/rtems/config/6/rtems-moxie.bset
@@ -2,5 +2,4 @@
%define rtems_arch moxie
%define win32-gdb-disable-sim
%define with_libgomp
-devel/dtc-1.6.0-1
%include 6/rtems-default.bset
diff --git a/rtems/config/7/rtems-default.bset b/rtems/config/7/rtems-default.bset
index acb7059..69bdd5b 100644
--- a/rtems/config/7/rtems-default.bset
+++ b/rtems/config/7/rtems-default.bset
@@ -5,6 +5,8 @@
# GDB needs expat so it needs to be built before.
#
+devel/dtc-1.6.0-1
+
devel/expat-2.1.0-1
devel/gmp-6.1.0
tools/rtems-gdb-head
diff --git a/rtems/config/7/rtems-moxie.bset b/rtems/config/7/rtems-moxie.bset
index 60fe7f4..8cd3642 100644
--- a/rtems/config/7/rtems-moxie.bset
+++ b/rtems/config/7/rtems-moxie.bset
@@ -2,5 +2,4 @@
%define rtems_arch moxie
%define win32-gdb-disable-sim
%define with_libgomp
-devel/dtc-1.6.0-1
%include 7/rtems-default.bset