All of lore.kernel.org
 help / color / mirror / Atom feed
* [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images
@ 2020-01-08 14:33 Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
                   ` (10 more replies)
  0 siblings, 11 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-08 14:33 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Use the kernel_defconfigs
from https://gitlab.com/cip-project/cip-kernel/cip-kernel-config
to build the images for rzg2m, iwg20m and simatic-ipc227e.

The final patch is necessary until isar upstream will apply it.

Quirin Gylstorff (5):
  recipes-kernel/linux: allow the usage of the cip-kernel-config
  Use renesas-config for hihope-rzg2m
  Use renesas_shmobile_defconfig for iwg20m
  Use siemens_ipc227e_defconfig for simatic-ipc227e
  kas: patch isar for iwg20m with kernel 4.4

 conf/machine/hihope-rzg2m.conf                |  3 +-
 conf/machine/iwg20m.conf                      |  2 +
 conf/machine/simatic-ipc227e.conf             |  2 +
 ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++
 kas.yml                                       |  9 ++++-
 recipes-kernel/linux/linux-cip-common.inc     | 18 +++++++--
 6 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch

-- 
2.20.1

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
@ 2020-01-08 14:33 ` Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 2/5] Use renesas-config for hihope-rzg2m Q. Gylstorff
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-08 14:33 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

To avoid the duplication of the linux cip kernel configuration
add the option USE_CIP_KERNEL_CONFIG. If this option is set to 1
the KERNEL_DEFCONFIG from the cip project is used. The KERNEL_DEFCONFIG
is contains the explicit path to the defconfig in
gitlab.com/cip-project/cip-kernel-config.git.

SRCREV_cip-kernel-config sets the commit sha for checkout.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/hihope-rzg2m.conf            |  1 -
 kas.yml                                   |  4 ++--
 recipes-kernel/linux/linux-cip-common.inc | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 8b8849f..863e20d 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -13,6 +13,5 @@ DISTRO_ARCH = "arm64"
 
 IMAGE_TYPE ?= "wic-img"
 
-KERNEL_DEFCONFIG = "https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/raw/693be1bfb92e6c0ef813cf29431ac49eab0e15be/4.19.y-cip/arm64/renesas_defconfig"
 DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
diff --git a/kas.yml b/kas.yml
index aa7ddda..3eb6f03 100644
--- a/kas.yml
+++ b/kas.yml
@@ -18,8 +18,8 @@ repos:
   cip-core:
 
   isar:
-    url: https://github.com/ilbers/isar
-    refspec: 20a5e368021d988d8f0dcd1951b395d194a37ebb
+    url: https://github.com/ilbers/isar.git
+    refspec: 619d6d88ac8c745282fd16773d50a466567615b6
     layers:
       meta:
 
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index d65cfa3..3fae2fe 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -9,10 +9,22 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-kernel/linux/linux-custom.inc
+KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig"
+
+def conditional(variable, checkvalue, truevalue, falsevalue, d):
+    if d.getVar(variable) == checkvalue:
+        return truevalue
+    else:
+        return falsevalue
 
-KERNEL_DEFCONFIG = "${MACHINE}_defconfig"
+require recipes-kernel/linux/linux-custom.inc
 
 SRC_URI += " \
     https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \
-    file://${KERNEL_DEFCONFIG}"
+"
+
+SRC_URI_append = "${@conditional("USE_CIP_KERNEL_CONFIG","1", \
+" git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;destsuffix=cip-kernel-config;name=cip-kernel-config" \
+," file://${KERNEL_DEFCONFIG}",d)}"
+SRCREV_cip-kernel-config ?= "f88ee1e75253104f975263cf4d0bddd557388197"
+
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH 2/5] Use renesas-config for hihope-rzg2m
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
@ 2020-01-08 14:33 ` Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 3/5] Use renesas_shmobile_defconfig for iwg20m Q. Gylstorff
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-08 14:33 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/hihope-rzg2m.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 863e20d..8278205 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -13,5 +13,7 @@ DISTRO_ARCH = "arm64"
 
 IMAGE_TYPE ?= "wic-img"
 
+KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig"
+USE_CIP_KERNEL_CONFIG = "1"
 DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH 3/5] Use renesas_shmobile_defconfig for iwg20m
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 2/5] Use renesas-config for hihope-rzg2m Q. Gylstorff
@ 2020-01-08 14:33 ` Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e Q. Gylstorff
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-08 14:33 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/iwg20m.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf
index 6c1a227..37f98fa 100644
--- a/conf/machine/iwg20m.conf
+++ b/conf/machine/iwg20m.conf
@@ -17,6 +17,8 @@ BAUDRATE_TTY = "115200"
 # kernel version
 PREFERRED_VERSION_linux-cip ?= "4.4.%"
 PREFERRED_VERSION_linux-cip-rt ?= "4.4.%"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig"
 
 # Boot partition files
 DTB_FILE = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (2 preceding siblings ...)
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 3/5] Use renesas_shmobile_defconfig for iwg20m Q. Gylstorff
@ 2020-01-08 14:33 ` Q. Gylstorff
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 5/5] kas: patch isar for iwg20m with kernel 4.4 Q. Gylstorff
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-08 14:33 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/simatic-ipc227e.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf
index 473e6c5..3c9638f 100644
--- a/conf/machine/simatic-ipc227e.conf
+++ b/conf/machine/simatic-ipc227e.conf
@@ -10,3 +10,5 @@ DISTRO_ARCH = "amd64"
 
 IMAGE_TYPE ?= "wic-img"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig"
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH 5/5] kas: patch isar for iwg20m with kernel 4.4
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (3 preceding siblings ...)
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e Q. Gylstorff
@ 2020-01-08 14:33 ` Q. Gylstorff
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-08 14:33 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++
 kas.yml                                       |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch

