Re: [PATCH v4 1/2] Kconfig: add btrfs to distro boot

[Petr Vorel]

Hi,

> Signed-off-by: Matthias Brugger 
Reviewed-by: Petr Vorel 

Kind regards,
Petr

Re: [U-Boot] [PATCH v3] dm: spi: Read default speed and mode values from DT

[Petr Vorel]

Hi Patrick,

> This patch update the behavior introduced by
> commit 96907c0fe50a ("dm: spi: Read default speed and mode values from DT")
...

Reviewed-by: Petr Vorel 

Nice idea.

Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 0/7] Remove defines for SPI default speed and mode

[Petr Vorel]

Hi Patrick,

FYI this patchset breaks some machines:
https://travis-ci.org/pevik/u-boot/builds/466192406


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 7/7] spi: remove define for SPI default SPEED and MODE

[Petr Vorel]

Hi Patrick,

> On Mon, Dec 10, 2018 at 11:53 AM Patrick Delaunay
>  wrote:

> > In DM mode, the speed and mode defaults value will be taken from DT,
> > so these defines should be never used and can be removed.

> > Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 
> > ---

> >  include/spi_flash.h | 4 
> >  1 file changed, 4 insertions(+)

> > diff --git a/include/spi_flash.h b/include/spi_flash.h
> > index 36565bb..c9d20a5 100644
> > --- a/include/spi_flash.h
> > +++ b/include/spi_flash.h
> > @@ -12,12 +12,16 @@
> >  #include /* Because we dereference struct udevice here */
> >  #include 

> > +#ifndef CONFIG_DM_SPI_FLASH
> > +/* In DM mode, speed and mode value will be taken from DT */
> >  #ifndef CONFIG_SF_DEFAULT_SPEED
> >  # define CONFIG_SF_DEFAULT_SPEED   100
> >  #endif
> >  #ifndef CONFIG_SF_DEFAULT_MODE
> >  # define CONFIG_SF_DEFAULT_MODESPI_MODE_3
> >  #endif
> > +#endif
Also: maybe indent preprocessor code?


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 6/7] env: Read default speed and mode values from DT

[Petr Vorel]

Hi Patrick,

> In case of DT boot, don't read default speed and mode for SPI from
> CONFIG_*, instead read from DT node.

> Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 
> ---

>  env/Kconfig | 4 ++--
>  env/sf.c| 5 -
>  2 files changed, 6 insertions(+), 3 deletions(-)

...
> +++ b/env/sf.c
> @@ -24,12 +24,15 @@
>  #ifndef CONFIG_ENV_SPI_CS
>  # define CONFIG_ENV_SPI_CS   CONFIG_SF_DEFAULT_CS
>  #endif
> +
> +#ifndef CONFIG_DM_SPI_FLASH
>  #ifndef CONFIG_ENV_SPI_MAX_HZ
>  # define CONFIG_ENV_SPI_MAX_HZ   CONFIG_SF_DEFAULT_SPEED
>  #endif
>  #ifndef CONFIG_ENV_SPI_MODE
>  # define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
>  #endif
> +#endif

Maybe indent? (code style mix indent and not)
#ifndef CONFIG_DM_SPI_FLASH
# ifndef CONFIG_ENV_SPI_MAX_HZ
#  define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
# endif
# ifndef CONFIG_ENV_SPI_MODE
#  define CONFIG_ENV_SPI_MODE   CONFIG_SF_DEFAULT_MODE
# endif
#endif


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 5/7] mips: mt76xx: gardena-smart-gateway: Read default speed and mode values from DT

[Petr Vorel]

Hi Patrick,

> In case of DT boot, don't read default speed and mode for SPI from
> CONFIG_*, instead read from DT node.

> Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 

Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 4/7] dfu: sf: Read default speed and mode values from DT

[Petr Vorel]

Hi Patrick,

> In case of DT boot, don't read default speed and mode for SPI from
> CONFIG_*, instead read from DT node.

> Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 3/7] da850evm: sf: Read default speed and mode values from DT

[Petr Vorel]

Hi Patrick,

> In case of DT boot, don't read default speed and mode for SPI from
> CONFIG_*, instead read from DT node.

> Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 2/7] spi: add comment for spi_flash_probe_bus_cs function

[Petr Vorel]

Hi Patrick,

> On Mon, Dec 10, 2018 at 11:53 AM Patrick Delaunay
>  wrote:

> > Add Kernel style documentation for spi_flash_probe_bus_cs().

> > Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 
> > ---

> >  include/spi_flash.h | 14 ++
> >  1 file changed, 14 insertions(+)


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 1/7] spi: update management of default speed and mode

[Petr Vorel]

Hi Patrick,

> On Mon, Dec 10, 2018 at 11:53 AM Patrick Delaunay
>  wrote:

> > The 2 default values for SPI mode and speed are
> > only if CONFIG_DM_SPI_FLASH is not defined
> > - CONFIG_SF_DEFAULT_SPEED
> > - CONFIG_SF_DEFAULT_MODE

> > Inverse the logic of the test to remove these two defines.

> > Signed-off-by: Patrick Delaunay 
Reviewed-by: Petr Vorel 

> > ---

> >  cmd/sf.c   | 10 ++
> >  common/spl/spl_spi.c   | 11 ++-
> >  common/splash_source.c | 11 ++-
Patch only applies to cmd/sf.c, the other once do not apply (original patch was
too old).
Or am I missing something?


Kind regards,
Petr


> >  3 files changed, 18 insertions(+), 14 deletions(-)

