diff mbox series

[U-Boot,1/6] env: ubi: KConfig: add CONFIG_ENV_UBI_VOLUME_REDUND

Message ID 20190415153206.3472-2-mk@mkio.de
State Changes Requested
Delegated to: Heiko Schocher
Headers show
Series miscellaneous ubispl and ubi improvements | expand

Commit Message

Markus Klotzbuecher April 15, 2019, 3:32 p.m. UTC 
From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>

Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Kyungmin Park <kmpark@infradead.org>
---
 env/Kconfig                  | 6 ++++++
 scripts/config_whitelist.txt | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Heiko Schocher April 30, 2019, 4:54 a.m. UTC | #1 
Hello Markus,

Am 15.04.2019 um 17:32 schrieb Markus Klotzbuecher:
> From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>

please add a commit message.

> Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Kyungmin Park <kmpark@infradead.org>
> ---
>   env/Kconfig                  | 6 ++++++
>   scripts/config_whitelist.txt | 1 -
>   2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/env/Kconfig b/env/Kconfig
> index 78300660c7..44c47220c2 100644
> --- a/env/Kconfig
> +++ b/env/Kconfig
> @@ -513,6 +513,12 @@ config ENV_UBI_VOLUME
>   	help
>   	  Name of the volume that you want to store the environment in.
>   
> +config ENV_UBI_VOLUME_REDUND
> +	string "UBI redundant volume name"
> +	depends on ENV_IS_IN_UBI
> +	help
> +	  Name of the redundant volume that you want to store the environment in.
> +
>   endif
>   
>   config USE_DEFAULT_ENV_FILE
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index fa98efc24c..5d76c781d3 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -504,7 +504,6 @@ CONFIG_ENV_SROM_BANK
>   CONFIG_ENV_TOTAL_SIZE
>   CONFIG_ENV_UBIFS_OPTION
>   CONFIG_ENV_UBI_MTD
> -CONFIG_ENV_UBI_VOLUME_REDUND
>   CONFIG_ENV_VERSION
>   CONFIG_EP9302
>   CONFIG_EP9307
> 

Please move from the config files:

./include/configs/omap3_igep00x0.h
./include/configs/gardena-smart-gateway-at91sam.h
./include/configs/am335x_igep003x.h

also the symbols to the defconfig files, thanks.

BTW: you can use the tool tools/moveconfig.py in u-boot source
for this purpose.

Beside of this, you can add my:

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Markus Klotzbuecher May 2, 2019, 7:15 a.m. UTC | #2 
Hello Heiko

On Tue, Apr 30, 2019 at 06:54:01AM +0200, Heiko Schocher wrote:

>Am 15.04.2019 um 17:32 schrieb Markus Klotzbuecher:
>> From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>
>please add a commit message.
>
>> Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>> Cc: Heiko Schocher <hs@denx.de>
>> Cc: Kyungmin Park <kmpark@infradead.org>
>> ---
>>   env/Kconfig                  | 6 ++++++
>>   scripts/config_whitelist.txt | 1 -
>>   2 files changed, 6 insertions(+), 1 deletion(-)
>> 
>> diff --git a/env/Kconfig b/env/Kconfig
>> index 78300660c7..44c47220c2 100644
>> --- a/env/Kconfig
>> +++ b/env/Kconfig
>> @@ -513,6 +513,12 @@ config ENV_UBI_VOLUME
>>   	help
>>   	  Name of the volume that you want to store the environment in.
>> +config ENV_UBI_VOLUME_REDUND
>> +	string "UBI redundant volume name"
>> +	depends on ENV_IS_IN_UBI
>> +	help
>> +	  Name of the redundant volume that you want to store the environment in.
>> +
>>   endif
>>   config USE_DEFAULT_ENV_FILE
>> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
>> index fa98efc24c..5d76c781d3 100644
>> --- a/scripts/config_whitelist.txt
>> +++ b/scripts/config_whitelist.txt
>> @@ -504,7 +504,6 @@ CONFIG_ENV_SROM_BANK
>>   CONFIG_ENV_TOTAL_SIZE
>>   CONFIG_ENV_UBIFS_OPTION
>>   CONFIG_ENV_UBI_MTD
>> -CONFIG_ENV_UBI_VOLUME_REDUND
>>   CONFIG_ENV_VERSION
>>   CONFIG_EP9302
>>   CONFIG_EP9307
>> 
>
>Please move from the config files:
>
>./include/configs/omap3_igep00x0.h
>./include/configs/gardena-smart-gateway-at91sam.h
>./include/configs/am335x_igep003x.h
>
>also the symbols to the defconfig files, thanks.
>
>BTW: you can use the tool tools/moveconfig.py in u-boot source
>for this purpose.
>
>Beside of this, you can add my:
>
>Reviewed-by: Heiko Schocher <hs@denx.de>

