* [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
@ 2025-02-14 5:31 srinuvasan.a
2025-02-14 8:17 ` Jan Kiszka
0 siblings, 1 reply; 8+ messages in thread
From: srinuvasan.a @ 2025-02-14 5:31 UTC (permalink / raw)
To: cip-dev; +Cc: jan.kiszka, srinuvasan
From: srinuvasan <srinuvasan.a@siemens.com>
This revision brings the CONFIG_EFIVAR_FS to read
the EFI (Extensible Firmware Interface) variable information via sysfs.
Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
---
recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
index 53bee8f..e761957 100644
--- a/recipes-kernel/linux/cip-kernel-config.inc
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2022-2024
+# Copyright (c) Siemens AG, 2022-2025
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -14,7 +14,7 @@ SRC_URI:append = " ${@ \
if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
}"
-SRCREV_cip-kernel-config ?= "e486c93a916cb6f78b4917b7345e8818f96069f9"
+SRCREV_cip-kernel-config ?= "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
do_fetch[vardeps] += "SRCREV_cip-kernel-config"
--
2.39.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-14 5:31 [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version srinuvasan.a
@ 2025-02-14 8:17 ` Jan Kiszka
2025-02-17 5:37 ` Arjunan, Srinu
0 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2025-02-14 8:17 UTC (permalink / raw)
To: srinuvasan.a, cip-dev, Nobuhiro Iwamatsu, Quirin Gylstorff
On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
> From: srinuvasan <srinuvasan.a@siemens.com>
>
> This revision brings the CONFIG_EFIVAR_FS to read
> the EFI (Extensible Firmware Interface) variable information via sysfs.
>
> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
> ---
> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
> index 53bee8f..e761957 100644
> --- a/recipes-kernel/linux/cip-kernel-config.inc
> +++ b/recipes-kernel/linux/cip-kernel-config.inc
> @@ -1,7 +1,7 @@
> #
> # CIP Core, generic profile
> #
> -# Copyright (c) Siemens AG, 2022-2024
> +# Copyright (c) Siemens AG, 2022-2025
> #
> # Authors:
> # Jan Kiszka <jan.kiszka@siemens.com>
> @@ -14,7 +14,7 @@ SRC_URI:append = " ${@ \
> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
> }"
>
> -SRCREV_cip-kernel-config ?= "e486c93a916cb6f78b4917b7345e8818f96069f9"
> +SRCREV_cip-kernel-config ?= "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>
> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>
Argh, the commit to cip-kernel-config is broken: We must not patch the
merged configs only anymore, they are generated.
Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that
switch causes the merged config to turn it off again. I though that was
fixed?
Jan
--
Siemens AG, Foundational Technologies
Linux Expert Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-14 8:17 ` Jan Kiszka
@ 2025-02-17 5:37 ` Arjunan, Srinu
2025-02-17 9:05 ` Quirin Gylstorff
0 siblings, 1 reply; 8+ messages in thread
From: Arjunan, Srinu @ 2025-02-17 5:37 UTC (permalink / raw)
To: Kiszka, Jan, cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu,
quirin.gylstorff@siemens.com
Hi Jan,
You meant this cip_merged_defconfig is generated one?, in that case, is this sufficient to enable the required configuration in siemens_ipc227e_defconfig to use the mokutil in IPC targets?, Please provide your thoughts.
Many thanks,
Srinu
-----Original Message-----
From: Kiszka, Jan (FT RPD CED) <jan.kiszka@siemens.com>
Sent: 14 February 2025 13:47
To: Arjunan, Srinu (FT FDS CES LX PBU 2) <srinuvasan.a@siemens.com>; cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>; Gylstorff, Quirin (FT RPD CED OES-DE) <quirin.gylstorff@siemens.com>
Subject: Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
> From: srinuvasan <srinuvasan.a@siemens.com>
>
> This revision brings the CONFIG_EFIVAR_FS to read the EFI (Extensible
> Firmware Interface) variable information via sysfs.
>
> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
> ---
> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-kernel/linux/cip-kernel-config.inc
> b/recipes-kernel/linux/cip-kernel-config.inc
> index 53bee8f..e761957 100644
> --- a/recipes-kernel/linux/cip-kernel-config.inc
> +++ b/recipes-kernel/linux/cip-kernel-config.inc
> @@ -1,7 +1,7 @@
> #
> # CIP Core, generic profile
> #
> -# Copyright (c) Siemens AG, 2022-2024
> +# Copyright (c) Siemens AG, 2022-2025
> #
> # Authors:
> # Jan Kiszka <jan.kiszka@siemens.com> @@ -14,7 +14,7 @@
> SRC_URI:append = " ${@ \
> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
> }"
>
> -SRCREV_cip-kernel-config ?= "e486c93a916cb6f78b4917b7345e8818f96069f9"
> +SRCREV_cip-kernel-config ?= "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>
> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>
Argh, the commit to cip-kernel-config is broken: We must not patch the merged configs only anymore, they are generated.
Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that switch causes the merged config to turn it off again. I though that was fixed?
Jan
--
Siemens AG, Foundational Technologies
Linux Expert Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-17 5:37 ` Arjunan, Srinu
@ 2025-02-17 9:05 ` Quirin Gylstorff
2025-02-17 9:15 ` Jan Kiszka
0 siblings, 1 reply; 8+ messages in thread
From: Quirin Gylstorff @ 2025-02-17 9:05 UTC (permalink / raw)
To: Arjunan, Srinu (FT FDS CES LX PBU 2), Kiszka, Jan (FT RPD CED),
cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu
On 2/17/25 06:37, Arjunan, Srinu (FT FDS CES LX PBU 2) wrote:
> Hi Jan,
>
> You meant this cip_merged_defconfig is generated one?, in that case, is this sufficient to enable the required configuration in siemens_ipc227e_defconfig to use the mokutil in IPC targets?, Please provide your thoughts.
>
Normally you would adapt siemens_ipc227e_defconfig and then regenerate
all cip_merged_configs.
Also if you adapt 6.1.y-cip you should also adapt the version after that
also(6.6 ... 6.13 at time of writing).
Quirin
> Many thanks,
> Srinu
>
> -----Original Message-----
> From: Kiszka, Jan (FT RPD CED) <jan.kiszka@siemens.com>
> Sent: 14 February 2025 13:47
> To: Arjunan, Srinu (FT FDS CES LX PBU 2) <srinuvasan.a@siemens.com>; cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>; Gylstorff, Quirin (FT RPD CED OES-DE) <quirin.gylstorff@siemens.com>
> Subject: Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
>
> On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
>> From: srinuvasan <srinuvasan.a@siemens.com>
>>
>> This revision brings the CONFIG_EFIVAR_FS to read the EFI (Extensible
>> Firmware Interface) variable information via sysfs.
>>
>> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
>> ---
>> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/recipes-kernel/linux/cip-kernel-config.inc
>> b/recipes-kernel/linux/cip-kernel-config.inc
>> index 53bee8f..e761957 100644
>> --- a/recipes-kernel/linux/cip-kernel-config.inc
>> +++ b/recipes-kernel/linux/cip-kernel-config.inc
>> @@ -1,7 +1,7 @@
>> #
>> # CIP Core, generic profile
>> #
>> -# Copyright (c) Siemens AG, 2022-2024
>> +# Copyright (c) Siemens AG, 2022-2025
>> #
>> # Authors:
>> # Jan Kiszka <jan.kiszka@siemens.com> @@ -14,7 +14,7 @@
>> SRC_URI:append = " ${@ \
>> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
>> }"
>>
>> -SRCREV_cip-kernel-config ?= "e486c93a916cb6f78b4917b7345e8818f96069f9"
>> +SRCREV_cip-kernel-config ?= "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>>
>> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>>
>
> Argh, the commit to cip-kernel-config is broken: We must not patch the merged configs only anymore, they are generated.
>
> Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that switch causes the merged config to turn it off again. I though that was fixed?
There are two configs which disable in 6.1.y the EFI_VARS_FS:
- cip_container_defconfig and obsvx2_defconfig.
As we take all config into account this will deactivate EFI_VARS_FS.
At a other note we should look into automatic the config generation.
Quirin
>
> Jan
>
> --
> Siemens AG, Foundational Technologies
> Linux Expert Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-17 9:05 ` Quirin Gylstorff
@ 2025-02-17 9:15 ` Jan Kiszka
2025-02-17 9:26 ` Quirin Gylstorff
0 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2025-02-17 9:15 UTC (permalink / raw)
To: Quirin Gylstorff, Arjunan, Srinu (FT FDS CES LX PBU 2),
cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu
On 17.02.25 10:05, Quirin Gylstorff wrote:
>
>
> On 2/17/25 06:37, Arjunan, Srinu (FT FDS CES LX PBU 2) wrote:
>> Hi Jan,
>>
>> You meant this cip_merged_defconfig is generated one?,
>> in that case, is this sufficient to enable the required configuration
>> in siemens_ipc227e_defconfig to use the mokutil in IPC targets?,
>> Please provide your thoughts.
>>
> Normally you would adapt siemens_ipc227e_defconfig and then regenerate
> all cip_merged_configs.
>
> Also if you adapt 6.1.y-cip you should also adapt the version after that
> also(6.6 ... 6.13 at time of writing).
>
> Quirin
>
>
>> Many thanks,
>> Srinu
>>
>> -----Original Message-----
>> From: Kiszka, Jan (FT RPD CED) <jan.kiszka@siemens.com>
>> Sent: 14 February 2025 13:47
>> To: Arjunan, Srinu (FT FDS CES LX PBU 2) <srinuvasan.a@siemens.com>;
>> cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
>> <nobuhiro1.iwamatsu@toshiba.co.jp>; Gylstorff, Quirin (FT RPD CED OES-
>> DE) <quirin.gylstorff@siemens.com>
>> Subject: Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the
>> latest version
>>
>> On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
>>> From: srinuvasan <srinuvasan.a@siemens.com>
>>>
>>> This revision brings the CONFIG_EFIVAR_FS to read the EFI (Extensible
>>> Firmware Interface) variable information via sysfs.
>>>
>>> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
>>> ---
>>> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/recipes-kernel/linux/cip-kernel-config.inc
>>> b/recipes-kernel/linux/cip-kernel-config.inc
>>> index 53bee8f..e761957 100644
>>> --- a/recipes-kernel/linux/cip-kernel-config.inc
>>> +++ b/recipes-kernel/linux/cip-kernel-config.inc
>>> @@ -1,7 +1,7 @@
>>> #
>>> # CIP Core, generic profile
>>> #
>>> -# Copyright (c) Siemens AG, 2022-2024
>>> +# Copyright (c) Siemens AG, 2022-2025
>>> #
>>> # Authors:
>>> # Jan Kiszka <jan.kiszka@siemens.com> @@ -14,7 +14,7 @@
>>> SRC_URI:append = " ${@ \
>>> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
>>> }"
>>> -SRCREV_cip-kernel-config ?=
>>> "e486c93a916cb6f78b4917b7345e8818f96069f9"
>>> +SRCREV_cip-kernel-config ?= "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>>> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>>>
>>
>> Argh, the commit to cip-kernel-config is broken: We must not patch the
>> merged configs only anymore, they are generated.
>>
>> Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that
>> switch causes the merged config to turn it off again. I though that
>> was fixed?
>
> There are two configs which disable in 6.1.y the EFI_VARS_FS:
> - cip_container_defconfig and obsvx2_defconfig.
>
> As we take all config into account this will deactivate EFI_VARS_FS.
>
...and that would be a bug in the generator script: default-y in one
config must be handled like explicit-y. And explicit-y + explicit-n must
be y in the merged config.
> At a other note we should look into automatic the config generation.
You mean as part of cip-kernel-config CI, or what?
Jan
--
Siemens AG, Foundational Technologies
Linux Expert Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-17 9:15 ` Jan Kiszka
@ 2025-02-17 9:26 ` Quirin Gylstorff
2025-02-18 9:33 ` [cip-dev] " Quirin Gylstorff
0 siblings, 1 reply; 8+ messages in thread
From: Quirin Gylstorff @ 2025-02-17 9:26 UTC (permalink / raw)
To: Jan Kiszka, Arjunan, Srinu (FT FDS CES LX PBU 2),
cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu
On 2/17/25 10:15, Jan Kiszka wrote:
> On 17.02.25 10:05, Quirin Gylstorff wrote:
>>
>>
>> On 2/17/25 06:37, Arjunan, Srinu (FT FDS CES LX PBU 2) wrote:
>>> Hi Jan,
>>>
>>> You meant this cip_merged_defconfig is generated one?,
>>> in that case, is this sufficient to enable the required configuration
>>> in siemens_ipc227e_defconfig to use the mokutil in IPC targets?,
>>> Please provide your thoughts.
>>>
>> Normally you would adapt siemens_ipc227e_defconfig and then regenerate
>> all cip_merged_configs.
>>
>> Also if you adapt 6.1.y-cip you should also adapt the version after that
>> also(6.6 ... 6.13 at time of writing).
>>
>> Quirin
>>
>>
>>> Many thanks,
>>> Srinu
>>>
>>> -----Original Message-----
>>> From: Kiszka, Jan (FT RPD CED) <jan.kiszka@siemens.com>
>>> Sent: 14 February 2025 13:47
>>> To: Arjunan, Srinu (FT FDS CES LX PBU 2) <srinuvasan.a@siemens.com>;
>>> cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
>>> <nobuhiro1.iwamatsu@toshiba.co.jp>; Gylstorff, Quirin (FT RPD CED OES-
>>> DE) <quirin.gylstorff@siemens.com>
>>> Subject: Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the
>>> latest version
>>>
>>> On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
>>>> From: srinuvasan <srinuvasan.a@siemens.com>
>>>>
>>>> This revision brings the CONFIG_EFIVAR_FS to read the EFI (Extensible
>>>> Firmware Interface) variable information via sysfs.
>>>>
>>>> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
>>>> ---
>>>> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/recipes-kernel/linux/cip-kernel-config.inc
>>>> b/recipes-kernel/linux/cip-kernel-config.inc
>>>> index 53bee8f..e761957 100644
>>>> --- a/recipes-kernel/linux/cip-kernel-config.inc
>>>> +++ b/recipes-kernel/linux/cip-kernel-config.inc
>>>> @@ -1,7 +1,7 @@
>>>> #
>>>> # CIP Core, generic profile
>>>> #
>>>> -# Copyright (c) Siemens AG, 2022-2024
>>>> +# Copyright (c) Siemens AG, 2022-2025
>>>> #
>>>> # Authors:
>>>> # Jan Kiszka <jan.kiszka@siemens.com> @@ -14,7 +14,7 @@
>>>> SRC_URI:append = " ${@ \
>>>> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
>>>> }"
>>>> -SRCREV_cip-kernel-config ?=
>>>> "e486c93a916cb6f78b4917b7345e8818f96069f9"
>>>> +SRCREV_cip-kernel-config ?= "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>>>> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>>>>
>>>
>>> Argh, the commit to cip-kernel-config is broken: We must not patch the
>>> merged configs only anymore, they are generated.
>>>
>>> Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that
>>> switch causes the merged config to turn it off again. I though that
>>> was fixed?
>>
>> There are two configs which disable in 6.1.y the EFI_VARS_FS:
>> - cip_container_defconfig and obsvx2_defconfig.
>>
>> As we take all config into account this will deactivate EFI_VARS_FS.
>>
>
> ...and that would be a bug in the generator script: default-y in one
> config must be handled like explicit-y. And explicit-y + explicit-n must
> be y in the merged config.
I tested the script with the changes from srinu and the option is
correctly set EFI_VARS_FS to m. Save defconfig removes it again so
there is some dependency problem which needs to be look at.
>
>> At a other note we should look into automatic the config generation.
>
> You mean as part of cip-kernel-config CI, or what?
>
Yes for example or as bot.
Quriin
> Jan
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [cip-dev] [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-17 9:26 ` Quirin Gylstorff
@ 2025-02-18 9:33 ` Quirin Gylstorff
2025-02-18 11:00 ` Jan Kiszka
0 siblings, 1 reply; 8+ messages in thread
From: Quirin Gylstorff @ 2025-02-18 9:33 UTC (permalink / raw)
To: cip-dev, Jan Kiszka, Arjunan, Srinu (FT FDS CES LX PBU 2),
Nobuhiro Iwamatsu
On 2/17/25 10:26, Quirin Gylstorff via lists.cip-project.org wrote:
>
>
> On 2/17/25 10:15, Jan Kiszka wrote:
>> On 17.02.25 10:05, Quirin Gylstorff wrote:
>>>
>>>
>>> On 2/17/25 06:37, Arjunan, Srinu (FT FDS CES LX PBU 2) wrote:
>>>> Hi Jan,
>>>>
>>>> You meant this cip_merged_defconfig is generated one?,
>>>> in that case, is this sufficient to enable the required configuration
>>>> in siemens_ipc227e_defconfig to use the mokutil in IPC targets?,
>>>> Please provide your thoughts.
>>>>
>>> Normally you would adapt siemens_ipc227e_defconfig and then regenerate
>>> all cip_merged_configs.
>>>
>>> Also if you adapt 6.1.y-cip you should also adapt the version after that
>>> also(6.6 ... 6.13 at time of writing).
>>>
>>> Quirin
>>>
>>>
>>>> Many thanks,
>>>> Srinu
>>>>
>>>> -----Original Message-----
>>>> From: Kiszka, Jan (FT RPD CED) <jan.kiszka@siemens.com>
>>>> Sent: 14 February 2025 13:47
>>>> To: Arjunan, Srinu (FT FDS CES LX PBU 2) <srinuvasan.a@siemens.com>;
>>>> cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
>>>> <nobuhiro1.iwamatsu@toshiba.co.jp>; Gylstorff, Quirin (FT RPD CED OES-
>>>> DE) <quirin.gylstorff@siemens.com>
>>>> Subject: Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the
>>>> latest version
>>>>
>>>> On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
>>>>> From: srinuvasan <srinuvasan.a@siemens.com>
>>>>>
>>>>> This revision brings the CONFIG_EFIVAR_FS to read the EFI (Extensible
>>>>> Firmware Interface) variable information via sysfs.
>>>>>
>>>>> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
>>>>> ---
>>>>> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
>>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/recipes-kernel/linux/cip-kernel-config.inc
>>>>> b/recipes-kernel/linux/cip-kernel-config.inc
>>>>> index 53bee8f..e761957 100644
>>>>> --- a/recipes-kernel/linux/cip-kernel-config.inc
>>>>> +++ b/recipes-kernel/linux/cip-kernel-config.inc
>>>>> @@ -1,7 +1,7 @@
>>>>> #
>>>>> # CIP Core, generic profile
>>>>> #
>>>>> -# Copyright (c) Siemens AG, 2022-2024
>>>>> +# Copyright (c) Siemens AG, 2022-2025
>>>>> #
>>>>> # Authors:
>>>>> # Jan Kiszka <jan.kiszka@siemens.com> @@ -14,7 +14,7 @@
>>>>> SRC_URI:append = " ${@ \
>>>>> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
>>>>> }"
>>>>> -SRCREV_cip-kernel-config ?=
>>>>> "e486c93a916cb6f78b4917b7345e8818f96069f9"
>>>>> +SRCREV_cip-kernel-config ?=
>>>>> "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>>>>> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>>>>
>>>> Argh, the commit to cip-kernel-config is broken: We must not patch the
>>>> merged configs only anymore, they are generated.
>>>>
>>>> Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that
>>>> switch causes the merged config to turn it off again. I though that
>>>> was fixed?
>>>
>>> There are two configs which disable in 6.1.y the EFI_VARS_FS:
>>> - cip_container_defconfig and obsvx2_defconfig.
>>>
>>> As we take all config into account this will deactivate EFI_VARS_FS.
>>>
>>
>> ...and that would be a bug in the generator script: default-y in one
>> config must be handled like explicit-y. And explicit-y + explicit-n must
>> be y in the merged config.
>
> I tested the script with the changes from srinu and the option is
> correctly set EFI_VARS_FS to m. Save defconfig removes it again so
> there is some dependency problem which needs to be look at.
EFI_VARS_FS is set to m as a default, therefore `make savedefconfig`
removes the entry from the defconfig.
Quirin
>
>>
>>> At a other note we should look into automatic the config generation.
>>
>> You mean as part of cip-kernel-config CI, or what?
>>
>
> Yes for example or as bot.
>
> Quriin
>
>> Jan
>>
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17854): https://lists.cip-project.org/g/cip-dev/message/17854
> Mute This Topic: https://lists.cip-project.org/mt/111177988/1753640
> Group Owner: cip-dev+owner@lists.cip-project.org
> Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129121/1753640/1405269326/xyzzy [quirin.gylstorff@siemens.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [cip-dev] [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version
2025-02-18 9:33 ` [cip-dev] " Quirin Gylstorff
@ 2025-02-18 11:00 ` Jan Kiszka
0 siblings, 0 replies; 8+ messages in thread
From: Jan Kiszka @ 2025-02-18 11:00 UTC (permalink / raw)
To: Quirin Gylstorff, cip-dev, Arjunan, Srinu (FT FDS CES LX PBU 2),
Nobuhiro Iwamatsu
On 18.02.25 10:33, Quirin Gylstorff wrote:
>
>
> On 2/17/25 10:26, Quirin Gylstorff via lists.cip-project.org wrote:
>>
>>
>> On 2/17/25 10:15, Jan Kiszka wrote:
>>> On 17.02.25 10:05, Quirin Gylstorff wrote:
>>>>
>>>>
>>>> On 2/17/25 06:37, Arjunan, Srinu (FT FDS CES LX PBU 2) wrote:
>>>>> Hi Jan,
>>>>>
>>>>> You meant this cip_merged_defconfig is generated one?,
>>>>> in that case, is this sufficient to enable the required configuration
>>>>> in siemens_ipc227e_defconfig to use the mokutil in IPC targets?,
>>>>> Please provide your thoughts.
>>>>>
>>>> Normally you would adapt siemens_ipc227e_defconfig and then regenerate
>>>> all cip_merged_configs.
>>>>
>>>> Also if you adapt 6.1.y-cip you should also adapt the version after
>>>> that
>>>> also(6.6 ... 6.13 at time of writing).
>>>>
>>>> Quirin
>>>>
>>>>
>>>>> Many thanks,
>>>>> Srinu
>>>>>
>>>>> -----Original Message-----
>>>>> From: Kiszka, Jan (FT RPD CED) <jan.kiszka@siemens.com>
>>>>> Sent: 14 February 2025 13:47
>>>>> To: Arjunan, Srinu (FT FDS CES LX PBU 2) <srinuvasan.a@siemens.com>;
>>>>> cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
>>>>> <nobuhiro1.iwamatsu@toshiba.co.jp>; Gylstorff, Quirin (FT RPD CED OES-
>>>>> DE) <quirin.gylstorff@siemens.com>
>>>>> Subject: Re: [isar-cip-core][PATCH] update cip-kernel-defconfig to the
>>>>> latest version
>>>>>
>>>>> On 14.02.25 06:31, srinuvasan.a@siemens.com wrote:
>>>>>> From: srinuvasan <srinuvasan.a@siemens.com>
>>>>>>
>>>>>> This revision brings the CONFIG_EFIVAR_FS to read the EFI (Extensible
>>>>>> Firmware Interface) variable information via sysfs.
>>>>>>
>>>>>> Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
>>>>>> ---
>>>>>> recipes-kernel/linux/cip-kernel-config.inc | 4 ++--
>>>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git a/recipes-kernel/linux/cip-kernel-config.inc
>>>>>> b/recipes-kernel/linux/cip-kernel-config.inc
>>>>>> index 53bee8f..e761957 100644
>>>>>> --- a/recipes-kernel/linux/cip-kernel-config.inc
>>>>>> +++ b/recipes-kernel/linux/cip-kernel-config.inc
>>>>>> @@ -1,7 +1,7 @@
>>>>>> #
>>>>>> # CIP Core, generic profile
>>>>>> #
>>>>>> -# Copyright (c) Siemens AG, 2022-2024
>>>>>> +# Copyright (c) Siemens AG, 2022-2025
>>>>>> #
>>>>>> # Authors:
>>>>>> # Jan Kiszka <jan.kiszka@siemens.com> @@ -14,7 +14,7 @@
>>>>>> SRC_URI:append = " ${@ \
>>>>>> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
>>>>>> }"
>>>>>> -SRCREV_cip-kernel-config ?=
>>>>>> "e486c93a916cb6f78b4917b7345e8818f96069f9"
>>>>>> +SRCREV_cip-kernel-config ?=
>>>>>> "6b5db480b7a43e0217b1fa58f487f0bb997743c7"
>>>>>> do_fetch[vardeps] += "SRCREV_cip-kernel-config"
>>>>>
>>>>> Argh, the commit to cip-kernel-config is broken: We must not patch the
>>>>> merged configs only anymore, they are generated.
>>>>>
>>>>> Quirin, I suspect that plathome_obsvx2_defconfig's disabling of that
>>>>> switch causes the merged config to turn it off again. I though that
>>>>> was fixed?
>>>>
>>>> There are two configs which disable in 6.1.y the EFI_VARS_FS:
>>>> - cip_container_defconfig and obsvx2_defconfig.
>>>>
>>>> As we take all config into account this will deactivate EFI_VARS_FS.
>>>>
>>>
>>> ...and that would be a bug in the generator script: default-y in one
>>> config must be handled like explicit-y. And explicit-y + explicit-n must
>>> be y in the merged config.
>>
>> I tested the script with the changes from srinu and the option is
>> correctly set EFI_VARS_FS to m. Save defconfig removes it again so
>> there is some dependency problem which needs to be look at.
>
> EFI_VARS_FS is set to m as a default, therefore `make savedefconfig`
> removes the entry from the defconfig.
>
Sure, and that needs to be taken into account somehow when generating
the merged config.
Jan
--
Siemens AG, Foundational Technologies
Linux Expert Center
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-02-18 11:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-14 5:31 [isar-cip-core][PATCH] update cip-kernel-defconfig to the latest version srinuvasan.a
2025-02-14 8:17 ` Jan Kiszka
2025-02-17 5:37 ` Arjunan, Srinu
2025-02-17 9:05 ` Quirin Gylstorff
2025-02-17 9:15 ` Jan Kiszka
2025-02-17 9:26 ` Quirin Gylstorff
2025-02-18 9:33 ` [cip-dev] " Quirin Gylstorff
2025-02-18 11:00 ` Jan Kiszka
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.