> > diff --git a/cmd/sf.c b/cmd/sf.c
> > index 84bb057..cfea545 100644
> > --- a/cmd/sf.c
> > +++ b/cmd/sf.c
> > @@ -81,16 +81,18 @@ static int do_spi_flash_probe(int argc, char * const 
> > argv[])
> >  {
> > unsigned int bus = CONFIG_SF_DEFAULT_BUS;
> > unsigned int cs = CONFIG_SF_DEFAULT_CS;
> > -   unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
> > -   unsigned int mode = CONFIG_SF_DEFAULT_MODE;
> > +   /* In DM mode, defaults will be taken from DT */
> > +   unsigned int speed = 0;
> > +   unsigned int mode = 0;
> > char *endp;
> >  #ifdef CONFIG_DM_SPI_FLASH
> > struct udevice *new, *bus_dev;
> > int ret;
> > -   /* In DM mode defaults will be taken from DT */
> > -   speed = 0, mode = 0;
> >  #else
> > struct spi_flash *new;
> > +
> > +   speed = CONFIG_SF_DEFAULT_SPEED;
> > +   mode = CONFIG_SF_DEFAULT_MODE;
> >  #endif

> > if (argc >= 2) {
> > diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
> > index b348b45..c1c1fcb 100644
> > --- a/common/spl/spl_spi.c
> > +++ b/common/spl/spl_spi.c
> > @@ -74,12 +74,13 @@ static int spl_spi_load_image(struct spl_image_info 
> > *spl_image,
> > unsigned payload_offs = CONFIG_SYS_SPI_U_BOOT_OFFS;
> > struct spi_flash *flash;
> > struct image_header *header;
> > -   unsigned int max_hz = CONFIG_SF_DEFAULT_SPEED;
> > -   unsigned int spi_mode = CONFIG_SF_DEFAULT_MODE;
> > +   /* In DM mode, defaults will be taken from DT */
> > +   unsigned int max_hz = 0;
> > +   unsigned int spi_mode = 0;

> > -#ifdef CONFIG_DM_SPI_FLASH
> > -   /* In DM mode defaults will be taken from DT */
> > -   max_hz = 0, spi_mode = 0;
> > +#ifndef CONFIG_DM_SPI_FLASH
> > +   max_hz = CONFIG_SF_DEFAULT_SPEED;
> > +   spi_mode = CONFIG_SF_DEFAULT_MODE;
> >  #endif
> > /*
> >  * Load U-Boot image from SPI flash into RAM
> > diff --git a/common/splash_source.c b/common/splash_source.c
> > index 427196c..d5d5550 100644
> > --- a/common/splash_source.c
> > +++ b/common/splash_source.c
> > @@ -24,12 +24,13 @@ DECLARE_GLOBAL_DATA_PTR;
> >  static struct spi_flash *sf;
> >  static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t 
> > read_size)
> >  {
> > -   unsigned int max_hz = CONFIG_SF_DEFAULT_SPEED;
> > -   unsigned int spi_mode = CONFIG_SF_DEFAULT_MODE;
> > +   /* In DM mode, defaults will be taken from DT */
> > +   unsigned int max_hz = 0;
> > +   unsigned int spi_mode = 0;

> > -#ifdef CONFIG_DM_SPI_FLASH
> > -   /* In DM mode defaults will be taken from DT */
> > -   max_hz = 0, spi_mode = 0;
> > +#ifndef CONFIG_DM_SPI_FLASH
> > +   max_hz = CONFIG_SF_DEFAULT_SPEED;
> > +   spi_mode = CONFIG_SF_DEFAULT_MODE;
> >  #endif

> > if (!sf) {

> Reviewed-by: Simon Goldschmidt 

> Regards,
> Simon
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 2/2] arm: at91: wdt: Convert watchdog config to Kconfig

[Petr Vorel]

Hi Prasanthi,

> Convert "CONFIG_AT91SAM9_WATCHDOG" to new "CONFIG_WDT_AT91"
> Kconfig option to support driver model and device tree.

> Signed-off-by: Prasanthi Chellakumar 
> ---
>  README| 3 ---
>  arch/arm/dts/at91sam9260-smartweb.dts | 1 +
>  arch/arm/dts/at91sam9g20-taurus.dts   | 1 +
>  arch/arm/mach-at91/spl.c  | 2 +-
>  arch/arm/mach-at91/spl_at91.c | 2 +-
>  arch/arm/mach-at91/spl_atmel.c| 2 +-
>  common/board_f.c  | 2 +-
>  configs/picosam9g45_defconfig | 2 ++
>  configs/smartweb_defconfig| 2 ++
>  configs/taurus_defconfig  | 2 ++
>  doc/README.at91   | 2 +-
>  doc/README.watchdog   | 2 +-
>  include/configs/picosam9g45.h | 4 
>  include/configs/smartweb.h| 7 ---
>  include/configs/taurus.h  | 7 ---
>  scripts/config_whitelist.txt  | 2 --
>  16 files changed, 14 insertions(+), 29 deletions(-)

Your patch breaks arm926ejs and atmel.

Second you send twice, but it's the same.
https://travis-ci.org/pevik/u-boot/builds/430613730
https://travis-ci.org/pevik/u-boot/builds/430613525


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 1/2] arm: at91: wdt: Convert watchdog driver to dm/dt

[Petr Vorel]

Hi Prasanthi,

> Convert the Watchdog driver for AT91SAM9x processors to support
> the driver model and device tree.

> Signed-off-by: Prasanthi Chellakumar 
> ---
>  arch/arm/mach-at91/include/mach/at91_wdt.h |  12 +++-
>  drivers/watchdog/Kconfig   |   7 ++
>  drivers/watchdog/Makefile  |   2 +-
>  drivers/watchdog/at91sam9_wdt.c| 106 
> +
>  4 files changed, 96 insertions(+), 31 deletions(-)

Your patch breaks arm926ejs and atmel.
https://travis-ci.org/pevik/u-boot/builds/430694055


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH] env: Add !ENV_IS_IN_EXT4 dependency to ENV_IS_NOWHERE

[Petr Vorel]

Hi Alex,

> If ENV_IS_IN_EXT4 is set you shouldn't be able to select ENV_IS_NOWHERE.

> Signed-off-by: Alex Kiernan 
Tested-by: Petr Vorel 

Nice fix, thanks :)

Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v3 1/6] kconfig: re-sync with Linux 4.17-rc4

[Petr Vorel]

Hi Eugeniu,

> My testing was limited to:
> - make defconfig all
> - make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
> - comparing .config before and after the re-sync
> - running the newly imported Kconfig unit tests as seen below:

> $ make testconfig

> = test session starts 
> =
> scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [  7%]
> scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED   [ 14%]
> scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED   [ 21%]
> scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED[ 28%]
> scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED[ 35%]
> scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
> scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED[ 50%]
> scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED  [ 57%]
> scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED[ 64%]
> scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
> scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED  [ 78%]
> scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED[ 85%]
> scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED   [ 92%]
> scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED   [100%]
> == 14 passed in 0.34 seconds 
> ==

> Signed-off-by: Eugeniu Rosca <ero...@de.adit-jv.com>
> Reviewed-by: Masahiro Yamada <yamada.masah...@socionext.com>
> Tested-by: Petr Vorel <petr.vo...@gmail.com>
> ---