diff --git a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
new file mode 100644
index 0000000..3e4e13e
--- /dev/null
+++ b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
@@ -0,0 +1,37 @@
+From 4961476f3affabd2bfb8f12ccc86c0abc6a66200 Mon Sep 17 00:00:00 2001
+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+Date: Wed, 8 Jan 2020 14:43:01 +0100
+Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12
+To: isar-users at googlegroups.com
+
+ARM/ARM64 Kernel with a version < 4.12 do not contain the path to
+the kernel image in image_name. This was added with commits:
+152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and
+06995804b5762f016c7a80503406da853a8f3785 for arm64.
+
+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+---
+ meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
+index 67b7ce3..ac347aa 100644
+--- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
++++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
+@@ -56,7 +56,12 @@ EOF
+ 
+ install_image() {
+     install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path})
+-    cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
++    # ARM/ARM64 kernels < 4.12 do not include the path to the kernel
++    if [ -e ${O}/${kimage} ]; then
++        cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
++    else
++        cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path}
++    fi
+ 
+     # Make sure arm64 kernels are decompressed
+     if [ "${ARCH}" = "arm64" ]; then
+-- 
+2.20.1
+
diff --git a/kas.yml b/kas.yml
index 3eb6f03..a157dc9 100644
--- a/kas.yml
+++ b/kas.yml
@@ -22,6 +22,11 @@ repos:
     refspec: 619d6d88ac8c745282fd16773d50a466567615b6
     layers:
       meta:
+    patches:
+      build-arm-with-4.4:
+        path: isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
+        repo: cip-core
+
 
 bblayers_conf_header:
   standard: |
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 0/5] Use cip-kernel-config for images
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (4 preceding siblings ...)
  2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 5/5] kas: patch isar for iwg20m with kernel 4.4 Q. Gylstorff
@ 2020-01-09  8:52 ` Q. Gylstorff
  2020-01-13 12:46   ` Jan Kiszka
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
                   ` (4 subsequent siblings)
  10 siblings, 1 reply; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-09  8:52 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Use the kernel_defconfigs
from https://gitlab.com/cip-project/cip-kernel/cip-kernel-config
to build the images for rzg2m, iwg20m and simatic-ipc227e.

The final patch is necessary until isar upstream will apply it.

Version 2:
- Add the missing protocol to download the repository cip-kernel-config

Quirin Gylstorff (5):
  recipes-kernel/linux: allow the usage of the cip-kernel-config
  Use renesas-config for hihope-rzg2m
  Use renesas_shmobile_defconfig for iwg20m
  Use siemens_ipc227e_defconfig for simatic-ipc227e
  kas: patch isar for iwg20m with kernel 4.4

 conf/machine/hihope-rzg2m.conf                |  3 +-
 conf/machine/iwg20m.conf                      |  2 +
 conf/machine/simatic-ipc227e.conf             |  2 +
 ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++
 kas.yml                                       |  9 ++++-
 recipes-kernel/linux/linux-cip-common.inc     | 18 +++++++--
 6 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch

-- 
2.20.1

bb

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (5 preceding siblings ...)
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 0/5] Use cip-kernel-config for images Q. Gylstorff
@ 2020-01-09  8:52 ` Q. Gylstorff
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 2/5] Use renesas-config for hihope-rzg2m Q. Gylstorff
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-09  8:52 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

