From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v3 09/10] meta-isar: Remove imx6-sabrelite settings from multiconfig
Date: Mon, 12 Jun 2023 09:12:55 +0200 [thread overview]
Message-ID: <20230612071256.8688-10-ubely@ilbers.de> (raw)
In-Reply-To: <20230612071256.8688-1-ubely@ilbers.de>
From: Anton Mikanovich <amikan@ilbers.de>
Machine-related configuration should be done in machine config, so move
it from multiconfig.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
meta-isar/conf/machine/imx6-sabrelite.conf | 6 ++++++
meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf | 6 ------
meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf | 6 ------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf
index d8cb93ad..b2252479 100644
--- a/meta-isar/conf/machine/imx6-sabrelite.conf
+++ b/meta-isar/conf/machine/imx6-sabrelite.conf
@@ -3,6 +3,10 @@
#
# SPDX-License-Identifier: MIT
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
+
MACHINE_SERIAL ?= "ttymxc0"
BAUDRATE_TTY ?= "115200"
@@ -12,3 +16,5 @@ UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000"
IMAGE_FSTYPES ?= "ubi-ubifs"
DTB_FILES = "imx6q-sabrelite.dtb"
+
+IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
index 92615f22..9df2cd10 100644
--- a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
+++ b/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
@@ -2,10 +2,4 @@
# Copyright (C) 2022 ilbers GmbH
MACHINE ?= "imx6-sabrelite"
-
DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
index c19f193c..262a6615 100644
--- a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
+++ b/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
@@ -4,10 +4,4 @@
# SPDX-License-Identifier: MIT
MACHINE ?= "imx6-sabrelite"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-IMAGE_INSTALL += "sshd-regen-keys"
--
2.20.1
next prev parent reply other threads:[~2023-06-12 7:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 7:12 [PATCH v3 00/10] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 01/10] CI: Introduce meta-test layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 02/10] ubuntu: Fix WKS_FILE overriding Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 03/10] CI: Move qemuamd64-bookworm hacks to CI layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 04/10] CI: Move qemuamd64-bullseye " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 05/10] CI: Move qemuamd64-buster " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 06/10] CI: Move qemuarm-bookworm " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 07/10] CI: Move qemuarm64-bookworm " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig Uladzimir Bely
2023-06-15 5:07 ` Jan Kiszka
2023-06-15 8:19 ` Anton Mikanovich
2023-06-15 9:15 ` MOESSBAUER, Felix
2023-06-12 7:12 ` Uladzimir Bely [this message]
2023-06-12 7:12 ` [PATCH v3 10/10] meta-isar: Unify multiconfigs to use weak assignments Uladzimir Bely
2023-06-13 6:27 ` [PATCH v3 00/10] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-15 5:13 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230612071256.8688-10-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox