diff mbox series

[isar-cip-core] update cip-kernel-defconfig to the latest version

Message ID 20250214053127.1152501-1-srinuvasan.a@siemens.com (mailing list archive)
State New
Headers show
Series [isar-cip-core] update cip-kernel-defconfig to the latest version | expand

Commit Message

Arjunan, Srinu Feb. 14, 2025, 5:31 a.m. UTC 
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(-)

Comments

Jan Kiszka Feb. 14, 2025, 8:17 a.m. UTC | #1 
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
Arjunan, Srinu Feb. 17, 2025, 5:37 a.m. UTC | #2 
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
Quirin Gylstorff Feb. 17, 2025, 9:05 a.m. UTC | #3 
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
Jan Kiszka Feb. 17, 2025, 9:15 a.m. UTC | #4 
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
Quirin Gylstorff Feb. 17, 2025, 9:26 a.m. UTC | #5 
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
>
Quirin Gylstorff Feb. 18, 2025, 9:33 a.m. UTC | #6 
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]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Jan Kiszka Feb. 18, 2025, 11 a.m. UTC | #7 
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
diff mbox series

Patch

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"