To avoid the duplication of the linux cip kernel configuration
add the option USE_CIP_KERNEL_CONFIG. If this option is set to 1
the KERNEL_DEFCONFIG from the cip project is used. The KERNEL_DEFCONFIG
is contains the explicit path to the defconfig in
gitlab.com/cip-project/cip-kernel-config.git.

SRCREV_cip-kernel-config sets the commit sha for checkout.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/hihope-rzg2m.conf            |  1 -
 kas.yml                                   |  4 ++--
 recipes-kernel/linux/linux-cip-common.inc | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 8b8849f..863e20d 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -13,6 +13,5 @@ DISTRO_ARCH = "arm64"
 
 IMAGE_TYPE ?= "wic-img"
 
-KERNEL_DEFCONFIG = "https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/raw/693be1bfb92e6c0ef813cf29431ac49eab0e15be/4.19.y-cip/arm64/renesas_defconfig"
 DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
diff --git a/kas.yml b/kas.yml
index aa7ddda..3eb6f03 100644
--- a/kas.yml
+++ b/kas.yml
@@ -18,8 +18,8 @@ repos:
   cip-core:
 
   isar:
-    url: https://github.com/ilbers/isar
-    refspec: 20a5e368021d988d8f0dcd1951b395d194a37ebb
+    url: https://github.com/ilbers/isar.git
+    refspec: 619d6d88ac8c745282fd16773d50a466567615b6
     layers:
       meta:
 
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index d65cfa3..f8cbf50 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -9,10 +9,22 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-kernel/linux/linux-custom.inc
+KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig"
+
+def conditional(variable, checkvalue, truevalue, falsevalue, d):
+    if d.getVar(variable) == checkvalue:
+        return truevalue
+    else:
+        return falsevalue
 
-KERNEL_DEFCONFIG = "${MACHINE}_defconfig"
+require recipes-kernel/linux/linux-custom.inc
 
 SRC_URI += " \
     https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \
-    file://${KERNEL_DEFCONFIG}"
+"
+
+SRC_URI_append = "${@conditional("USE_CIP_KERNEL_CONFIG","1", \
+" git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=cip-kernel-config" \
+," file://${KERNEL_DEFCONFIG}",d)}"
+SRCREV_cip-kernel-config ?= "f88ee1e75253104f975263cf4d0bddd557388197"
+
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 2/5] Use renesas-config for hihope-rzg2m
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (6 preceding siblings ...)
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
@ 2020-01-09  8:52 ` Q. Gylstorff
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 3/5] Use renesas_shmobile_defconfig for iwg20m Q. Gylstorff
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-09  8:52 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/hihope-rzg2m.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 863e20d..8278205 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -13,5 +13,7 @@ DISTRO_ARCH = "arm64"
 
 IMAGE_TYPE ?= "wic-img"
 
+KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig"
+USE_CIP_KERNEL_CONFIG = "1"
 DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 3/5] Use renesas_shmobile_defconfig for iwg20m
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (7 preceding siblings ...)
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 2/5] Use renesas-config for hihope-rzg2m Q. Gylstorff
@ 2020-01-09  8:52 ` Q. Gylstorff
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e Q. Gylstorff
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 5/5] kas: patch isar for iwg20m with kernel 4.4 Q. Gylstorff
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-09  8:52 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/iwg20m.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf
index 6c1a227..37f98fa 100644
--- a/conf/machine/iwg20m.conf
+++ b/conf/machine/iwg20m.conf
@@ -17,6 +17,8 @@ BAUDRATE_TTY = "115200"
 # kernel version
 PREFERRED_VERSION_linux-cip ?= "4.4.%"
 PREFERRED_VERSION_linux-cip-rt ?= "4.4.%"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig"
 
 # Boot partition files
 DTB_FILE = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (8 preceding siblings ...)
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 3/5] Use renesas_shmobile_defconfig for iwg20m Q. Gylstorff
@ 2020-01-09  8:52 ` Q. Gylstorff
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 5/5] kas: patch isar for iwg20m with kernel 4.4 Q. Gylstorff
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-09  8:52 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/simatic-ipc227e.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf
index 473e6c5..3c9638f 100644
--- a/conf/machine/simatic-ipc227e.conf
+++ b/conf/machine/simatic-ipc227e.conf
@@ -10,3 +10,5 @@ DISTRO_ARCH = "amd64"
 
 IMAGE_TYPE ?= "wic-img"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig"
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 5/5] kas: patch isar for iwg20m with kernel 4.4
  2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
                   ` (9 preceding siblings ...)
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e Q. Gylstorff
@ 2020-01-09  8:52 ` Q. Gylstorff
  10 siblings, 0 replies; 13+ messages in thread
From: Q. Gylstorff @ 2020-01-09  8:52 UTC (permalink / raw)
  To: cip-dev

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++
 kas.yml                                       |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch

diff --git a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
new file mode 100644
index 0000000..3e4e13e
--- /dev/null
+++ b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
@@ -0,0 +1,37 @@
+From 4961476f3affabd2bfb8f12ccc86c0abc6a66200 Mon Sep 17 00:00:00 2001
+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+Date: Wed, 8 Jan 2020 14:43:01 +0100
+Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12
+To: isar-users at googlegroups.com
+
+ARM/ARM64 Kernel with a version < 4.12 do not contain the path to
+the kernel image in image_name. This was added with commits:
+152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and
+06995804b5762f016c7a80503406da853a8f3785 for arm64.
+
+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+---
+ meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
+index 67b7ce3..ac347aa 100644
+--- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
++++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
+@@ -56,7 +56,12 @@ EOF
+ 
+ install_image() {
+     install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path})
+-    cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
++    # ARM/ARM64 kernels < 4.12 do not include the path to the kernel
++    if [ -e ${O}/${kimage} ]; then
++        cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
++    else
++        cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path}
++    fi
+ 
+     # Make sure arm64 kernels are decompressed
+     if [ "${ARCH}" = "arm64" ]; then
+-- 
+2.20.1
+
diff --git a/kas.yml b/kas.yml
index 3eb6f03..a157dc9 100644
--- a/kas.yml
+++ b/kas.yml
@@ -22,6 +22,11 @@ repos:
     refspec: 619d6d88ac8c745282fd16773d50a466567615b6
     layers:
       meta:
+    patches:
+      build-arm-with-4.4:
+        path: isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
+        repo: cip-core
+
 
 bblayers_conf_header:
   standard: |
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [cip-dev] [isar-cip-core PATCH v2 0/5] Use cip-kernel-config for images
  2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 0/5] Use cip-kernel-config for images Q. Gylstorff
@ 2020-01-13 12:46   ` Jan Kiszka
  0 siblings, 0 replies; 13+ messages in thread
