Date   

Re: [PATCH 5.10.y-cip 00/24] Add CPG and initial DTS/I for Renesas RZ/G2L SoC + SMARC EVK

Pavel Machek
 

Hi!

This patch series adds the following:
* Serial support
* Clock support
* Initial RZ/G2L SoC DTSI
- CPU
- CPG
- GIC
* Initial device tree for RZ/G2L SMARC EVK
- memory
- External input clock
- SCIF

All the patches have been cherry picked from 5.16-rc5. For testing purpose
MR [0] can be used.
I will check this series, and I am also checking the build.

https://gitlab.com/cip-project/cip-kernel/linux-cip/-/pipelines/431663140
Thank you. I checked the series and only found some details (some of
them were fixed later in the series). I believe we can apply it.

Reviewed-by: Pavel Machek <pavel@denx.de>
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [PATCH 5.10.y-cip 23/24] clk: renesas: rzg2l: Add support to handle coupled clocks

Pavel Machek
 

Hi!

From: Biju Das <biju.das.jz@bp.renesas.com>

commit 32897e6fff196a5de4981030466ae391dfe56c7b upstream.

The AXI and CHI clocks use the same register bit for controlling clock
output. Add a new clock type for coupled clocks, which sets the
CPG_CLKON_ETH.CLK[01]_ON bit when at least one clock is enabled, and
clears the bit only when both clocks are disabled.
So the clocks can have different properties (frequency?), but can only
be enabled/disabled together? So we can't handle them as one clock?

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [PATCH 5.10.y-cip 11/24] arm64: dts: renesas: Add initial DTSI for RZ/G2{L,LC} SoC's

Pavel Machek
 

Hi!

commit 68a45525297b2e9afbd9bba807ddd2c9f69beee6 upstream.

Add initial DTSI for RZ/G2{L,LC} SoC's.

File structure:
r9a07g044.dtsi => RZ/G2L family SoC common parts
r9a07g044l1.dtsi => RZ/G2L R9A07G044L1 SoC specific parts
r9a07g044l2.dtsi => RZ/G2L R9A07G044L2 SoC specific parts
I just want to double check:

