diff mbox series

[v2,01/11] meta-isar: Lift de0-nano-soc build to buster

Message ID c5a08dba0c09448397bfa6911af343a29e61bf64.1602755020.git.jan.kiszka@siemens.com
State Superseded, archived
Headers show
Series Support for building TF-A and OP-TEE, add STM32MP15x board | expand

Commit Message

Jan Kiszka Oct. 15, 2020, 12:43 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

That's up-to-date, and it will allow building another ARM board while
sharing the same self-built kernel.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/local.conf.sample                     | 2 +-
 meta-isar/conf/multiconfig/de0-nano-soc-buster.conf  | 7 +++++++
 meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf | 7 -------
 scripts/ci_build.sh                                  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-buster.conf
 delete mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
diff mbox series

Patch

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 2f82020d..01666fd4 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -56,7 +56,7 @@  BBMULTICONFIG = " \
     qemumipsel-bullseye \
     qemuriscv64-sid-ports \
     bananapi-buster \
-    de0-nano-soc-stretch \
+    de0-nano-soc-buster \
     hikey-stretch \
     nand-ubi-demo-buster \
     nanopi-neo-buster \
diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf b/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf
new file mode 100644
index 00000000..0584d193
--- /dev/null
+++ b/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf
@@ -0,0 +1,7 @@ 
+#
+# Copyright (c) Siemens AG, 2018-2020
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE = "de0-nano-soc"
+DISTRO = "debian-buster"
diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf b/meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
deleted file mode 100644
index 68824939..00000000
--- a/meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
+++ /dev/null
@@ -1,7 +0,0 @@ 
-#
-# Copyright (c) Siemens AG, 2018
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE = "de0-nano-soc"
-DISTRO = "debian-stretch"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index c0a032e7..f1f6503e 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -48,7 +48,7 @@  CROSS_TARGETS_SET="\
                   mc:qemuarm-buster:isar-image-base \
                   mc:qemuarm64-stretch:isar-image-base \
                   mc:qemuamd64-stretch:isar-image-base \
-                  mc:de0-nano-soc-stretch:isar-image-base \
+                  mc:de0-nano-soc-buster:isar-image-base \
                   mc:rpi-stretch:isar-image-base"
 
 CROSS_TARGETS_SET_BULLSEYE="\
@@ -56,7 +56,7 @@  CROSS_TARGETS_SET_BULLSEYE="\
 "
 
 REPRO_TARGETS_SET_SIGNED="\
-            mc:de0-nano-soc-stretch:isar-image-base \
+            mc:de0-nano-soc-buster:isar-image-base \
             mc:qemuarm64-stretch:isar-image-base"
 
 REPRO_TARGETS_SET="\