diff mbox series

[isar-cip-core,1/2] update ISAR

Message ID 20200625131248.15742-2-Quirin.Gylstorff@siemens.com (mailing list archive)
State Accepted
Headers show
Series Cleanup | expand

Commit Message

Quirin Gylstorff June 25, 2020, 1:12 p.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/hihope-rzg2m.conf                |  4 +-
 conf/machine/iwg20m.conf                      |  4 +-
 ...d-path-to-image-for-arm-kernels-4.12.patch | 37 -------------------
 kas.yml                                       |  7 +---
 4 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch

Comments

Jan Kiszka June 25, 2020, 2:54 p.m. UTC | #1 
On 25.06.20 15:12, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   conf/machine/hihope-rzg2m.conf                |  4 +-
>   conf/machine/iwg20m.conf                      |  4 +-
>   ...d-path-to-image-for-arm-kernels-4.12.patch | 37 -------------------
>   kas.yml                                       |  7 +---
>   4 files changed, 5 insertions(+), 47 deletions(-)
>   delete mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
> 
> diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
> index 8278205..a2ae03d 100644
> --- a/conf/machine/hihope-rzg2m.conf
> +++ b/conf/machine/hihope-rzg2m.conf
> @@ -15,5 +15,5 @@ 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}"
> +DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb"
> +IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
> diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf
> index 37f98fa..91bfd94 100644
> --- a/conf/machine/iwg20m.conf
> +++ b/conf/machine/iwg20m.conf
> @@ -21,6 +21,6 @@ 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"
> +DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
>   KERNEL_IMAGE="zImage"
> -IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
> +IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
> 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
> deleted file mode 100644
> index 3e4e13e..0000000
> --- a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -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@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 a157dc9..019b31e 100644
> --- a/kas.yml
> +++ b/kas.yml
> @@ -19,14 +19,9 @@ repos:
>   
>     isar:
>       url: https://github.com/ilbers/isar.git
> -    refspec: 619d6d88ac8c745282fd16773d50a466567615b6
> +    refspec: 351af175bc54a201c6f44307d4e998bd6c0afdb8
>       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: |
> 

Applied to next.

Thanks,
Jan
diff mbox series

Patch

diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 8278205..a2ae03d 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -15,5 +15,5 @@  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}"
+DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb"
+IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf
index 37f98fa..91bfd94 100644
--- a/conf/machine/iwg20m.conf
+++ b/conf/machine/iwg20m.conf
@@ -21,6 +21,6 @@  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"
+DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
 KERNEL_IMAGE="zImage"
-IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
+IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
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
deleted file mode 100644
index 3e4e13e..0000000
--- a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-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@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 a157dc9..019b31e 100644
--- a/kas.yml
+++ b/kas.yml
@@ -19,14 +19,9 @@  repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 619d6d88ac8c745282fd16773d50a466567615b6
+    refspec: 351af175bc54a201c6f44307d4e998bd6c0afdb8
     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: |