Thank you for your feedback! I will go through it and submit a v2
within a few days.

Best regards
Markus
Markus Klotzbuecher May 9, 2019, 8:59 a.m. UTC | #3 
Hello Heiko

On Tue, Apr 30, 2019 at 06:54:01AM +0200, Heiko Schocher wrote:

>Am 15.04.2019 um 17:32 schrieb Markus Klotzbuecher:
>> From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>
>please add a commit message.
>
>> Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>> Cc: Heiko Schocher <hs@denx.de>
>> Cc: Kyungmin Park <kmpark@infradead.org>
>> ---
>>   env/Kconfig                  | 6 ++++++
>>   scripts/config_whitelist.txt | 1 -
>>   2 files changed, 6 insertions(+), 1 deletion(-)
>> 
>> diff --git a/env/Kconfig b/env/Kconfig
>> index 78300660c7..44c47220c2 100644
>> --- a/env/Kconfig
>> +++ b/env/Kconfig
>> @@ -513,6 +513,12 @@ config ENV_UBI_VOLUME
>>   	help
>>   	  Name of the volume that you want to store the environment in.
>> +config ENV_UBI_VOLUME_REDUND
>> +	string "UBI redundant volume name"
>> +	depends on ENV_IS_IN_UBI
>> +	help
>> +	  Name of the redundant volume that you want to store the environment in.
>> +
>>   endif
>>   config USE_DEFAULT_ENV_FILE
>> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
>> index fa98efc24c..5d76c781d3 100644
>> --- a/scripts/config_whitelist.txt
>> +++ b/scripts/config_whitelist.txt
>> @@ -504,7 +504,6 @@ CONFIG_ENV_SROM_BANK
>>   CONFIG_ENV_TOTAL_SIZE
>>   CONFIG_ENV_UBIFS_OPTION
>>   CONFIG_ENV_UBI_MTD
>> -CONFIG_ENV_UBI_VOLUME_REDUND
>>   CONFIG_ENV_VERSION
>>   CONFIG_EP9302
>>   CONFIG_EP9307
>> 
>
>Please move from the config files:
>
>./include/configs/omap3_igep00x0.h
>./include/configs/gardena-smart-gateway-at91sam.h
>./include/configs/am335x_igep003x.h
>
>also the symbols to the defconfig files, thanks.

I have a question: to convert these, I need to make available the
additional ENV_ configs to OMAP2PLUS and AT91:

diff --git a/env/Kconfig b/env/Kconfig
index 44c47220c2..1250656d74 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -470,7 +470,7 @@ config ENV_EXT4_FILE
 	  It's a string of the EXT4 file name. This file use to store the
 	  environment (explicit path to the file)
 
-if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
+if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC || ARCH_OMAP2PLUS || ARCH_AT91

However, this "if" region contains a few other, non UBI settings such
as ENV_SIZE, which would become visible to a large number of OMAP2PLUS
and AT91 boards, which still define this in the headers.

I'm a bit hesitant to touch all of these. What is the suggested way to
solve this?

Thank you,
Markus
Heiko Schocher May 9, 2019, 11:17 a.m. UTC | #4 
Hello Markus,