+ scif0: serial@1004b800 {
+ compatible = "renesas,scif-r9a07g044";
+ reg = <0 0x1004b800 0 0x400>;
+ interrupts = <GIC_SPI 380 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "eri", "rxi", "txi",
+ "bri", "dri", "tei";
Are the last two interrupts supposed to be same?

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [PATCH 5.10.y-cip 05/24] clk: renesas: Add CPG core wrapper for RZ/G2L SoC

Pavel Machek
 

Hi!

commit ef3c613ccd68a78727b817c3dacf4a68d1ffc67f upstream.

Add CPG core wrapper for RZ/G2L family.

Based on a patch in the BSP by Binh Nguyen
<binh.nguyen.jz@renesas.com>.
Some comments below.

+static struct clk * __init
+rzg2l_cpg_pll_clk_register(const struct cpg_core_clk *core,
...
+ pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);
+ if (!pll_clk) {
+ clk = ERR_PTR(-ENOMEM);
+ return NULL;
+ }
I believe this wanted to return clk? But I'd recommend just directly
returning the ERR_PTR().

+static struct clk
+*rzg2l_cpg_clk_src_twocell_get(struct of_phandle_args *clkspec,
+ void *data)
...
+ if (IS_ERR(clk))
+ dev_err(dev, "Cannot get %s clock %u: %ld", type, clkidx,
+ PTR_ERR(clk));
Is "\n" missing?

+static void __init
+rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod,
+ const struct rzg2l_cpg_info *info,
+ struct rzg2l_cpg_priv *priv)
+{
+ struct mstp_clock *clock = NULL;
...
+ parent = priv->clks[mod->parent];
+ if (IS_ERR(parent)) {
+ clk = parent;
+ goto fail;
+ }
+
+ clock = devm_kzalloc(dev, sizeof(*clock), GFP_KERNEL);
+ if (!clock) {
+ clk = ERR_PTR(-ENOMEM);
+ goto fail;
+ }
...
+fail:
+ dev_err(dev, "Failed to register %s clock %s: %ld\n", "module",
+ mod->name, PTR_ERR(clk));
+ kfree(clock);
Should this be devm_kfree? (And is devm_kfree(NULL) ok?)

+static bool rzg2l_cpg_is_pm_clk(const struct of_phandle_args *clkspec)
+{
+ if (clkspec->args_count != 2)
+ return false;
+
+ switch (clkspec->args[0]) {
+ case CPG_MOD:
+ return true;
+
+ default:
+ return false;
+ }
+}
"return clkspec->args[0] == CPG_MOD" would be simpler way to say this.

+static int __init rzg2l_cpg_probe(struct platform_device *pdev)
+{
...
+ error = rzg2l_cpg_reset_controller_register(priv);
+ if (error)
+ return error;
+
+ return 0;
+}
You can just return error unconditionally.

+static const struct of_device_id rzg2l_cpg_match[] = {
+ { /* sentinel */ }
+};
It matches nothing? Aha, id is added in next patch.

+/**
+ * Definitions of CPG Core Clocks
+ *
+ * These include:
+ * - Clock outputs exported to DT
+ * - External input clocks
+ * - Internal CPG clocks
+ */
This is not kerneldoc -> should not be marked with /**.

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [PATCH 5.10.y-cip 00/24] Add CPG and initial DTS/I for Renesas RZ/G2L SoC + SMARC EVK

Nobuhiro Iwamatsu
 

Hi Prabhakar,

This patch series adds the following:
* Serial support
* Clock support
* Initial RZ/G2L SoC DTSI
- CPU
- CPG
- GIC
* Initial device tree for RZ/G2L SMARC EVK
- memory
- External input clock
- SCIF

All the patches have been cherry picked from 5.16-rc5. For testing purpose
MR [0] can be used.
I will check this series, and I am also checking the build.
https://gitlab.com/cip-project/cip-kernel/linux-cip/-/pipelines/431663140

Best regards,
Nobuhiro

________________________________________
差出人: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> が Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> の代理で送信
送信日時: 2021年12月16日 21:54
宛先: cip-dev@lists.cip-project.org; iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT); Pavel Machek
CC: Biju Das
件名: [cip-dev] [PATCH 5.10.y-cip 00/24] Add CPG and initial DTS/I for Renesas RZ/G2L SoC + SMARC EVK

Hi All,

This patch series adds the following:
* Serial support
* Clock support
* Initial RZ/G2L SoC DTSI
- CPU
- CPG
- GIC
* Initial device tree for RZ/G2L SMARC EVK
- memory
- External input clock
- SCIF

All the patches have been cherry picked from 5.16-rc5. For testing purpose
MR [0] can be used.

[0] https://gitlab.com/cip-project/cip-kernel/
cip-kernel-config/-/merge_requests/52

Cheers,
Prabhakar

Biju Das (9):
serial: sh-sci: Add support for RZ/G2L SoC
clk: renesas: r9a07g044: Rename divider table
clk: renesas: r9a07g044: Fix P1 Clock
clk: renesas: r9a07g044: Add P2 Clock support
clk: renesas: rzg2l: Add multi clock PM support
dt-bindings: clock: r9a07g044-cpg: Update clock/reset definitions
clk: renesas: rzg2l: Add support to handle MUX clocks
clk: renesas: rzg2l: Add support to handle coupled clocks
clk: renesas: rzg2l: Fix clk status function

Dan Carpenter (2):
clk: renesas: rzg2l: Fix a double free on error
clk: renesas: rzg2l: Avoid mixing error pointers and NULL

Dmitry Baryshkov (1):
clk: mux: provide devm_clk_hw_register_mux()

Geert Uytterhoeven (1):
clk: renesas: Rename renesas-rzg2l-cpg.[ch] to rzg2l-cpg.[ch]

Lad Prabhakar (9):
dt-bindings: serial: renesas,scif: Document r9a07g044 bindings
dt-bindings: clock: renesas: Document RZ/G2L SoC CPG driver
dt-bindings: clock: Add r9a07g044 CPG Clock Definitions
clk: renesas: Add CPG core wrapper for RZ/G2L SoC
clk: renesas: Add support for R9A07G044 SoC
arm64: dts: renesas: Add initial DTSI for RZ/G2{L,LC} SoC's
arm64: dts: renesas: Add initial device tree for RZ/G2L SMARC EVK
arm64: dts: renesas: r9a07g044: Add SYSC node
clk: renesas: rzg2l: Fix off-by-one check in
rzg2l_cpg_clk_src_twocell_get()

Yang Li (2):
clk: renesas: rzg2l: Remove unneeded semicolon
clk: renesas: rzg2l: Fix return value and unused assignment

.../bindings/clock/renesas,rzg2l-cpg.yaml | 83 ++
.../bindings/serial/renesas,scif.yaml | 4 +
arch/arm64/boot/dts/renesas/Makefile | 2 +
arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 132 +++
arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi | 25 +
.../boot/dts/renesas/r9a07g044l2-smarc.dts | 21 +
arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi | 13 +
arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 27 +
drivers/clk/clk-mux.c | 35 +
drivers/clk/renesas/Kconfig | 9 +
drivers/clk/renesas/Makefile | 2 +
drivers/clk/renesas/r9a07g044-cpg.c | 142 +++
drivers/clk/renesas/rzg2l-cpg.c | 844 ++++++++++++++++++
drivers/clk/renesas/rzg2l-cpg.h | 176 ++++
drivers/tty/serial/sh-sci.c | 12 +-
drivers/tty/serial/sh-sci.h | 1 +
include/dt-bindings/clock/r9a07g044-cpg.h | 219 +++++
include/linux/clk-provider.h | 13 +
18 files changed, 1759 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml
create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts
create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi
create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi
create mode 100644 drivers/clk/renesas/r9a07g044-cpg.c
create mode 100644 drivers/clk/renesas/rzg2l-cpg.c
create mode 100644 drivers/clk/renesas/rzg2l-cpg.h
create mode 100644 include/dt-bindings/clock/r9a07g044-cpg.h

--
2.17.1


Re: [PATCH v3] swupdate: Add nodoc for buster and bullseye

Jan Kiszka
 

On 16.12.21 17:48, Vijai Kumar K wrote:
Including documentation makes the build fail in buster and bullseye.
Remove it.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..e25ee4c 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,14 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"

-# disable documentation due to missing packages in debian buster
+# disable documentation due to missing packages
+SWUPDATE_BUILD_PROFILES_append = " nodoc "
+
# disable create filesystem due to missing symbols in debian buster
# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_buster = " \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not detect other
# compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
Thanks, applied.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [PATCH 5.10.y-cip 0/7] Add binding and SoC identification for Renesas RZ/G2L SoC and Renesas RZ/G2L SMARC EVK

Nobuhiro Iwamatsu
 

Hi Chris,

We are planning to propose it as a CIP reference board and we plan to add some hardware to the CIP's LAVA infrastructure.
If the board is not accepted as a CIP reference board, we would still like to add support for it in the CIP Kernel as we have done for other non-reference boards such as the iWave RZ/G1E, HiHope RZ/G2H boards etc.
I see. Thanks for the explanation.

Best regards,
Nobuhiro
________________________________________
差出人: Chris Paterson <Chris.Paterson2@renesas.com>
送信日時: 2021年12月16日 18:52
宛先: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT); cip-dev@lists.cip-project.org; Prabhakar Mahadev Lad
CC: pavel@denx.de; Biju Das
件名: RE: [cip-dev] [PATCH 5.10.y-cip 0/7] Add binding and SoC identification for Renesas RZ/G2L SoC and Renesas RZ/G2L SMARC EVK

Hello,

From: nobuhiro1.iwamatsu@toshiba.co.jp
<nobuhiro1.iwamatsu@toshiba.co.jp>
Sent: 16 December 2021 00:40

Hi all,

I have reviewed patches and they look okay to me. I'll proceed with
testing.

Do we have suitable board in the test lab / is there plan to add one?
We don't have any boards in the CIP labs yet, but there is a plan to add
some.

I think I need to add the board to LAB first. Of course, source code reviews
and
build tests are possible.
And If my understand is correctoly, I think this is a new board that is not on
the
reference board list. I don't think this has been discussed at TSC.
I think it needs to be on the agenda at TSC, whether it's a reference board for
the 5.10-cip kernel.
We are planning to propose it as a CIP reference board and we plan to add some hardware to the CIP's LAVA infrastructure.
If the board is not accepted as a CIP reference board, we would still like to add support for it in the CIP Kernel as we have done for other non-reference boards such as the iWave RZ/G1E, HiHope RZ/G2H boards etc.

Kind regards, Chris


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Kanagarajan, Vijaikumar
 

-----Original Message-----
From: Kanagarajan, Vijaikumar
Sent: 16 December 2021 21:30
To: 'Jan Kiszka' <jan.kiszka@siemens.com>; cip-dev@lists.cip-project.org;
Quirin Gylstorff <quirin.gylstorff@siemens.com>
Subject: RE: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster



-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 21:27
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip-
dev@lists.cip-project.org; Quirin Gylstorff
<quirin.gylstorff@siemens.com>
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster

On 16.12.21 15:23, Kanagarajan, Vijaikumar wrote:


-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 19:09
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>;
cip-
dev@lists.cip-project.org
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop
conditional includes for buster

On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now
not needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++-----
-
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git
a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross
nocheck"
# modify for debian buster build
SRC_URI_append_buster = "
file://0009-debian-prepare-build-for-isar-
debian-buster.patch"

-# disable documentation due to missing packages in debian buster
-# disable create filesystem due to missing symbols in debian
buster -# disable webserver due to missing symbols in debian
buster -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages # disable create
+filesystem due to missing symbols # disable webserver due to
+missing symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does
not detect other # compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?
Yes. Atleast, the nodoc is needed because of sphinx dependency issue
in
bullseye.
Quirin just told me that only nodoc is needed for all.

Dropping this patch again (keeping 1/2 though). Please send a v3 which
does that, ie. adds a _bullseye profile and keeps the existing buster one.
Ok. Will resend v3 of this particular patch.
V3 of this patch available here. https://lists.cip-project.org/g/cip-dev/message/7165

Thanks,
Vijai Kumar K


Thanks,
Vijai Kumar K


Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


[PATCH v3] swupdate: Add nodoc for buster and bullseye

Kanagarajan, Vijaikumar
 

Including documentation makes the build fail in buster and bullseye.
Remove it.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..e25ee4c 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,14 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"

-# disable documentation due to missing packages in debian buster
+# disable documentation due to missing packages
+SWUPDATE_BUILD_PROFILES_append = " nodoc "
+
# disable create filesystem due to missing symbols in debian buster
# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_buster = " \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not detect other
# compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
--
2.25.1


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Kanagarajan, Vijaikumar
 

-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 21:27
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip-
dev@lists.cip-project.org; Quirin Gylstorff <quirin.gylstorff@siemens.com>
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster

On 16.12.21 15:23, Kanagarajan, Vijaikumar wrote:


-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 19:09
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>;
cip-
dev@lists.cip-project.org
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster

On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now
not needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = "
file://0009-debian-prepare-build-for-isar-
debian-buster.patch"

-# disable documentation due to missing packages in debian buster -#
disable create filesystem due to missing symbols in debian buster -#
disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages # disable create
+filesystem due to missing symbols # disable webserver due to
+missing symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not
detect other # compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?
Yes. Atleast, the nodoc is needed because of sphinx dependency issue in
bullseye.
Quirin just told me that only nodoc is needed for all.

Dropping this patch again (keeping 1/2 though). Please send a v3 which does
that, ie. adds a _bullseye profile and keeps the existing buster one.
Ok. Will resend v3 of this particular patch.

Thanks,
Vijai Kumar K


Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Quirin Gylstorff
 

On 12/16/21 15:23, Kanagarajan, Vijaikumar via lists.cip-project.org wrote:

-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 19:09
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip-
dev@lists.cip-project.org
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster

On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-
debian-buster.patch"

-# disable documentation due to missing packages in debian buster -#
disable create filesystem due to missing symbols in debian buster -#
disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages # disable create
+filesystem due to missing symbols # disable webserver due to missing
+symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not
detect other # compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?
Yes. Atleast, the nodoc is needed because of sphinx dependency issue in bullseye.
Thanks,
Vijai Kumar K
The flags `pkg.swupdate.nocreatefs` and `pkg.swupdate.nowebserver` are
for Debian Buster.

A build for Debian Bullseye can use the webserver and createfs option as the are active in the Debian provided package on salsa.

Only `nodoc` needs to applied to buster and bullseye.


Quirin


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Jan Kiszka
 

On 16.12.21 15:23, Kanagarajan, Vijaikumar wrote:


-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 19:09
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip-
dev@lists.cip-project.org
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster

On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-
debian-buster.patch"

-# disable documentation due to missing packages in debian buster -#
disable create filesystem due to missing symbols in debian buster -#
disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages # disable create
+filesystem due to missing symbols # disable webserver due to missing
+symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not
detect other # compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?
Yes. Atleast, the nodoc is needed because of sphinx dependency issue in bullseye.
Quirin just told me that only nodoc is needed for all.

Dropping this patch again (keeping 1/2 though). Please send a v3 which
does that, ie. adds a _bullseye profile and keeps the existing buster one.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH v2 0/2] Drop Stretch support

Jan Kiszka
 

On 16.12.21 14:36, Vijai Kumar K wrote:
Changes since v1:
- Change P1 commit message
- Bring back conditional include of buster patch for swupdate

This series has 2 patches

P1 drops stretch support
P2 cleans up overrides / conditional includes for buster/bullseye

CI Job is successful:
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/430980698

Thanks,
Vijai Kumar K

Vijai Kumar K (2):
Drop stretch support
swupdate: Drop conditional includes for buster

Kconfig | 4 ----
conf/distro/cip-core-stretch.conf | 16 ----------------
conf/machine/bbb.conf | 4 ----
kas/opt/stretch.yml | 15 ---------------
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
start-qemu.sh | 2 --
6 files changed, 6 insertions(+), 47 deletions(-)
delete mode 100644 conf/distro/cip-core-stretch.conf
delete mode 100644 kas/opt/stretch.yml
Thanks, applied.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Kanagarajan, Vijaikumar
 

-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 19:09
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip-
dev@lists.cip-project.org
Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional
includes for buster

On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-
debian-buster.patch"

-# disable documentation due to missing packages in debian buster -#
disable create filesystem due to missing symbols in debian buster -#
disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages # disable create
+filesystem due to missing symbols # disable webserver due to missing
+symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not
detect other # compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?
Yes. Atleast, the nodoc is needed because of sphinx dependency issue in bullseye.

Thanks,
Vijai Kumar K


Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Quirin Gylstorff
 

On 12/16/21 14:38, Jan Kiszka via lists.cip-project.org wrote:
On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
-# disable documentation due to missing packages in debian buster
-# disable create filesystem due to missing symbols in debian buster
-# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages
+# disable create filesystem due to missing symbols
+# disable webserver due to missing symbols
+SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not detect other
# compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?
From my testing only the option nodoc is necessary for bullseye.


Quirin
Jan


Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Jan Kiszka
 

On 16.12.21 14:36, Vijai Kumar K wrote:
Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"

-# disable documentation due to missing packages in debian buster
-# disable create filesystem due to missing symbols in debian buster
-# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages
+# disable create filesystem due to missing symbols
+# disable webserver due to missing symbols
+SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not detect other
# compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
So these things were actually broken for bullseye so far?

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


[isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional includes for buster

Kanagarajan, Vijaikumar
 

Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..51aacfe 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
# modify for debian buster build
SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"

-# disable documentation due to missing packages in debian buster
-# disable create filesystem due to missing symbols in debian buster
-# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+# disable documentation due to missing packages
+# disable create filesystem due to missing symbols
+# disable webserver due to missing symbols
+SWUPDATE_BUILD_PROFILES_append = " nodoc \
+ pkg.swupdate.nocreatefs \
+ pkg.swupdate.nowebserver "
# In debian buster the git-compression defaults to gz and does not detect other
# compression formats.
GBP_EXTRA_OPTIONS += "--git-compression=xz"
--
2.25.1


[isar-cip-core][PATCH v2 1/2] Drop stretch support

Kanagarajan, Vijaikumar
 

The generic profile of CIP Core started its work with buster,
stretch was only experimental for this layer.

Remove the support now.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
Kconfig | 4 ----
conf/distro/cip-core-stretch.conf | 16 ----------------
conf/machine/bbb.conf | 4 ----
kas/opt/stretch.yml | 15 ---------------
start-qemu.sh | 2 --
5 files changed, 41 deletions(-)
delete mode 100644 conf/distro/cip-core-stretch.conf
delete mode 100644 kas/opt/stretch.yml

diff --git a/Kconfig b/Kconfig
index e69293f..8032ede 100644
--- a/Kconfig
+++ b/Kconfig
@@ -82,9 +82,6 @@ choice
prompt "Debian Release"
default DEBIAN_BUSTER

-config DEBIAN_STRETCH
- bool "stretch (9)"
-
config DEBIAN_BUSTER
bool "buster (10)"

@@ -95,7 +92,6 @@ endchoice

config KAS_INCLUDE_DEBIAN
string
- default "kas/opt/stretch.yml" if DEBIAN_STRETCH
default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE

comment "Image features"
diff --git a/conf/distro/cip-core-stretch.conf b/conf/distro/cip-core-stretch.conf
deleted file mode 100644
index 31900fa..0000000
--- a/conf/distro/cip-core-stretch.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require conf/distro/debian-stretch.conf
-require cip-core-common.inc
-
-PREFERRED_VERSION_linux-cip ?= "4.19.%"
-PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf
index a9b460e..6d8facb 100644
--- a/conf/machine/bbb.conf
+++ b/conf/machine/bbb.conf
@@ -11,8 +11,4 @@ DISTRO_ARCH = "armhf"
IMAGE_TYPE ?= "wic-img"
IMAGER_INSTALL += "u-boot-omap"

-# On stretch, select U-Boot from buster which comes with distro-boot support
-DISTRO_APT_SOURCES_append_cip-core-stretch = " conf/distro/debian-buster.list"
-DISTRO_APT_PREFERENCES_cip-core-stretch += "conf/machine/preferences.bbb.conf"
-
IMAGE_INSTALL += "u-boot-script"
diff --git a/kas/opt/stretch.yml b/kas/opt/stretch.yml
deleted file mode 100644
index 8e854c2..0000000
--- a/kas/opt/stretch.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-header:
- version: 10
-
-distro: cip-core-stretch
diff --git a/start-qemu.sh b/start-qemu.sh
index 4ab3861..489e0e0 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -33,8 +33,6 @@ fi
if [ -z "${DISTRO_RELEASE}" ]; then
if grep -s -q "DEBIAN_BULLSEYE: true" .config.yaml; then
DISTRO_RELEASE="bullseye"
- elif grep -s -q "DEBIAN_STRETCH: true" .config.yaml; then
- DISTRO_RELEASE="stretch"
else
DISTRO_RELEASE="buster"
fi
--
2.25.1


[isar-cip-core][PATCH v2 0/2] Drop Stretch support

Kanagarajan, Vijaikumar
 

Changes since v1:
- Change P1 commit message
- Bring back conditional include of buster patch for swupdate

This series has 2 patches

P1 drops stretch support
P2 cleans up overrides / conditional includes for buster/bullseye

CI Job is successful:
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/430980698

Thanks,
Vijai Kumar K

Vijai Kumar K (2):
Drop stretch support
swupdate: Drop conditional includes for buster

Kconfig | 4 ----
conf/distro/cip-core-stretch.conf | 16 ----------------
conf/machine/bbb.conf | 4 ----
kas/opt/stretch.yml | 15 ---------------
.../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------
start-qemu.sh | 2 --
6 files changed, 6 insertions(+), 47 deletions(-)
delete mode 100644 conf/distro/cip-core-stretch.conf
delete mode 100644 kas/opt/stretch.yml

--
2.25.1


Re: [isar-cip-core][PATCH 1/2] Drop stretch support

Kanagarajan, Vijaikumar
 

-----Original Message-----
From: Jan Kiszka <jan.kiszka@siemens.com>
Sent: 16 December 2021 18:54
To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip-
dev@lists.cip-project.org
Subject: Re: [isar-cip-core][PATCH 1/2] Drop stretch support

On 16.12.21 14:04, Vijai Kumar K wrote:
stretch is now old enough to be dropped. Support the current
stable(bullseye) and old-stable(buster).
The more accurate reasoning would be that the generic profile of CIP Core
does started its work with buster, stretch was only experimental for this
layer.
Will update the commit message.

Thanks,
Vijai Kumar K


Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

1241 - 1260 of 8411