From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:a17:90a:86c4:: with SMTP id y4mr1594278pjv.105.1571907999185; Thu, 24 Oct 2019 02:06:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:80d1:: with SMTP id a17ls1673704pfn.7.gmail; Thu, 24 Oct 2019 02:06:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQMDtOpMHNxVRYEKSClsTt6Nauv8HtvU2wglTFROEqgOUDHMQdZvD1P+mIVqDGkxpG0Ci8 X-Received: by 2002:aa7:9842:: with SMTP id n2mr16351245pfq.258.1571907998836; Thu, 24 Oct 2019 02:06:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571907998; cv=none; d=google.com; s=arc-20160816; b=q5BrybAzQ8t9OopaeFcuiuE8t7zf7gaGKSFB1q5OOOmmW1Cgxr/4EuMHxF+TYQ0/7f 6MJsY0w8CSR0x5LokTZpc9duMQdepAV1hKseA0HX77TDu/Wxg0PvPCnKvZ9Q4uvoa7zm +A6+byOvmnerYClynNh14MY0tJk4zJm1Z/Ux2QRANeLPgvSFDo2SIrhMTOcY8BH/ceAG /YNirf+4KqByYKlkkvdUtFOl2HMzOI4nZ3JcxwpRMBYZ2ooHyGx4kpUCO6GP469y1ToD gh65ELi8+OEyG3CAypoKCKaFqR/+dsj8yWDwRj0Ql1V8xyPu0DzNqVBtXThv7eKo6wrz T09A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=7IlW5HuBizHgud8hA04fc6eNa/MIRrKf76X7d0KJoIg=; b=wGZuayEMrK0a7MRm8OkkXH4uH71G/QwWnSvTEVZyy6utJ+yEHYbw/WkleDXYHvLDG1 1xtMOttnufDDLBEURQUzB9tsCuNbv+9IFXcivVU7x/dMA1qKfhCALJUy9szErVVulxrE wagOJQDRl6Jn4rTNipwYOgvvGttnOxkXgVygHmuij+e2dsUqTOnnoSTeIPM4wjPTJZNN FG1xBbYRExtoI+rJOvBiIRyTJtj81qxWyBy/R8A8viB4fWgy2zs8xs4DhZVUp6NAaF9V aHBWubtfKkOrI6TYRpPhff5v06AGbQ3CtuA8OBFlztmsOgqFP1MMofCjQ1+2A+IpifRR AMvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id h13si44222pjb.0.2019.10.24.02.06.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 02:06:38 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: ZjHLclwTSiKBeHT7Vd17rsa23WpAR6y4SjD2vWTepeMhV9I5dIYtPvEjcBBe9roh8Q5z0XMgsL K+GUYWqbXOub93Br9PBHeYZ6PW40fZLkzvd1k+ldgwocSjCFWzXOLMiPBeYZ7Z3w+Bsc8E2L9o QU8EmAe4Sieg/EaBBgs1OVyL2+ANBg+Lx+1RItMKDf+jBN/T7plfccHljzmMjigp1WkPBnVMHF E96KgsEJaAynwAL72tuB46gfEmg5SXqHWGtCnwoe0NqeGS34+Fa2I1lECREDyD46sVGP86gbLK UY0= X-IronPort-AV: E=Sophos;i="5.68,224,1569312000"; d="scan'208";a="42489764" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 24 Oct 2019 01:06:37 -0800 IronPort-SDR: 6QVqR7axlD4wjh0KMOZpmevK6wuS//NZUFmYzctt14Q5HvkWGO3gcaYHZk3dM3LXsGR56nrPc6 2Gj3U7eLGYeu12tqoTCs8VNNvjLXgIyA4dw/qNEDVfTlBOwo9td90WTSKaBtDQGKexf9IlAQ4p 8hN1/wkJIDrm/xAVDuR6Xr3Y3FBbFx9845S+FCI7iZhLN+sHC+9ixRCDKEoNa0U6IfqSZecu2z LGjSPHL0moIslNCpmKGWZbgwGyCs/VA39in4J2u+HxhMyKKEDl9EyBvLxE9nB0AKXhvay+muY/ gSY= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 10/10] meta-isar: add creator-ci40-marduk machine (mipsel + mainline kernel) Date: Thu, 24 Oct 2019 11:02:24 +0200 Message-ID: <1571907744-1121-11-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Cedric_Hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: 7YsJQSM7G1C4 Signed-off-by: Cedric Hombourger --- .../creator-ci40-image-extension.bbclass | 9 +++++++ meta-isar/conf/local.conf.sample | 1 + .../conf/machine/creator-ci40-marduk.conf | 14 ++++++++++ .../creator-ci40-marduk-buster.conf | 7 +++++ ...tachio-set-KBUILD_IMAGE-to-uImage.gz.patch | 27 +++++++++++++++++++ .../recipes-kernel/linux/files/no-display.cfg | 1 + .../recipes-kernel/linux/files/no-fs-nfs.cfg | 6 +++++ .../recipes-kernel/linux/files/no-sound.cfg | 1 + .../linux/linux-mainline_4.19.80.bb | 6 +++++ 9 files changed, 72 insertions(+) create mode 100644 meta-isar/classes/creator-ci40-image-extension.bbclass create mode 100644 meta-isar/conf/machine/creator-ci40-marduk.conf create mode 100644 meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf create mode 100644 meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch create mode 100644 meta-isar/recipes-kernel/linux/files/no-display.cfg create mode 100644 meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg create mode 100644 meta-isar/recipes-kernel/linux/files/no-sound.cfg diff --git a/meta-isar/classes/creator-ci40-image-extension.bbclass b/meta-isar/classes/creator-ci40-image-extension.bbclass new file mode 100644 index 0000000..9879cd7 --- /dev/null +++ b/meta-isar/classes/creator-ci40-image-extension.bbclass @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (C) Mentor Graphics, a Siemens business, 2019 + +ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_creator_ci40" +image_postprocess_creator_ci40() { + sudo mv ${IMAGE_ROOTFS}/boot/vmlinux-* ${IMAGE_ROOTFS}/uImage + sudo mv ${IMAGE_ROOTFS}/usr/lib/linux-*/img/*dtb ${IMAGE_ROOTFS}/ + sudo rm -f ${IMAGE_ROOTFS}/vmlinux* +} diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index d73da1d..62218c2 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -59,6 +59,7 @@ BBMULTICONFIG = " \ hikey-stretch \ nand-ubi-demo-buster \ rpi-stretch \ + creator-ci40-marduk-buster \ " # diff --git a/meta-isar/conf/machine/creator-ci40-marduk.conf b/meta-isar/conf/machine/creator-ci40-marduk.conf new file mode 100644 index 0000000..41c3b3d --- /dev/null +++ b/meta-isar/conf/machine/creator-ci40-marduk.conf @@ -0,0 +1,14 @@ +# +# Copyright (c) Mentor Graphics, a Siemens business, 2019 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "mipsel" + +KERNEL_NAME ?= "mainline" +KERNEL_DEFCONFIG ?= "pistachio_defconfig" +KERNEL_FILE ?= "vmlinux" +KBUILD_DEPENDS_append = " u-boot-tools " + +IMAGE_TYPE ?= "ext4-img" +CUSTOM_IMAGE_EXTENSIONS_append = " creator-ci40-image-extension " diff --git a/meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf b/meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf new file mode 100644 index 0000000..b634a56 --- /dev/null +++ b/meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Mentor Graphics, a Siemens business, 2019 +# +# SPDX-License-Identifier: MIT + +MACHINE = "creator-ci40-marduk" +DISTRO = "debian-buster" diff --git a/meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch b/meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch new file mode 100644 index 0000000..33ee90f --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch @@ -0,0 +1,27 @@ +From 7b8209dd21049d57e80ece10862d90105a1f6340 Mon Sep 17 00:00:00 2001 +From: Cedric Hombourger +Date: Thu, 13 Jun 2019 15:56:48 -0400 +Subject: [PATCH] MIPS: pistachio: set KBUILD_IMAGE to uImage.gz + +scripts/package/builddep uses the image_name make target to determine +the kernel image binary to be included in the linux-image package. As +the u-boot binary expects a kernel in the uImage format, make sure +"make -s image_name" prints arch/mips/boot/uImage.gz. + +Signed-off-by: Cedric Hombourger +--- + arch/mips/pistachio/Platform | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform +index c3592b374ad2..ab3962b8c3b4 100644 +--- a/arch/mips/pistachio/Platform ++++ b/arch/mips/pistachio/Platform +@@ -7,3 +7,4 @@ cflags-$(CONFIG_MACH_PISTACHIO) += \ + load-$(CONFIG_MACH_PISTACHIO) += 0xffffffff80400000 + zload-$(CONFIG_MACH_PISTACHIO) += 0xffffffff81000000 + all-$(CONFIG_MACH_PISTACHIO) := uImage.gz ++KBUILD_IMAGE := arch/mips/boot/uImage.gz +-- +2.11.0 + diff --git a/meta-isar/recipes-kernel/linux/files/no-display.cfg b/meta-isar/recipes-kernel/linux/files/no-display.cfg new file mode 100644 index 0000000..7310c1a --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/no-display.cfg @@ -0,0 +1 @@ +# CONFIG_FB is not set diff --git a/meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg b/meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg new file mode 100644 index 0000000..00a1fd2 --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg @@ -0,0 +1,6 @@ +# CONFIG_NFS is not set +# CONFIG_NFS_COMMON is not set +# CONFIG_NFS_V2 is not set +# CONFIG_NFS_V3 is not set +# CONFIG_ROOT_NFS is not set +# CONFIG_LOCKD is not set diff --git a/meta-isar/recipes-kernel/linux/files/no-sound.cfg b/meta-isar/recipes-kernel/linux/files/no-sound.cfg new file mode 100644 index 0000000..c4f3666 --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/no-sound.cfg @@ -0,0 +1 @@ +# CONFIG_SOUND is not set diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb index 83038f0..13018a4 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb @@ -19,6 +19,12 @@ SRC_URI[sha256sum] = "80a9ba764e088aa7fddfef5a97c0236905e291468a37832243b6f3828d SRC_URI_append_de0-nano-soc = " \ file://0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch" +SRC_URI_append_creator-ci40-marduk = " \ + file://0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch \ + file://no-display.cfg \ + file://no-fs-nfs.cfg \ + file://no-sound.cfg" + S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" -- 2.20.1