[PATCH v2 5/7] conf: Remove machine-specific defines from multiconfig

[Anton Mikanovich <amikan@ilbers.de>]

Move that defines from multiconfig to machine config.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/conf/machine/phyboard-mira.conf              | 6 ++++++
 meta-isar/conf/multiconfig/phyboard-mira-bullseye.conf | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf
index a2e7150..8dd6679 100644
--- a/meta-isar/conf/machine/phyboard-mira.conf
+++ b/meta-isar/conf/machine/phyboard-mira.conf
@@ -3,6 +3,10 @@
 #
 # SPDX-License-Identifier: MIT
 
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
+
 MACHINE_SERIAL ?= "ttymxc0"
 BAUDRATE_TTY ?= "115200"
 
@@ -13,3 +17,5 @@ UBINIZE_ARGS = "-vv -m 0x800 -p 0x20000"
 IMAGE_FSTYPES ?= "ubi ubifs"
 
 DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb"
+
+IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-isar/conf/multiconfig/phyboard-mira-bullseye.conf b/meta-isar/conf/multiconfig/phyboard-mira-bullseye.conf
index a0253eb..be62451 100644
--- a/meta-isar/conf/multiconfig/phyboard-mira-bullseye.conf
+++ b/meta-isar/conf/multiconfig/phyboard-mira-bullseye.conf
@@ -4,10 +4,4 @@
 # SPDX-License-Identifier: MIT
 
 MACHINE ?= "phyboard-mira"
-
 DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-IMAGE_INSTALL += "sshd-regen-keys"
-- 
2.17.1