Am 09.05.2019 um 10:59 schrieb Markus Klotzbuecher:
> Hello Heiko
> 
> On Tue, Apr 30, 2019 at 06:54:01AM +0200, Heiko Schocher wrote:
> 
>> Am 15.04.2019 um 17:32 schrieb Markus Klotzbuecher:
>>> From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>>
>> please add a commit message.
>>
>>> Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>>> Cc: Heiko Schocher <hs@denx.de>
>>> Cc: Kyungmin Park <kmpark@infradead.org>
>>> ---
>>>    env/Kconfig                  | 6 ++++++
>>>    scripts/config_whitelist.txt | 1 -
>>>    2 files changed, 6 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/env/Kconfig b/env/Kconfig
>>> index 78300660c7..44c47220c2 100644
>>> --- a/env/Kconfig
>>> +++ b/env/Kconfig
>>> @@ -513,6 +513,12 @@ config ENV_UBI_VOLUME
>>>    	help
>>>    	  Name of the volume that you want to store the environment in.
>>> +config ENV_UBI_VOLUME_REDUND
>>> +	string "UBI redundant volume name"
>>> +	depends on ENV_IS_IN_UBI
>>> +	help
>>> +	  Name of the redundant volume that you want to store the environment in.
>>> +
>>>    endif
>>>    config USE_DEFAULT_ENV_FILE
>>> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
>>> index fa98efc24c..5d76c781d3 100644
>>> --- a/scripts/config_whitelist.txt
>>> +++ b/scripts/config_whitelist.txt
>>> @@ -504,7 +504,6 @@ CONFIG_ENV_SROM_BANK
>>>    CONFIG_ENV_TOTAL_SIZE
>>>    CONFIG_ENV_UBIFS_OPTION
>>>    CONFIG_ENV_UBI_MTD
>>> -CONFIG_ENV_UBI_VOLUME_REDUND
>>>    CONFIG_ENV_VERSION
>>>    CONFIG_EP9302
>>>    CONFIG_EP9307
>>>
>>
>> Please move from the config files:
>>
>> ./include/configs/omap3_igep00x0.h
>> ./include/configs/gardena-smart-gateway-at91sam.h
>> ./include/configs/am335x_igep003x.h
>>
>> also the symbols to the defconfig files, thanks.
> 
> I have a question: to convert these, I need to make available the
> additional ENV_ configs to OMAP2PLUS and AT91:
> 
> diff --git a/env/Kconfig b/env/Kconfig
> index 44c47220c2..1250656d74 100644
> --- a/env/Kconfig
> +++ b/env/Kconfig
> @@ -470,7 +470,7 @@ config ENV_EXT4_FILE
>   	  It's a string of the EXT4 file name. This file use to store the
>   	  environment (explicit path to the file)
>   
> -if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
> +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC || ARCH_OMAP2PLUS || ARCH_AT91
> 
> However, this "if" region contains a few other, non UBI settings such
> as ENV_SIZE, which would become visible to a large number of OMAP2PLUS
> and AT91 boards, which still define this in the headers.

Huch?