From: Jan Kiszka @ 2020-01-13 12:46 UTC (permalink / raw)
  To: cip-dev

On 09.01.20 09:52, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Use the kernel_defconfigs
> from https://gitlab.com/cip-project/cip-kernel/cip-kernel-config
> to build the images for rzg2m, iwg20m and simatic-ipc227e.
> 
> The final patch is necessary until isar upstream will apply it.
> 
> Version 2:
> - Add the missing protocol to download the repository cip-kernel-config
> 
> Quirin Gylstorff (5):
>    recipes-kernel/linux: allow the usage of the cip-kernel-config
>    Use renesas-config for hihope-rzg2m
>    Use renesas_shmobile_defconfig for iwg20m
>    Use siemens_ipc227e_defconfig for simatic-ipc227e
>    kas: patch isar for iwg20m with kernel 4.4
> 
>   conf/machine/hihope-rzg2m.conf                |  3 +-
>   conf/machine/iwg20m.conf                      |  2 +
>   conf/machine/simatic-ipc227e.conf             |  2 +
>   ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++
>   kas.yml                                       |  9 ++++-
>   recipes-kernel/linux/linux-cip-common.inc     | 18 +++++++--
>   6 files changed, 65 insertions(+), 6 deletions(-)
>   create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
> 

Applied to next, just minimally massaged the style of patch 1.

Thanks,
Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2020-01-13 12:46 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-08 14:33 [cip-dev] [isar-cip-core PATCH 0/5] Use cip-kernel-config for images Q. Gylstorff
2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 2/5] Use renesas-config for hihope-rzg2m Q. Gylstorff
2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 3/5] Use renesas_shmobile_defconfig for iwg20m Q. Gylstorff
2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e Q. Gylstorff
2020-01-08 14:33 ` [cip-dev] [isar-cip-core PATCH 5/5] kas: patch isar for iwg20m with kernel 4.4 Q. Gylstorff
2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 0/5] Use cip-kernel-config for images Q. Gylstorff
2020-01-13 12:46   ` Jan Kiszka
2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config Q. Gylstorff
2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 2/5] Use renesas-config for hihope-rzg2m Q. Gylstorff
2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 3/5] Use renesas_shmobile_defconfig for iwg20m Q. Gylstorff
2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e Q. Gylstorff
2020-01-09  8:52 ` [cip-dev] [isar-cip-core PATCH v2 5/5] kas: patch isar for iwg20m with kernel 4.4 Q. Gylstorff

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.