[isar-cip-core] [PATCH] Add MCOM x86 target

CIP-dev archive mirror
 help / color / mirror / Atom feed

From: "Schilling, Benjamin" <schilling.benjamin@siemens.com>
To: "cip-dev@lists.cip-project.org" <cip-dev@lists.cip-project.org>
Subject: [isar-cip-core] [PATCH] Add MCOM x86 target
Date: Thu, 2 May 2024 13:14:33 +0000	[thread overview]
Message-ID: <GVXPR10MB58375213D66CD4C30A60188888182@GVXPR10MB5837.EURPRD10.PROD.OUTLOOK.COM> (raw)

[-- Attachment #1: Type: text/plain, Size: 5392 bytes --]

From edb4f62f1f11252bc82d34325130e072825d75ef Mon Sep 17 00:00:00 2001
From: Benjamin Schilling <schilling.benjamin@siemens.com>
Date: Wed, 10 Apr 2024 17:21:11 +0200
Subject: [isar-cip-core] [PATCH] Add MCOM x86 target

This patch adds the MCOM x86 as another hardware target.

Signed-off-by: Benjamin Schilling <schilling.benjamin@siemens.com>
---
Kconfig                                    |  7 ++++++-
conf/machine/mcom-x86.conf                 | 15 +++++++++++++++
kas/board/mcom-x86.yml                     | 15 +++++++++++++++
recipes-kernel/linux/cip-kernel-config.inc |  4 ++--
wic/mcom-x86-efibootguard.wks.in           | 14 ++++++++++++++
5 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 conf/machine/mcom-x86.conf
create mode 100644 kas/board/mcom-x86.yml
create mode 100644 wic/mcom-x86-efibootguard.wks.in

diff --git a/Kconfig b/Kconfig
index 7c19640..89f7467 100644
--- a/Kconfig
+++ b/Kconfig
@@ -43,6 +43,10 @@ config TARGET_SIMATIC_IPC227E
               bool "Siemens SIMATIC IPC227E"
               select ARCH_AMD64
+config TARGET_MCOM_X86
+             bool "Siemens M-COM X86"
+             select ARCH_AMD64
+
config TARGET_QEMU_ARM64
               bool "QEMU ARM64 (aarch64)"
               select ARCH_ARM64
@@ -73,6 +77,7 @@ config KAS_INCLUDE_BOARD
               string
               default "kas/board/qemu-amd64.yml" if TARGET_QEMU_AMD64
               default "kas/board/simatic-ipc227e.yml" if TARGET_SIMATIC_IPC227E
+             default "kas/board/mcom-x86.yml" if TARGET_MCOM_X86
               default "kas/board/qemu-arm64.yml" if TARGET_QEMU_ARM64
               default "kas/board/hihope-rzg2m.yml" if TARGET_HIHOPE_RZG2M
               default "kas/board/qemu-arm.yml" if TARGET_QEMU_ARM
@@ -190,7 +195,7 @@ if IMAGE_FLASH && !KERNEL_4_4 && !KERNEL_4_19
 config IMAGE_SWUPDATE
               bool "SWUpdate support for root partition"
-              depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1 ) || TARGET_HIHOPE_RZG2M
+             depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_MCOM_X86 ||TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1 ) || TARGET_HIHOPE_RZG2M
 config IMAGE_SECURE_BOOT
               bool "Secure boot support"
diff --git a/conf/machine/mcom-x86.conf b/conf/machine/mcom-x86.conf
new file mode 100644
index 0000000..21bcd1e
--- /dev/null
+++ b/conf/machine/mcom-x86.conf
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens Mobility GmbH, 2024
+#
+# SPDX-License-Identifier: MIT
+#
+
+DISTRO_ARCH = "amd64"
+
+IMAGE_FSTYPES ?= "wic"
+WKS_FILE ?= "x86_64-generic.wks"
+IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_mcom_x86_defconfig"
diff --git a/kas/board/mcom-x86.yml b/kas/board/mcom-x86.yml
new file mode 100644
index 0000000..28c4674
--- /dev/null
+++ b/kas/board/mcom-x86.yml
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens Mobility GmbH, 2024
+#
+# Authors:
+#  Benjamin Schilling <schilling.benjamin@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 14
+
+machine: mcom-x86
diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
index 40c378b..7acdc0d 100644
--- a/recipes-kernel/linux/cip-kernel-config.inc
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -10,8 +10,8 @@
#
 SRC_URI:append = " ${@ \
-    'git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config' \
+    'git://gitlab.com/benjamin-schilling/cip-kernel-config.git;protocol=https;branch=bs/mcom;destsuffix=cip-kernel-config;name=cip-kernel-config' \
     if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
     }"
-SRCREV_cip-kernel-config ?= "ee86aca8abbe7a41536bcb53142fbf0f57b1c9b7"
+SRCREV_cip-kernel-config ?= "50f7039f6c1486be2f1e1b2ca0ddc300895e44cd"
diff --git a/wic/mcom-x86-efibootguard.wks.in b/wic/mcom-x86-efibootguard.wks.in
new file mode 100644
index 0000000..6382ff7
--- /dev/null
+++ b/wic/mcom-x86-efibootguard.wks.in
@@ -0,0 +1,14 @@
+# short-description: x86 with EFI Boot Guard and SWUpdate
+# long-description: Disk image for x86 machines with EFI Boot Guard and SWUpdate
+
+include ebg-sysparts.inc
+
+part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# home and var are extra partitions
+
+part /home --source rootfs --change-directory=home --fstype=ext4 --label home --align 1024  --size 1G --extra-space=100M --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002
+part /var --fstype=ext4 --label var --align 1024 --fixed-size 2G --fsuuid 96be3374-4258-11ee-be56-0242ac120002
+
+bootloader --ptable gpt --append="console=tty0 console=ttyS0,115200 rootwait earlyprintk watchdog.handle_boot_enabled=0 iTCO_wdt.nowayout=1 "
--
2.39.2


[-- Attachment #2: Type: text/html, Size: 16624 bytes --]

next             reply	other threads:[~2024-05-02 13:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-02 13:14 Schilling, Benjamin [this message]
2024-05-14  5:01 ` [isar-cip-core] [PATCH] Add MCOM x86 target Shivanand.Kunijadar
2024-05-17  7:38   ` Benjamin Schilling

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:7c19640 dfblob:40c378b dfblob:89f7467 dfblob:21bcd1e
dfblob:28c4674 dfblob:7acdc0d dfblob:6382ff7
	(help)

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=GVXPR10MB58375213D66CD4C30A60188888182@GVXPR10MB5837.EURPRD10.PROD.OUTLOOK.COM \
    --to=schilling.benjamin@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    /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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).