If so, than they are not converted (yet) ... :-(

> I'm a bit hesitant to touch all of these. What is the suggested way to
> solve this?

I think, they should be converted too ...

Sorry for the additional work ... I can understand your hesitantion
to do such a conversion...

Hmm... I used some year(s) ago tbot for checking, if a config change
did not introduced diffs in created binaries for all boards [1] ...

In principal I did:

- build all boards with "SOURCE_DATE_EPOCH=0"
   and created a md5sum from each binary
- apply patch(es)
- build again, create md5sums and check if mdsum is the same

Unfortunately not converted this testcase to the new tbot ...

But may it is possible to convert this into a script ?

bye,
Heiko
[1] https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
Markus Klotzbuecher May 9, 2019, 3:49 p.m. UTC | #5 
Hello Heiko

On Thu, May 09, 2019 at 01:17:06PM +0200, Heiko Schocher wrote:
>
>Am 09.05.2019 um 10:59 schrieb Markus Klotzbuecher:
>> Hello Heiko
>> 
>> On Tue, Apr 30, 2019 at 06:54:01AM +0200, Heiko Schocher wrote:
>> 
>> > Am 15.04.2019 um 17:32 schrieb Markus Klotzbuecher:
>> > > From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>> > 
>> > please add a commit message.
>> > 
>> > > Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>> > > Cc: Heiko Schocher <hs@denx.de>
>> > > Cc: Kyungmin Park <kmpark@infradead.org>
>> > > ---
>> > >    env/Kconfig                  | 6 ++++++
>> > >    scripts/config_whitelist.txt | 1 -
>> > >    2 files changed, 6 insertions(+), 1 deletion(-)
>> > > 
>> > > diff --git a/env/Kconfig b/env/Kconfig
>> > > index 78300660c7..44c47220c2 100644
>> > > --- a/env/Kconfig
>> > > +++ b/env/Kconfig
>> > > @@ -513,6 +513,12 @@ config ENV_UBI_VOLUME
>> > >    	help
>> > >    	  Name of the volume that you want to store the environment in.
>> > > +config ENV_UBI_VOLUME_REDUND
>> > > +	string "UBI redundant volume name"
>> > > +	depends on ENV_IS_IN_UBI
>> > > +	help
>> > > +	  Name of the redundant volume that you want to store the environment in.
>> > > +
>> > >    endif
>> > >    config USE_DEFAULT_ENV_FILE
>> > > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
>> > > index fa98efc24c..5d76c781d3 100644
>> > > --- a/scripts/config_whitelist.txt
>> > > +++ b/scripts/config_whitelist.txt
>> > > @@ -504,7 +504,6 @@ CONFIG_ENV_SROM_BANK
>> > >    CONFIG_ENV_TOTAL_SIZE
>> > >    CONFIG_ENV_UBIFS_OPTION
>> > >    CONFIG_ENV_UBI_MTD
>> > > -CONFIG_ENV_UBI_VOLUME_REDUND
>> > >    CONFIG_ENV_VERSION
>> > >    CONFIG_EP9302
>> > >    CONFIG_EP9307
>> > > 
>> > 
>> > Please move from the config files:
>> > 
>> > ./include/configs/omap3_igep00x0.h
>> > ./include/configs/gardena-smart-gateway-at91sam.h
>> > ./include/configs/am335x_igep003x.h
>> > 
>> > also the symbols to the defconfig files, thanks.
>> 
>> I have a question: to convert these, I need to make available the
>> additional ENV_ configs to OMAP2PLUS and AT91:
>> 
>> diff --git a/env/Kconfig b/env/Kconfig
>> index 44c47220c2..1250656d74 100644
>> --- a/env/Kconfig
>> +++ b/env/Kconfig
>> @@ -470,7 +470,7 @@ config ENV_EXT4_FILE
>>   	  It's a string of the EXT4 file name. This file use to store the
>>   	  environment (explicit path to the file)
>> -if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
>> +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC || ARCH_OMAP2PLUS || ARCH_AT91
>> 
>> However, this "if" region contains a few other, non UBI settings such
>> as ENV_SIZE, which would become visible to a large number of OMAP2PLUS
>> and AT91 boards, which still define this in the headers.
>
>Huch?
>
>If so, than they are not converted (yet) ... :-(
>
>> I'm a bit hesitant to touch all of these. What is the suggested way to
>> solve this?
>
>I think, they should be converted too ...

OK.

>Sorry for the additional work ... I can understand your hesitantion
>to do such a conversion...

No problem, I just wasn't sure how handle this.

I'm now trying to run moveconfig as follows

$ grep -l "ARCH_OMAP2PLUS\|ARCH_AT91" configs/* | ./tools/moveconfig.py -s ENV_OFFSET ENV_SIZE ENV_SECT_SIZE -d -

but the command hangs infinitely.

If I run it for all boards without "-d", it starts processing and gets
through about 50 configs and then hangs too.

Any idea what may be the cause?

I'm using python 2.7.16rc1.

>Hmm... I used some year(s) ago tbot for checking, if a config change
>did not introduced diffs in created binaries for all boards [1] ...
>
>In principal I did:
>
>- build all boards with "SOURCE_DATE_EPOCH=0"
>  and created a md5sum from each binary
>- apply patch(es)
>- build again, create md5sums and check if mdsum is the same
>
>Unfortunately not converted this testcase to the new tbot ...
>
>But may it is possible to convert this into a script ?

Thank you, I'll take a look at it one I get that far.

Best regards
Markus
diff mbox series

Patch

diff --git a/env/Kconfig b/env/Kconfig
index 78300660c7..44c47220c2 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -513,6 +513,12 @@  config ENV_UBI_VOLUME
 	help
 	  Name of the volume that you want to store the environment in.
 
+config ENV_UBI_VOLUME_REDUND
+	string "UBI redundant volume name"
+	depends on ENV_IS_IN_UBI
+	help
+	  Name of the redundant volume that you want to store the environment in.
+
 endif
 
 config USE_DEFAULT_ENV_FILE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fa98efc24c..5d76c781d3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -504,7 +504,6 @@  CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ENV_UBIFS_OPTION
 CONFIG_ENV_UBI_MTD
-CONFIG_ENV_UBI_VOLUME_REDUND
 CONFIG_ENV_VERSION
 CONFIG_EP9302
 CONFIG_EP9307