> v2->v3:
> * Added: Tested-by: Petr Vorel <petr.vo...@gmail.com>
Tested-by: Petr Vorel <petr.vo...@gmail.com>
Tested whole patch-set, works as expected.
Travis build is also ok:
https://travis-ci.org/pevik/u-boot/builds/381548813


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 1/6] kconfig: re-sync with Linux 4.17-rc4

[Petr Vorel]

Hi Eugeniu,

> 2018-05-13 2:13 GMT+09:00 Eugeniu Rosca :
> > Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.

> > Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
> > re-sync with Linux 4.10") and it achieved almost perfect alignment with
> > a few (intended) exceptions, caused by below U-boot commits:

Maybe it's again something wrong with my patch, but it broke 2 builds in travis:
https://travis-ci.org/pevik/u-boot/builds/379302139

It's this branch (make testconfig works on it):
https://github.com/pevik/u-boot/commits/eugeniu/kconfig.v2.test


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 1/6] kconfig: re-sync with Linux 4.17-rc4

[Petr Vorel]

Hi Eugeniu, Masahiro,

> > So, it seems like all the trailing white-space from above files
> > disappeared on your branch, after applying the patches from the
> > email client (who did this?...).

> > I didn't expect that trailing white-space to be of any value for the
> > test results, but it turns out it is! With the whitespace removed, I can
> > also reproduce the failures of "make testconfig".

> Right.
> Whitespaces are precious in the expected_stdout files.
> Do not rip them off.



> > I am not familiar with pytest, but, based on what we see here, it looks
> > like every single character stored in *xpected_stdout files (including
> > whitespace at the end of lines) matters for the test to pass.

> > I wonder if Kconfig could avoid printing whitespace in command line
> > user dialogs. Then maybe those space characters could be removed from
> > the "*xpected_stdout" files.

BTW this topic is more for linux-kbuild, than u-boot.


> 'make config' display a space at the end of line
> when prompting user input.

> This makes the input readable, like follows:

> *
> * Linux/x86 4.17.0-rc4 Kernel Configuration
> *
> 64-bit kernel (64BIT) [Y/n/?] y
> *
> * General setup
> *
> Cross-compiler tool prefix (CROSS_COMPILE) []
> Compile also drivers which will not load (COMPILE_TEST) [N/y/?] y



> I think you are suggesting to remove a space, like follows:

> *
> * Linux/x86 4.17.0-rc4 Kernel Configuration
> *
> 64-bit kernel (64BIT) [Y/n/?]y
> *
> * General setup
> *
> Cross-compiler tool prefix (CROSS_COMPILE) []
> Compile also drivers which will not load (COMPILE_TEST) [N/y/?]y




> I believe we should not do this
> just for unit-testing.
Yes, that wouldn't make sense.
I just have to be careful when applying patches :)

> > Masahiro?

> > Thanks again!

> > Best regards,
> > Eugeniu.


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 1/6] kconfig: re-sync with Linux 4.17-rc4

[Petr Vorel]

Hi Eugeniu,

> My testing was limited to:
> - make defconfig all
> - make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
> - comparing .config before and after the re-sync
> - running the newly imported Kconfig unit tests as seen below:

I tested whole patch-set with the other options:
make config
make defconfig
make menuconfig
make xconfig
make gconfig
make oldconfig

> Reviewed-by: Masahiro Yamada <yamada.masah...@socionext.com>
> Signed-off-by: Eugeniu Rosca <ero...@de.adit-jv.com>
Tested-by: Petr Vorel <petr.vo...@gmail.com>

> $ make testconfig

> = test session starts 
> =
> scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [  7%]
> scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED   [ 14%]
> scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED   [ 21%]
> scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED[ 28%]
> scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED[ 35%]
> scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
> scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED[ 50%]
> scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED  [ 57%]
> scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED[ 64%]
> scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
> scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED  [ 78%]
> scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED[ 85%]
> scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED   [ 92%]
> scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED   [100%]
> == 14 passed in 0.34 seconds 
> ==

When applied all 6 patches, I got several errors (see bellow).
I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed).
The code I applied is here, did I make error when applying patches?
https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2


Kind regards,
Petr

$ make testconfig
python3 -B -m pytest ./scripts/kconfig/tests \
-o cache_dir=/home/pevik/install/src/u-boot.git/scripts/kconfig/tests/.cache \

= test session starts ==
platform linux -- Python 3.6.5, pytest-3.3.2, py-1.5.3, pluggy-0.6.0 -- 
/usr/bin/python3
cachedir: scripts/kconfig/tests/.cache
rootdir: /home/pevik/install/src/u-boot.git/scripts/kconfig/tests, inifile: 
pytest.ini
collecting ... collected 14 items

