|
[PATCH 4.4.y-cip 03/10] dt-bindings: i2c: renesas, i2c: Document r8a7742 support
Biju Das <biju.das.jz@...>
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@...>
commit 315148547563856f48907633cf89da4dd680f72a upstream. Document i2c controller for RZ/G1H (R8A7742) SoC, which is compatible with R-Car Gen2 SoC family. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...> Reviewed-by: Marian-Cristian Rotariu <marian-cristian.rotariu.rb@...> Reviewed-by: Wolfram Sang <wsa+renesas@...> Reviewed-by: Geert Uytterhoeven <geert+renesas@...> Signed-off-by: Rob Herring <robh@...> [biju: Patched the changes from renamed file] Signed-off-by: Biju Das <biju.das.jz@...> --- Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/i2c/i2c-rcar.txt b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt index 0d1aa9e4c292..3587816115db 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-rcar.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt @@ -2,6 +2,7 @@ I2C for R-Car platforms Required properties: - compatible: + "renesas,i2c-r8a7742" if the device is a part of a R8A7742 SoC. "renesas,i2c-r8a7743" if the device is a part of a R8A7743 SoC. "renesas,i2c-r8a7744" if the device is a part of a R8A7744 SoC. "renesas,i2c-r8a7745" if the device is a part of a R8A7745 SoC. -- 2.17.1
|
|
|
|
[PATCH 4.4.y-cip 02/10] ARM: dts: r8a7742: Add IRQC support
Biju Das <biju.das.jz@...>
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@...>
commit a31a8c9cbc0762b096e0b176ba481a60e54db5bf upstream. Describe the IRQC interrupt controller in the r8a7742 device tree. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...> Reviewed-by: Marian-Cristian Rotariu <marian-cristian.rotariu.rb@...> Acked-by: Marc Zyngier <maz@...> Link: https://lore.kernel.org/r/1588794695-27852-4-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Geert Uytterhoeven <geert+renesas@...> [biju: changed clocks and power-domains properties, removed resets property] Signed-off-by: Biju Das <biju.das.jz@...> --- arch/arm/boot/dts/r8a7742.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi index 9e26313e09e1..d128fa1d4847 100644 --- a/arch/arm/boot/dts/r8a7742.dtsi +++ b/arch/arm/boot/dts/r8a7742.dtsi @@ -700,6 +700,19 @@ reg = <0 0xe6160000 0 0x0100>; }; + irqc: interrupt-controller@e61c0000 { + compatible = "renesas,irqc-r8a7742", "renesas,irqc"; + #interrupt-cells = <2>; + interrupt-controller; + reg = <0 0xe61c0000 0 0x200>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp4_clks R8A7742_CLK_IRQC>; + power-domains = <&cpg_clocks>; + }; + icram0: sram@e63a0000 { compatible = "mmio-sram"; reg = <0 0xe63a0000 0 0x12000>; -- 2.17.1
|
|
|
|
[PATCH 4.4.y-cip 01/10] dt-bindings: irqchip: renesas-irqc: Document r8a7742 bindings
Biju Das <biju.das.jz@...>
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@...>
commit a658d9bcd262421e7e63f4f3693e7e60b18422f3 upstream. Document SoC specific bindings for RZ/G1H (r8a7742) SoC. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...> Reviewed-by: Marian-Cristian Rotariu <marian-cristian.rotariu.rb@...> Reviewed-by: Geert Uytterhoeven <geert+renesas@...> Signed-off-by: Rob Herring <robh@...> [biju: Patched text version of bindings file] Signed-off-by: Biju Das <biju.das.jz@...> --- .../devicetree/bindings/interrupt-controller/renesas,irqc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt index eea4c7b6a09e..9ab84cb471f6 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt @@ -5,6 +5,7 @@ Required properties: - compatible: has to be "renesas,irqc-<soctype>", "renesas,irqc" as fallback. Examples with soctypes are: - "renesas,irqc-r8a73a4" (R-Mobile APE6) + - "renesas,irqc-r8a7742" (RZ/G1H) - "renesas,irqc-r8a7743" (RZ/G1M) - "renesas,irqc-r8a7744" (RZ/G1N) - "renesas,irqc-r8a7745" (RZ/G1E) -- 2.17.1
|
|
|
|
[PATCH 4.4.y-cip 00/10] Add IRQC/I2C/IIC/AVB/APMU support for RZ/G1H
Biju Das <biju.das.jz@...>
This patch series add IRQC/I2C/IIC/AVB/APMU support for iWave RZ/G1H board based on
r8a7742 SoC to 4.4.y-cip kernel. All patches in this series are cherry-picked from mainline. Lad Prabhakar (10): dt-bindings: irqchip: renesas-irqc: Document r8a7742 bindings ARM: dts: r8a7742: Add IRQC support dt-bindings: i2c: renesas, i2c: Document r8a7742 support dt-bindings: i2c: renesas, iic: Document r8a7742 support ARM: dts: r8a7742: Add I2C and IIC support dt-bindings: net: renesas, ravb: Add support for r8a7742 SoC ARM: dts: r8a7742: Add Ethernet AVB support ARM: dts: r8a7742-iwg21d-q7: Enable Ethernet AVB dt-bindings: power: renesas,apmu: Document r8a7742 support ARM: dts: r8a7742: Add APMU nodes .../devicetree/bindings/i2c/i2c-rcar.txt | 1 + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + .../interrupt-controller/renesas,irqc.txt | 1 + .../devicetree/bindings/net/renesas,ravb.txt | 1 + .../bindings/power/renesas,apmu.txt | 1 + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 21 +++ arch/arm/boot/dts/r8a7742.dtsi | 148 ++++++++++++++++++ 7 files changed, 174 insertions(+) -- 2.17.1
|
|
|
|
Re: [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
Jan Kiszka
On 01.09.20 01:03, Nobuhiro Iwamatsu wrote:
Hi,Yes, unfortunately. gitlab packages differently (under a different-----Original Message-----I thought it would be good to use a URL as a variable and overwrite it. directory) than korg. That prevents simply providing one as a fallback mirror of the other, at least when pulling tarballs rather than full git trees. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
|
|
|
|
[linux-cip-ci][PATCH 3/3] lava_templates: Add test script for generated yaml file
Nobuhiro Iwamatsu
This will add a script that will output the final YAML generated.
This is used to verify YAML. ``` $ ./lava_templates/show_generated_yaml.sh de0-nano-soc arm \ deby-buster-ltp ltp-ipc-tests true ``` Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...> --- lava_templates/show_generated_yaml.sh | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 lava_templates/show_generated_yaml.sh diff --git a/lava_templates/show_generated_yaml.sh b/lava_templates/show_generated_yaml.sh new file mode 100755 index 0000000..e383765 --- /dev/null +++ b/lava_templates/show_generated_yaml.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# Copyright (C) 2020, Renesas Electronics Europe GmbH, Chris Paterson <chris.paterson2@...> +# Copyright (C) 2020, Toshiba Nobuhiro Iwamtasu <nobuhiro1.iwamatsu@...> +# + +set -e + +# $1: OS type +# $2: Test name +create_job_definition () { + local base_os="$1" + local testname="$2" + + local dtb_url="$AWS_URL_DOWN/$DTB" + local kernel_url="$AWS_URL_DOWN/$KERNEL" + local modules_url="$AWS_URL_DOWN/$MODULES" + + local commit_ref=$(echo "${CI_COMMIT_REF_NAME}" | sed 's/\//-/g') + + if $USE_DTB; then + local job_name="${commit_ref}_${VERSION}_${BUILD_ARCH}_${CONFIG}_${DTB_NAME}_${testname}" + else + local job_name="${commit_ref}_${VERSION}_${BUILD_ARCH}_${CONFIG}_${testname}" + fi + + local job_definition="$TMP_DIR/${INDEX}_${job_name}.yaml" + INDEX=$((INDEX+1)) + + cat ${TEMPLATE_DIR}/header_base.yaml > "${job_definition}" + if [ "${DEVICE}" = "qemu" ] ; then + local device_name="${DEVICE}_${BUILD_ARCH}" + cat ${TEMPLATE_DIR}/context_${device_name}.yaml >> "${job_definition}" + else + local device_name="${DEVICE}" + fi + + cat ${TEMPLATE_DIR}/timeouts_"${testname}".yaml \ + ${TEMPLATE_DIR}/action_"${base_os}"_"${device_name}".yaml \ + ${TEMPLATE_DIR}/boot_"${base_os}"_"${device_name}".yaml \ + ${TEMPLATE_DIR}/test_"${testname}".yaml \ + >> "${job_definition}" + + sed -i "s|DEVICE_NAME|${DEVICE}|g" "$job_definition" + sed -i "s|JOB_NAME|$job_name|g" "$job_definition" + if $USE_MODULES; then + sed -i "/DTB_URL/ a \ modules:\n url: $modules_url\n compression: gz" "$job_definition" + fi + if $USE_DTB; then + sed -i "s|DTB_URL|$dtb_url|g" "$job_definition" + fi + sed -i "s|KERNEL_URL|$kernel_url|g" "$job_definition" + + echo ${job_definition} + cat ${job_definition} +} + +SCRIPT_DIR=$(cd $(dirname $0);pwd) + +TEMPLATE_DIR="${SCRIPT_DIR}" +TMP_DIR="/tmp/" +AWS_URL_DOWN="exmample.org" +KERNEL="zImage" +DTB="foo.dtb" +MODULES="bar.tar.gz" +VERSION="4.19.1-1" +CI_COMMIT_REF_NAME="a/b/c/d" +CONFIG="testconfig" +DTB_NAME="test-dtb" +INDEX="1" +DEVICE=$1 +BUILD_ARCH=$2 +USE_DTB=$5 + +create_job_definition $3 $4 -- 2.27.0
|
|
|
|
[linux-cip-ci][PATCH 2/3] lava_templates: Add support zynqmp-zcu102
Nobuhiro Iwamatsu
Add ltp and boot/smc test YAML files for zynqmp-zcu102 with deby.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...> --- .../action_deby-buster-ltp_zynqmp-zcu102.yaml | 16 ++++++++++++++++ .../action_deby-buster_zynqmp-zcu102.yaml | 16 ++++++++++++++++ .../boot_deby-buster-ltp_zynqmp-zcu102.yaml | 1 + .../boot_deby-buster_zynqmp-zcu102.yaml | 12 ++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml create mode 100644 lava_templates/action_deby-buster_zynqmp-zcu102.yaml create mode 120000 lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml create mode 100644 lava_templates/boot_deby-buster_zynqmp-zcu102.yaml diff --git a/lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml b/lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml new file mode 100644 index 0000000..bca9892 --- /dev/null +++ b/lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml @@ -0,0 +1,16 @@ +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 10 + to: tftp + os: oe + kernel: + url: KERNEL_URL + type: image + nfsrootfs: + url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-ltp-zcu102-zynqmp.tar.bz2 + compression: bz2 + dtb: + url: DTB_URL + diff --git a/lava_templates/action_deby-buster_zynqmp-zcu102.yaml b/lava_templates/action_deby-buster_zynqmp-zcu102.yaml new file mode 100644 index 0000000..3d2cce0 --- /dev/null +++ b/lava_templates/action_deby-buster_zynqmp-zcu102.yaml @@ -0,0 +1,16 @@ +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 10 + to: tftp + os: oe + kernel: + url: KERNEL_URL + type: image + nfsrootfs: + url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-zcu102-zynqmp.tar.bz2 + compression: bz2 + dtb: + url: DTB_URL + diff --git a/lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml b/lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml new file mode 120000 index 0000000..67c02c5 --- /dev/null +++ b/lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml @@ -0,0 +1 @@ +boot_deby-buster_zynqmp-zcu102.yaml \ No newline at end of file diff --git a/lava_templates/boot_deby-buster_zynqmp-zcu102.yaml b/lava_templates/boot_deby-buster_zynqmp-zcu102.yaml new file mode 100644 index 0000000..db223b4 --- /dev/null +++ b/lava_templates/boot_deby-buster_zynqmp-zcu102.yaml @@ -0,0 +1,12 @@ +# BOOT_BLOCK +- boot: + auto_login: + login_prompt: 'zcu102-zynqmp login:' + username: root + prompts: + - '# ' + method: u-boot + commands: nfs + timeout: + minutes: 5 + -- 2.27.0
|
|
|
|
[linux-cip-ci][PATCH 1/3] lava_templates: Add support de0-nano-soc for deby
Nobuhiro Iwamatsu
Add ltp and boot/smc test YAML files for de0-nano-soc with deby.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...> --- .../action_deby-buster-ltp_de0-nano-soc.yaml | 15 +++++++++++++++ .../action_deby-buster_de0-nano-soc.yaml | 15 +++++++++++++++ .../boot_deby-buster-ltp_de0-nano-soc.yaml | 1 + lava_templates/boot_deby-buster_de0-nano-soc.yaml | 12 ++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml create mode 100644 lava_templates/action_deby-buster_de0-nano-soc.yaml create mode 120000 lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml create mode 100644 lava_templates/boot_deby-buster_de0-nano-soc.yaml diff --git a/lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml b/lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml new file mode 100644 index 0000000..215750a --- /dev/null +++ b/lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml @@ -0,0 +1,15 @@ +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 10 + to: tftp + os: oe + kernel: + url: KERNEL_URL + type: zimage + nfsrootfs: + url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-ltp-de0-nano-soc.tar.bz2 + compression: bz2 + dtb: + url: DTB_URL diff --git a/lava_templates/action_deby-buster_de0-nano-soc.yaml b/lava_templates/action_deby-buster_de0-nano-soc.yaml new file mode 100644 index 0000000..215750a --- /dev/null +++ b/lava_templates/action_deby-buster_de0-nano-soc.yaml @@ -0,0 +1,15 @@ +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 10 + to: tftp + os: oe + kernel: + url: KERNEL_URL + type: zimage + nfsrootfs: + url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-ltp-de0-nano-soc.tar.bz2 + compression: bz2 + dtb: + url: DTB_URL diff --git a/lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml b/lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml new file mode 120000 index 0000000..42fb694 --- /dev/null +++ b/lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml @@ -0,0 +1 @@ +boot_deby-buster_de0-nano-soc.yaml \ No newline at end of file diff --git a/lava_templates/boot_deby-buster_de0-nano-soc.yaml b/lava_templates/boot_deby-buster_de0-nano-soc.yaml new file mode 100644 index 0000000..85debd4 --- /dev/null +++ b/lava_templates/boot_deby-buster_de0-nano-soc.yaml @@ -0,0 +1,12 @@ +# BOOT_BLOCK +- boot: + auto_login: + login_prompt: "de0-nano-soc login:" + username: root + prompts: + - "# " + method: u-boot + commands: nfs + timeout: + minutes: 5 + -- 2.27.0
|
|
|
|
Re: [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
Nobuhiro Iwamatsu
Hi,
toggle quoted messageShow quoted text
-----Original Message-----I thought it would be good to use a URL as a variable and overwrite it. Is it difficult because the hash of the file changes depending on the mirror? "Best regards, Nobuhiro
|
|
|
|
Re: [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
Nobuhiro Iwamatsu
Hi,
toggle quoted messageShow quoted text
-----Original Message-----I checked this patch. The problem has been fixed. Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...> Best regards, Nobuhiro ---
|
|
|
|
Re: [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
Nobuhiro Iwamatsu
Hi,
toggle quoted messageShow quoted text
Thanks for fix this issue.
-----Original Message-----Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...> Best regards, Nobuhiro ---
|
|
|
|
Re: [isar-cip-core][PATCH] ci: Change to single job
Nobuhiro Iwamatsu
Hi,
toggle quoted messageShow quoted text
-----Original Message-----Right. I will add. Also, this does not address the breakage of the hihope-rzg2m deployment.Oh, sorry, I will check your patch. JanBest regards, Nobuhiro .gitlab-ci.yml | 122 +++++++++++++--------------------------------------
|
|
|
|
Re: [PATCH 4.4.y-cip 00/30] Add iWave RZ/G1H basic board support
Biju Das <biju.das.jz@...>
Thanks Pavel.
toggle quoted messageShow quoted text
Cheers, Biju
-----Original Message----- Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
|
|
|
|
[isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
Jan Kiszka
From: Jan Kiszka <jan.kiszka@...>
This allows for fixing the extends-based CI build. Fixes: 3510f8a66f80 ("ci: Rewrite using extends") Signed-off-by: Jan Kiszka <jan.kiszka@...> --- .gitlab-ci.yml | 4 ++-- kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af900de..cd25437 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ build:hihope-rzg2m-base: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb build:qemu-amd64-base: @@ -97,6 +97,6 @@ build:hihope-rzg2m-test: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m extention: test dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb diff --git a/kas/board/rzg2m.yml b/kas/board/hihope-rzg2m.yml similarity index 100% rename from kas/board/rzg2m.yml rename to kas/board/hihope-rzg2m.yml -- 2.26.2
|
|
|
|
[isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
Jan Kiszka
From: Jan Kiszka <jan.kiszka@...>
The switch is needed as kernel.org snapshot tend to fail too often. Signed-off-by: Jan Kiszka <jan.kiszka@...> --- recipes-kernel/linux/linux-cip-common.inc | 4 +++- recipes-kernel/linux/linux-cip-rt-common.inc | 2 -- recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +- recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +- ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +- recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%) diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc index 0c76835..7e09090 100644 --- a/recipes-kernel/linux/linux-cip-common.inc +++ b/recipes-kernel/linux/linux-cip-common.inc @@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): 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 \ + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \ " 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 ?= "ca24d965adf77730caf1cd32bdfcffd69e369502" + +S = "${WORKDIR}/linux-cip-v${PV}" diff --git a/recipes-kernel/linux/linux-cip-rt-common.inc b/recipes-kernel/linux/linux-cip-rt-common.inc index d182358..dffb77b 100644 --- a/recipes-kernel/linux/linux-cip-rt-common.inc +++ b/recipes-kernel/linux/linux-cip-rt-common.inc @@ -13,8 +13,6 @@ require linux-cip-common.inc SRC_URI += "file://preempt-rt.cfg" -S = "${WORKDIR}/linux-cip-${PV}" - do_prepare_build_prepend() { cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG} } diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb index 7414f23..820c1ab 100644 --- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb +++ b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb @@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db" +SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743" diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb index 8881071..e13fc14 100644 --- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb +++ b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb @@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5" +SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e" diff --git a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb similarity index 67% rename from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb rename to recipes-kernel/linux/linux-cip_4.19.140-cip33.bb index 59afd8e..9e958c0 100644 --- a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb +++ b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb @@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6" +SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5" diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb index 2303d49..af49441 100644 --- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb +++ b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb @@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531" +SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf" -- 2.26.2
|
|
|
|
[isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
Jan Kiszka
From: Jan Kiszka <jan.kiszka@...>
This is not used, and the image is not available, so it breaks the build. Fixes: 3510f8a66f80 ("ci: Rewrite using extends") Signed-off-by: Jan Kiszka <jan.kiszka@...> --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd25437..0b0a771 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: use_rt: enable targz: enable dtb: none + deploy: enable stages: - build @@ -30,7 +31,7 @@ default: - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi; - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi; - kas build ${base_yaml} - - scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb} + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi # base image build:simatic-ipc227e-base: @@ -68,6 +69,7 @@ build:qemu-amd64-base: extention: security use_rt: disable targz: disable + deploy: disable # test build:simatic-ipc227e-test: -- 2.26.2
|
|
|
|
[isar-cip-core][PATCH 0/3] ci fixes
Jan Kiszka
This fixes ci, keeping the parallel build.
Obsoletes "ci: Fix hihope-rzg2m deployment". Jan Jan Kiszka (3): hihope-rzg2m: Align kas filename with machine name ci: Do not try to deploy the security image linux-cip Switch to gitlab source and update to 4.19.140-cip33 .gitlab-ci.yml | 8 +++++--- kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0 recipes-kernel/linux/linux-cip-common.inc | 4 +++- recipes-kernel/linux/linux-cip-rt-common.inc | 2 -- recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +- recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +- ...-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +- recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%) rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%) -- 2.26.2
|
|
|
|
Re: [isar-cip-core][PATCH] ci: Change to single job
Jan Kiszka
On 31.08.20 08:01, Jan Kiszka wrote:
On 31.08.20 03:02, Nobuhiro Iwamatsu wrote:Meanwhile, kernel.org seems to handle our parallel fetches again, seeSigned-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...>The reason should be documented in the commit log. How about https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/183722607. I'll drop this patch and focus on fixing the remaining fallouts (missed on, namely the skipped deployment of the security image). Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
|
|
|
|
[isar-cip-core][PATCH] Update / pin to kas 2.2
Jan Kiszka
From: Jan Kiszka <jan.kiszka@...>
Better recommend a well-defined version in the README and use that in CI as well. 2.2 is latest release. Signed-off-by: Jan Kiszka <jan.kiszka@...> --- .gitlab-ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8f398d..163c0d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: kasproject/kas-isar:1.1 +image: kasproject/kas-isar:2.2 variables: GIT_STRATEGY: clone diff --git a/README.md b/README.md index 250dbad..4f74af7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ from scratch. Install `kas-docker` from the [kas project](https://github.com/siemens/kas): - wget https://raw.githubusercontent.com/siemens/kas/master/kas-docker + wget https://raw.githubusercontent.com/siemens/kas/2.2/kas-docker chmod a+x kas-docker Furthermore, install docker and make sure you have required permissions to -- 2.26.2
|
|
|
|
[isar-cip-core][PATCH] ci: Fix hihope-rzg2m deployment
Jan Kiszka
From: Jan Kiszka <jan.kiszka@...>
Fixes: 3510f8a66f80 ("ci: Rewrite using extends") Signed-off-by: Jan Kiszka <jan.kiszka@...> --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bd4774..e8f398d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ all: - scripts/deploy-cip-core.sh buster iwg20m base r8a7743-iwg20d-q7-dbcm-ca.dtb # rzg2m - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml - - scripts/deploy-cip-core.sh buster rzg2m base renesas/r8a774a1-hihope-rzg2m-ex.dtb + - scripts/deploy-cip-core.sh buster hihope-rzg2m base renesas/r8a774a1-hihope-rzg2m-ex.dtb # qemu-amd64 / security - kas build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml @@ -41,4 +41,4 @@ all: - scripts/deploy-cip-core.sh buster iwg20m test r8a7743-iwg20d-q7-dbcm-ca.dtb # rzg2m / test - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml - - scripts/deploy-cip-core.sh buster rzg2m test renesas/r8a774a1-hihope-rzg2m-ex.dtb + - scripts/deploy-cip-core.sh buster hihope-rzg2m test renesas/r8a774a1-hihope-rzg2m-ex.dtb -- 2.26.2 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
|
|
|