scripts/kconfig/tests/auto_submenu/__init__.py::test FAILED  [  7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 FAILED[ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 FAILED[ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED  [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED   [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED  [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test FAILED   [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED[ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED[100%]

=== FAILURES ===
_ test _

conf = 

def test(conf):
assert conf.oldaskconfig() == 0
>   assert conf.stdout_contains('expected_stdout')
E   AssertionError

scripts/kconfig/tests/auto_submenu/__init__.py:12: AssertionError
- Captured stdout call -
[command]
/home/pevik/install/src/u-boot.git/scripts/kconfig/conf --oldaskconfig Kconfig

[retcode]
0

[stdout]
*
* Linux Kernel Configuration
*
A (A) [Y/n/?] (NEW) 
  A0 (A0) [Y/n/?] (NEW) 
A1_0 (A0_0) [N/y/?] (NEW) 
  A1 (A1) [Y/n/?] (NEW) 
choice
> 1. A1_0 (A1_0) (NEW)
  2. A1_1 (A1_1) (NEW)
choice[1-2?]: 
B (B) [N/y/?] (NEW) 
C (C) [N/y/?] (NEW) 
#
# configuration written to .config
#

[stderr]

[output for '.config']
#
# Automatically generated file; DO NOT EDIT.
# Linux Kernel Configuration
#
CONFIG_A=y
CONFIG_A0=y
# CONFIG_A0_0 is not set
CONFIG_A1=y
CONFIG_A1_0=y
# CONFIG_A1_1 is not set
# CONFIG_B is not set
# CONFIG_C is not set

_

Re: [U-Boot] [PATCH v2 1/6] kconfig: re-sync with Linux 4.17-rc4

[Petr Vorel]

Hi Eugeniu,

> Hello Petr,

> On Sat, May 12, 2018 at 08:25:56PM +0200, Petr Vorel wrote:

> > When applied all 6 patches, I got several errors (see bellow).
> > I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed).
> > The code I applied is here, did I make error when applying patches?
> > https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2

> I checked your branch and got some interesting conclusions.
> Here is the diff between my and your version of commit ("kconfig:
> re-sync with Linux 4.17-rc4"):

> $ git diff  
>  scripts/kconfig/tests/auto_submenu/expected_stdout| 14 +++---
>  scripts/kconfig/tests/choice/oldask0_expected_stdout  | 14 +++---
>  scripts/kconfig/tests/choice/oldask1_expected_stdout  | 12 ++--
>  scripts/kconfig/tests/new_choice_with_dep/expected_stdout |  4 ++--
>  4 files changed, 22 insertions(+), 22 deletions(-)

> Here is the same diff ignoring whitespace:

> $ git diff -w  
>  scripts/kconfig/tests/auto_submenu/expected_stdout| 0
>  scripts/kconfig/tests/choice/oldask0_expected_stdout  | 0
>  scripts/kconfig/tests/choice/oldask1_expected_stdout  | 0
>  scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 0
>  4 files changed, 0 insertions(+), 0 deletions(-)

> So, it seems like all the trailing white-space from above files
> disappeared on your branch, after applying the patches from the
> email client (who did this?...).
OK, my fault, I'm sorry. Applying first patch as 'git am --whitespace=warn 
1.mbox' fixes
that => make testconfig works.

Yes I applied patches with mutt (I usually use pwclient, but somehow I didn't 
find your v2
in patchwork [1], nor even in ML [2]. Have I overlook something.

[1] https://patchwork.ozlabs.org/project/uboot/list/
[2] https://lists.denx.de/pipermail/u-boot/2018-May/date.html


Kind regards,
Petr

> I didn't expect that trailing white-space to be of any value for the
> test results, but it turns out it is! With the whitespace removed, I can
> also reproduce the failures of "make testconfig".

> I am not familiar with pytest, but, based on what we see here, it looks
> like every single character stored in *xpected_stdout files (including
> whitespace at the end of lines) matters for the test to pass.

> I wonder if Kconfig could avoid printing whitespace in command line
> user dialogs. Then maybe those space characters could be removed from
> the "*xpected_stdout" files.

> Masahiro?

> Thanks again!

> Best regards,
> Eugeniu.
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH] kconfig: Print reverse dependencies in groups

[Petr Vorel]

Hi Eugeniu,

> FWIW, here is some statistics of the kernel kconfig development in the
> v4.10..v4.17-rc4 commit range:

> - 86 non-merge change-sets:
> git rev-list --no-merges --count v4.10..v4.17-rc4 -- scripts/kconfig/
> 86
FYI: I send some time ago a patchset to update kconfig in buildroot, where 
delta is even
bigger as sync was to 3.13-rc5 (+ some fixes).

> Eugeniu.

Kind regards,
Petr

[1] https://patchwork.ozlabs.org/project/buildroot/list/?series=40942
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH] kconfig: Print reverse dependencies in groups

[Petr Vorel]

Hi Eugeniu,

> Not sure if partial/limited sync with Linux Kconfig is practiced, but
> if yes, then pick below three Linux commits, which are focused around
> improving the readability of reverse dependencies in menuconfig UI.

> [1] commit 1ccb27143360bd2390a9a970e50709f858b53761
>     Author: Petr Vorel <petr.vo...@gmail.com>
> kconfig: make "Selected by:" and "Implied by:" readable

> [2] commit 9a47ceec543bfb703fbe2f8d584850b582caf1a6
> Masahiro Yamada <yamada.masah...@socionext.com>
> kconfig: clean-up reverse dependency help implementation

> [3] commit d9119b5925a03b9a3191fa3e93b4091651d8ad25
> Author: Eugeniu Rosca <ero...@de.adit-jv.com>
> kconfig: Print reverse dependencies in groups

Thanks for doing it. I also think that syncing to Linux version is better way.


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 1/2] Migrate CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig

[Petr Vorel]

Hi Alex,

> Convert CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig

> Signed-off-by: Alex Kiernan <alex.kier...@gmail.com>
> Reviewed-by: Lukasz Majewski <lu...@denx.de>
Reviewed-by: Petr Vorel <petr.vo...@gmail.com>


> ---

> Changes in v2:
> - Rebase against master
> - Drop default in Kconfig to avoid over conversion by moveconfig
> - Resolve conflict in include/configs/am335x_igep003x.h

Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 1/2] Migrate CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig

[Petr Vorel]

Hi Alex,

> Convert CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig

> Signed-off-by: Alex Kiernan <alex.kier...@gmail.com>
> Reviewed-by: Lukasz Majewski <lu...@denx.de>
Reviewed-by: Petr Vorel 
> ---

> Changes in v2:
> - Rebase against master
> - Drop default in Kconfig to avoid over conversion by moveconfig
> - Resolve conflict in include/configs/am335x_igep003x.h


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2 2/2] Cleanup CONFIG_VERSION_VARIABLE migration

[Petr Vorel]

Hi Alex,

> CONFIG_VERSION_VARIABLE had already been mostly migrated to Kconfig,
> but two headers still referenced it. Also set defaults so that
> most of the defconfigs inherit the default rather than needing it
> to be set explicitly.

> Signed-off-by: Alex Kiernan <alex.kier...@gmail.com>
Reviewed-by: Petr Vorel <petr.vo...@gmail.com>
> ---

> Changes in v2:
> - Remove default from Kconfig to avoid over-conversion by moveconfig


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v3 3/3] Convert CONFIG_UBI_SILENCE_MSG to Kconfig

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
---
 README| 6 --
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig| 1 +
 configs/igep00x0_defconfig| 1 +
 drivers/mtd/ubi/Kconfig   | 7 +++
 env/Kconfig   | 5 -
 include/configs/am335x_igep003x.h | 3 ---
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 9 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/README b/README
index af7fbb6561..ed79298fd4 100644
--- a/README
+++ b/README
@@ -2482,12 +2482,6 @@ FIT uImage format:
kernel. Needed for UBI support.
 
 - UBI support
-   CONFIG_UBI_SILENCE_MSG
-
-   Make the verbose messages from UBI stop printing.  This leaves
-   warnings and errors enabled.
-
-
CONFIG_MTD_UBI_WL_THRESHOLD
This parameter defines the maximum difference between the 
highest
erase counter value and the lowest erase counter value of 
eraseblocks
diff --git a/configs/am335x_igep003x_defconfig 
b/configs/am335x_igep003x_defconfig
index e4292b549b..be4f112286 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_UBIFS_SILENCE_MSG=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index cd6423409c..7683e7412b 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 9fb4b91452..fef1331c0a 100644
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index caa5197df5..cf84783356 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,5 +1,12 @@
 menu "UBI support"
 
+config CONFIG_UBI_SILENCE_MSG
+   bool "UBI silence verbose messages"
+   default ENV_IS_IN_UBI
+   help
+ Make the verbose messages from UBI stop printing. This leaves
+ warnings and errors enabled.
+
 config MTD_UBI
bool "Enable UBI - Unsorted block images"
select CRC32
diff --git a/env/Kconfig b/env/Kconfig
index 36d6e799fc..35548721bd 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -360,11 +360,6 @@ config ENV_IS_IN_UBI
  the environment in.  This will enable redundant environments in UBI.
  It is assumed that both volumes are in the same MTD partition.
 
- - CONFIG_UBI_SILENCE_MSG
-
- You will probably want to define these to avoid a really noisy system
- when storing the env in UBI.
-
 config ENV_FAT_INTERFACE
string "Name of the block device for the environment"
depends on ENV_IS_IN_FAT
diff --git a/include/configs/am335x_igep003x.h 
b/include/configs/am335x_igep003x.h
index e00c73dab3..fe3f838598 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -22,9 +22,6 @@
 
 #define CONFIG_ENV_SIZE(96 << 10)  /*  96 KiB */
 
-/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index ab54a25d1a..e2a7f63e4f 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_UBI_PART"UBI"
 #define CONFIG_ENV_UBI_VOLUME  "config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
-#define CONFIG_UBI_SILENCE_MSG 1
 #define CONFIG_ENV_SIZE(32*1024)
 
 #endif /* __IGEP00X0_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fce1391ac4..0c7db05274 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4629,7 +4629,6 @@ CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
-CONFIG_UBI_SILENCE_MSG
 CONFIG_UBI_SIZE
 CONFIG_UBOOT1_ENV_ADDR
 CONFIG_UBOOT2_ENV_ADDR
-- 
2.16.2

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v3 2/3] Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

[Petr Vorel]

Introduce another difference from upstream (kernel) source in
fs/ubifs/super.c: adding preprocessor condition as y variable in
mount_ubifs() depends on CONFIG_UBIFS_SILENCE_MSG:
fs/ubifs/super.c:1337:15: error: variable ?y? set but not used 
[-Werror=unused-but-set-variable]
  long long x, y;

Not setting CONFIG_UBIFS_SILENCE_MSG in am335x_igep003x_defconfig and
igep0032_defconfig. Although it was defined in their config headers, it
depends on CMD_UBIFS which is not set for them.

Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Heiko Schocher <h...@denx.de>
---
 README| 6 --
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig| 1 +
 configs/igep00x0_defconfig| 1 +
 env/Kconfig   | 1 -
 fs/ubifs/Kconfig  | 6 ++
 fs/ubifs/super.c  | 7 ++-
 include/configs/am335x_igep003x.h | 1 -
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 10 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 5fd6428c5c..af7fbb6561 100644
--- a/README
+++ b/README
@@ -2549,12 +2549,6 @@ FIT uImage format:
Enable UBI fastmap debug
default: 0
 
-- UBIFS support
-   CONFIG_UBIFS_SILENCE_MSG
-
-   Make the verbose messages from UBIFS stop printing.  This leaves
-   warnings and errors enabled.
-
 - SPL framework
CONFIG_SPL
Enable building of SPL globally.
diff --git a/configs/am335x_igep003x_defconfig 
b/configs/am335x_igep003x_defconfig
index d2026da7b3..e4292b549b 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -39,6 +39,7 @@ 
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_UBI=y
+CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 0a3dff7796..cd6423409c 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 872766939a..9fb4b91452 100644
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
diff --git a/env/Kconfig b/env/Kconfig
index a3c6298273..36d6e799fc 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
  It is assumed that both volumes are in the same MTD partition.
 
  - CONFIG_UBI_SILENCE_MSG
- - CONFIG_UBIFS_SILENCE_MSG
 
  You will probably want to define these to avoid a really noisy system
  when storing the env in UBI.
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index e69de29bb2..9da35b8a37 100644
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -0,0 +1,6 @@
+config UBIFS_SILENCE_MSG
+   bool "UBIFS silence verbose messages"
+   default ENV_IS_IN_UBI
+   help
+ Make the verbose messages from UBIFS stop printing. This leaves
+ warnings and errors enabled.
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index effa8d933f..2c478cba96 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1334,7 +1334,10 @@ static int check_free_space(struct ubifs_info *c)
 static int mount_ubifs(struct ubifs_info *c)
 {
int err;
-   long long x, y;
+   long long x;
+#ifndef CONFIG_UBIFS_SILENCE_MSG
+   long long y;
+#endif
size_t sz;
 
c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
@@ -1613,7 +1616,9 @@ static int mount_ubifs(struct ubifs_info *c)
  c->vi.ubi_num, c->vi.vol_id, c->vi.name,
  c->ro_mount ? ", R/O mode" : "");
x = (long long)c->main_lebs * c->leb_size;
+#ifndef CONFIG_UBIFS_SILENCE_MSG
y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
+#endif
ubifs_msg(c, "LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d 
bytes/%d bytes",
  c->leb_size, c->leb_size >> 10, c->min_io_size,
  c->max_write_size);
diff --git a/include/configs/am335x_igep003x.h 
b/include/configs/am335x_igep003x.h
index 50fd46a589..e00c73dab3 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -24,7 +24,6 @@
 
 /* Make the verbose messages from UBI stop printing */
 #define CONFIG_UB

[U-Boot] [PATCH v3 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

[Petr Vorel]

Use of CONFIG_UBIFS_SILENCE_MSG was added in
147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Heiko Schocher <h...@denx.de>
Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
---
 fs/ubifs/ubifs.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 1d89465205..b4ce706a8e 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
 #define UBIFS_VERSION 1
 
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(c, fmt, ...)
+#else
 #define ubifs_msg(c, fmt, ...)  \
pr_notice("UBIFS (ubi%d:%d): " fmt "\n",\
  (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #ifndef __UBOOT__
 #define ubifs_err(c, fmt, ...)  \
-- 
2.16.2

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v3 0/3] Convert CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG to Kconfig

[Petr Vorel]

Hello Heiko,

thanks for your review. I fixed issues:
https://travis-ci.org/pevik/u-boot/builds/357634133
Sorry, next time I'll test it in travis before posting to ML.

Changes v2->v3:
* Fix build error for sun5i, see
https://travis-ci.org/pevik/u-boot/builds/357634133
* Drop wrong dependency on CMD_UBIFS for both CONFIG_UBI_SILENCE_MSG and 
CONFIG_UBIFS_SILENCE_MSG
* Add missing CONFIG_UBI_SILENCE_MSG=y to defconfigs. Some of them might
not need them (as they don't have CONFIG_ENV_IS_IN_UBI), but this way it
stays the same it was before.

Kind regards,
Petr

Petr Vorel (3):
  ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG
  Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig
  Convert CONFIG_UBI_SILENCE_MSG to Kconfig

 README| 12 
 configs/am335x_igep003x_defconfig |  2 ++
 configs/igep0032_defconfig|  2 ++
 configs/igep00x0_defconfig|  2 ++
 drivers/mtd/ubi/Kconfig   |  7 +++
 env/Kconfig   |  6 --
 fs/ubifs/Kconfig  |  6 ++
 fs/ubifs/super.c  |  7 ++-
 fs/ubifs/ubifs.h  |  4 
 include/configs/am335x_igep003x.h |  4 
 include/configs/omap3_igep00x0.h  |  2 --
 scripts/config_whitelist.txt  |  2 --
 12 files changed, 29 insertions(+), 27 deletions(-)

-- 
2.16.2

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [U-Boot, 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

[Petr Vorel]

Hello Heiko,

> Hello Petr,

> Am 18.03.2018 um 19:30 schrieb Petr Vorel:
> > Hi,

> > > Use of CONFIG_UBIFS_SILENCE_MSG was added in
> > > 147162dac6 ("ubi: ubifs: Turn off verbose prints")

> > > Then it was removed in
> > > ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

> > > Cc: Joe Hershberger <joe.hershber...@ni.com>
> > > Cc: Heiko Schocher <h...@denx.de>
> > > Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
> > > ---
> > > Note, not sure whether we need to keep this workaround.  If not, it
> > > might be better to get rid of both CONFIG_UBI_SILENCE_MSG and
> > > CONFIG_UBIFS_SILENCE_MSG.

> > > Petr
> > > ---
> > >   fs/ubifs/ubifs.h | 4 
> > >   1 file changed, 4 insertions(+)

> > > diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> > > index 1d89465205..b4ce706a8e 100644
> > > --- a/fs/ubifs/ubifs.h
> > > +++ b/fs/ubifs/ubifs.h
> > > @@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
> > >   #define UBIFS_VERSION 1

> > >   /* Normal UBIFS messages */
> > > +#ifdef CONFIG_UBIFS_SILENCE_MSG
> > > +#define ubifs_msg(c, fmt, ...)
> > > +#else
> > >   #define ubifs_msg(c, fmt, ...)  \
> > >  pr_notice("UBIFS (ubi%d:%d): " fmt "\n",\
> > >(c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
> > > +#endif
> > >   /* UBIFS error messages */
> > >   #ifndef __UBOOT__
> > >   #define ubifs_err(c, fmt, ...)

> > ping, please.

> Sorry was to busy the last weeks ...
No problem, understood. Thanks for having a look at the patches.

> Hmm.. just see, that your patch

> http://patchwork.ozlabs.org/patch/871707/

> does not apply to current mainline:

> 2018-03-13 03:12:10,755:CON:tbotlib   # tb_ctrl: Applying: Convert
> CONFIG_UBIFS_SILENCE_MSG to Kconfig
> Using index info to reconstruct a base tree...
> M README
> M configs/am335x_igep003x_defconfig
> M scripts/config_whitelist.txt
> Falling back to patching base and 3-way merge...
> Auto-merging scripts/config_whitelist.txt
> Auto-merging configs/am335x_igep003x_defconfig
> CONFLICT (content): Merge conflict in configs/am335x_igep003x_defconfig
> Auto-merging README
> error: Failed to merge in the changes.
> Patch failed at 0001 Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> hs@pollux [ 4:12:10] ttbott>

> Can you please send a rebased v2  ?
Done. I dared even to update patchwork (superseded v1 patch-set and delegate 
you to v2
patch-set).

> Beside of this I am fine with your patchset.

> May it would be nice to see a Tested-by...
Sorry that I didn't test it on real device / qemu. I just test the compilation, 
which
might not be enough.

+ I fixed wrong ML address, so this gets published.

> bye,
> Heiko


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v2 2/3] Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Heiko Schocher <h...@denx.de>
---
 README| 6 --
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig| 1 +
 env/Kconfig   | 1 -
 fs/ubifs/Kconfig  | 7 +++
 include/configs/am335x_igep003x.h | 1 -
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 5fd6428c5c..af7fbb6561 100644
--- a/README
+++ b/README
@@ -2549,12 +2549,6 @@ FIT uImage format:
Enable UBI fastmap debug
default: 0
 
-- UBIFS support
-   CONFIG_UBIFS_SILENCE_MSG
-
-   Make the verbose messages from UBIFS stop printing.  This leaves
-   warnings and errors enabled.
-
 - SPL framework
CONFIG_SPL
Enable building of SPL globally.
diff --git a/configs/am335x_igep003x_defconfig 
b/configs/am335x_igep003x_defconfig
index d2026da7b3..324f6e5289 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -38,6 +38,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 0a3dff7796..0199250812 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
diff --git a/env/Kconfig b/env/Kconfig
index a3c6298273..36d6e799fc 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
  It is assumed that both volumes are in the same MTD partition.
 
  - CONFIG_UBI_SILENCE_MSG
- - CONFIG_UBIFS_SILENCE_MSG
 
  You will probably want to define these to avoid a really noisy system
  when storing the env in UBI.
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index e69de29bb2..1a8f084e36 100644
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -0,0 +1,7 @@
+config UBIFS_SILENCE_MSG
+   bool "UBIFS silence verbose messages"
+   depends on CMD_UBIFS
+   default ENV_IS_IN_UBI
+   help
+ Make the verbose messages from UBIFS stop printing. This leaves
+ warnings and errors enabled.
diff --git a/include/configs/am335x_igep003x.h 
b/include/configs/am335x_igep003x.h
index 50fd46a589..e00c73dab3 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -24,7 +24,6 @@
 
 /* Make the verbose messages from UBI stop printing */
 #define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 76d8e13d52..ab54a25d1a 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -137,7 +137,6 @@
 #define CONFIG_ENV_UBI_VOLUME  "config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
 #define CONFIG_UBI_SILENCE_MSG 1
-#define CONFIG_UBIFS_SILENCE_MSG   1
 #define CONFIG_ENV_SIZE(32*1024)
 
 #endif /* __IGEP00X0_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b0958d7a80..84c1e4a822 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4629,7 +4629,6 @@ CONFIG_T_SH7706LSR
 CONFIG_UART_BR_PRELIM
 CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
-CONFIG_UBIFS_SILENCE_MSG
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBI_SILENCE_MSG
-- 
2.16.2

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v2 3/3] Convert CONFIG_UBI_SILENCE_MSG to Kconfig

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
---
 README| 6 --
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig| 1 +
 drivers/mtd/ubi/Kconfig   | 8 
 env/Kconfig   | 5 -
 include/configs/am335x_igep003x.h | 3 ---
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 8 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/README b/README
index af7fbb6561..ed79298fd4 100644
--- a/README
+++ b/README
@@ -2482,12 +2482,6 @@ FIT uImage format:
kernel. Needed for UBI support.
 
 - UBI support
-   CONFIG_UBI_SILENCE_MSG
-
-   Make the verbose messages from UBI stop printing.  This leaves
-   warnings and errors enabled.
-
-
CONFIG_MTD_UBI_WL_THRESHOLD
This parameter defines the maximum difference between the 
highest
erase counter value and the lowest erase counter value of 
eraseblocks
diff --git a/configs/am335x_igep003x_defconfig 
b/configs/am335x_igep003x_defconfig
index 324f6e5289..b185d0df5a 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_ENV_IS_IN_UBI=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 0199250812..b44a56eec0 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index caa5197df5..d5c656730b 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,5 +1,13 @@
 menu "UBI support"
 
+config CONFIG_UBI_SILENCE_MSG
+   bool "UBI silence verbose messages"
+   depends on CMD_UBI
+   default ENV_IS_IN_UBI
+   help
+ Make the verbose messages from UBI stop printing. This leaves
+ warnings and errors enabled.
+
 config MTD_UBI
bool "Enable UBI - Unsorted block images"
select CRC32
diff --git a/env/Kconfig b/env/Kconfig
index 36d6e799fc..35548721bd 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -360,11 +360,6 @@ config ENV_IS_IN_UBI
  the environment in.  This will enable redundant environments in UBI.
  It is assumed that both volumes are in the same MTD partition.
 
- - CONFIG_UBI_SILENCE_MSG
-
- You will probably want to define these to avoid a really noisy system
- when storing the env in UBI.
-
 config ENV_FAT_INTERFACE
string "Name of the block device for the environment"
depends on ENV_IS_IN_FAT
diff --git a/include/configs/am335x_igep003x.h 
b/include/configs/am335x_igep003x.h
index e00c73dab3..fe3f838598 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -22,9 +22,6 @@
 
 #define CONFIG_ENV_SIZE(96 << 10)  /*  96 KiB */
 
-/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index ab54a25d1a..e2a7f63e4f 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_UBI_PART"UBI"
 #define CONFIG_ENV_UBI_VOLUME  "config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
-#define CONFIG_UBI_SILENCE_MSG 1
 #define CONFIG_ENV_SIZE(32*1024)
 
 #endif /* __IGEP00X0_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 84c1e4a822..b8c1b62ab0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4631,7 +4631,6 @@ CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
-CONFIG_UBI_SILENCE_MSG
 CONFIG_UBI_SIZE
 CONFIG_UBOOT1_ENV_ADDR
 CONFIG_UBOOT2_ENV_ADDR
-- 
2.16.2

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v2 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

[Petr Vorel]

Use of CONFIG_UBIFS_SILENCE_MSG was added in
147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Heiko Schocher <h...@denx.de>
Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
---
Changes v1->v2:
Rebased to current master as requested by Heiko Schocher.
---
 fs/ubifs/ubifs.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 1d89465205..b4ce706a8e 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
 #define UBIFS_VERSION 1
 
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(c, fmt, ...)
+#else
 #define ubifs_msg(c, fmt, ...)  \
pr_notice("UBIFS (ubi%d:%d): " fmt "\n",\
  (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #ifndef __UBOOT__
 #define ubifs_err(c, fmt, ...)  \
-- 
2.16.2

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [U-Boot, 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

[Petr Vorel]

Hi,

> Use of CONFIG_UBIFS_SILENCE_MSG was added in
> 147162dac6 ("ubi: ubifs: Turn off verbose prints")
>
> Then it was removed in
> ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")
>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Heiko Schocher <h...@denx.de>
> Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
> ---
> Note, not sure whether we need to keep this workaround.  If not, it
> might be better to get rid of both CONFIG_UBI_SILENCE_MSG and
> CONFIG_UBIFS_SILENCE_MSG.
>
> Petr
> ---
>  fs/ubifs/ubifs.h | 4 
>  1 file changed, 4 insertions(+)
>
> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> index 1d89465205..b4ce706a8e 100644
> --- a/fs/ubifs/ubifs.h
> +++ b/fs/ubifs/ubifs.h
> @@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
>  #define UBIFS_VERSION 1
>
>  /* Normal UBIFS messages */
> +#ifdef CONFIG_UBIFS_SILENCE_MSG
> +#define ubifs_msg(c, fmt, ...)
> +#else
>  #define ubifs_msg(c, fmt, ...)  \
> pr_notice("UBIFS (ubi%d:%d): " fmt "\n",\
>   (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
> +#endif
>  /* UBIFS error messages */
>  #ifndef __UBOOT__
>  #define ubifs_err(c, fmt, ...)

ping, please.


Kind regards,
Petr
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 3/3] Convert CONFIG_UBI_SILENCE_MSG to Kconfig

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
---
 README| 6 --
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig| 1 +
 drivers/mtd/ubi/Kconfig   | 8 
 env/Kconfig   | 5 -
 include/configs/am335x_igep003x.h | 3 ---
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 8 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 25614bd6dc..84ff94de45 100644
--- a/README
+++ b/README
@@ -2577,12 +2577,6 @@ FIT uImage format:
kernel. Needed for UBI support.
 
 - UBI support
-   CONFIG_UBI_SILENCE_MSG
-
-   Make the verbose messages from UBI stop printing.  This leaves
-   warnings and errors enabled.
-
-
CONFIG_MTD_UBI_WL_THRESHOLD
This parameter defines the maximum difference between the 
highest
erase counter value and the lowest erase counter value of 
eraseblocks
diff --git a/configs/am335x_igep003x_defconfig 
b/configs/am335x_igep003x_defconfig
index ac07744ffe..0affd3feef 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -45,6 +45,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_ISO_PARTITION=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 8398e064bf..a3f938a328 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index caa5197df5..d5c656730b 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,5 +1,13 @@
 menu "UBI support"
 
+config CONFIG_UBI_SILENCE_MSG
+   bool "UBI silence verbose messages"
+   depends on CMD_UBI
+   default ENV_IS_IN_UBI
+   help
+ Make the verbose messages from UBI stop printing. This leaves
+ warnings and errors enabled.
+
 config MTD_UBI
bool "Enable UBI - Unsorted block images"
select CRC32
diff --git a/env/Kconfig b/env/Kconfig
index 36d6e799fc..35548721bd 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -360,11 +360,6 @@ config ENV_IS_IN_UBI
  the environment in.  This will enable redundant environments in UBI.
  It is assumed that both volumes are in the same MTD partition.
 
- - CONFIG_UBI_SILENCE_MSG
-
- You will probably want to define these to avoid a really noisy system
- when storing the env in UBI.
-
 config ENV_FAT_INTERFACE
string "Name of the block device for the environment"
depends on ENV_IS_IN_FAT
diff --git a/include/configs/am335x_igep003x.h 
b/include/configs/am335x_igep003x.h
index 6f53f42ac8..89dc1608de 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -22,9 +22,6 @@
 
 #define CONFIG_ENV_SIZE(96 << 10)  /*  96 KiB */
 
-/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index ab54a25d1a..e2a7f63e4f 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_UBI_PART"UBI"
 #define CONFIG_ENV_UBI_VOLUME  "config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
-#define CONFIG_UBI_SILENCE_MSG 1
 #define CONFIG_ENV_SIZE(32*1024)
 
 #endif /* __IGEP00X0_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 58278d1c40..8dbf0270cc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4713,7 +4713,6 @@ CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
-CONFIG_UBI_SILENCE_MSG
 CONFIG_UBI_SIZE
 CONFIG_UBOOT1_ENV_ADDR
 CONFIG_UBOOT2_ENV_ADDR
-- 
2.16.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 2/3] Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Heiko Schocher <h...@denx.de>
---
 README| 6 --
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig| 1 +
 env/Kconfig   | 1 -
 fs/ubifs/Kconfig  | 7 +++
 include/configs/am335x_igep003x.h | 1 -
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 81b7ee1ce8..25614bd6dc 100644
--- a/README
+++ b/README
@@ -2644,12 +2644,6 @@ FIT uImage format:
Enable UBI fastmap debug
default: 0
 
-- UBIFS support
-   CONFIG_UBIFS_SILENCE_MSG
-
-   Make the verbose messages from UBIFS stop printing.  This leaves
-   warnings and errors enabled.
-
 - SPL framework
CONFIG_SPL
Enable building of SPL globally.
diff --git a/configs/am335x_igep003x_defconfig 
b/configs/am335x_igep003x_defconfig
index 04f2d33747..ac07744ffe 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -46,6 +46,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_UBI=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index b0daee1a61..8398e064bf 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
diff --git a/env/Kconfig b/env/Kconfig
index a3c6298273..36d6e799fc 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
  It is assumed that both volumes are in the same MTD partition.
 
  - CONFIG_UBI_SILENCE_MSG
- - CONFIG_UBIFS_SILENCE_MSG
 
  You will probably want to define these to avoid a really noisy system
  when storing the env in UBI.
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index e69de29bb2..1a8f084e36 100644
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -0,0 +1,7 @@
+config UBIFS_SILENCE_MSG
+   bool "UBIFS silence verbose messages"
+   depends on CMD_UBIFS
+   default ENV_IS_IN_UBI
+   help
+ Make the verbose messages from UBIFS stop printing. This leaves
+ warnings and errors enabled.
diff --git a/include/configs/am335x_igep003x.h 
b/include/configs/am335x_igep003x.h
index d5b63e630e..6f53f42ac8 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -24,7 +24,6 @@
 
 /* Make the verbose messages from UBI stop printing */
 #define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 76d8e13d52..ab54a25d1a 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -137,7 +137,6 @@
 #define CONFIG_ENV_UBI_VOLUME  "config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
 #define CONFIG_UBI_SILENCE_MSG 1
-#define CONFIG_UBIFS_SILENCE_MSG   1
 #define CONFIG_ENV_SIZE(32*1024)
 
 #endif /* __IGEP00X0_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1be3f23432..58278d1c40 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4711,7 +4711,6 @@ CONFIG_T_SH7706LSR
 CONFIG_UART_BR_PRELIM
 CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
-CONFIG_UBIFS_SILENCE_MSG
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBI_SILENCE_MSG
-- 
2.16.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

[Petr Vorel]

Use of CONFIG_UBIFS_SILENCE_MSG was added in
147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Heiko Schocher <h...@denx.de>
Signed-off-by: Petr Vorel <petr.vo...@gmail.com>
---
Note, not sure whether we need to keep this workaround.  If not, it
might be better to get rid of both CONFIG_UBI_SILENCE_MSG and
CONFIG_UBIFS_SILENCE_MSG.

Petr
---
 fs/ubifs/ubifs.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 1d89465205..b4ce706a8e 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
 #define UBIFS_VERSION 1
 
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(c, fmt, ...)
+#else
 #define ubifs_msg(c, fmt, ...)  \
pr_notice("UBIFS (ubi%d:%d): " fmt "\n",\
  (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #ifndef __UBOOT__
 #define ubifs_err(c, fmt, ...)  \
-- 
2.16.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot