[U-Boot] [PATCH v2 0/2] config whitelist: tool update and sync

[U-Boot] [PATCH v2 0/2] config whitelist: tool update and sync

[Masahiro Yamada]

The current build-whitelist.sh allows to add new options
into the whitelist.  For example, it is possible that somebody
adds #ifdef CONFIG_NEW_OPTITON to his C file.
So, the build-whitelist.sh will pick it up when we run it next time.
We never want to increase the ad-hoc options.
1/2 bans such a case.

2/2 is optional.  It is very easy to reproduce it.


Changes in v2:
  - V1 fails to create scripts/config-whitelist.txt from scratch.
    Fix it.

Masahiro Yamada (2):
  build-whitelist: do not add new options to whitelist when update
  Sync config_whitelist.txt

 scripts/build-whitelist.sh   | 15 +++++++++++++--
 scripts/config_whitelist.txt |  6 ------
 2 files changed, 13 insertions(+), 8 deletions(-)

-- 
1.9.1

[U-Boot] [PATCH v2 1/2] build-whitelist: do not add new options to whitelist when update

[Masahiro Yamada]

If somebody adds references to new CONFIG options in source files,
they will be added in the whitelist when we sync it.  (For example,
if we run scripts/build-whitelist.sh against commit 201c9d884dca,
new options CONFIG_SPL_DFU_SUPPORT and CONFIG_USB_XHCI_UNIPHIER will
appear in the list.)

In order to make steady progress of Kconfig migration, we want to
only decrease options in the whitelist, but never increase.

So, when we update the whitelist, we should create a temporary list,
then take the intersection of the temporary list and the current
whitelist.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - V1 fails to create scripts/config-whitelist.txt from scratch.
    Fix it.

 scripts/build-whitelist.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
index 7cf7a66..f169eaa 100755
--- a/scripts/build-whitelist.sh
+++ b/scripts/build-whitelist.sh
@@ -45,7 +45,18 @@ cat `find . -name "Kconfig*"` |sed -n \
 
 # Use only the options that are present in the first file but not the second.
 comm -23 scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2 \
-	|sort |uniq >scripts/config_whitelist.txt
-rm scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2
+	|sort |uniq >scripts/config_whitelist.txt.tmp3
+
+# If scripts/config_whitelist.txt already exists, take the intersection of the
+# current list and the new one.  We do not want to increase whitelist options.
+if [ -r scripts/config_whitelist.txt ]; then
+	comm -12 scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt \
+		> scripts/config_whitelist.txt.tmp4
+	mv scripts/config_whitelist.txt.tmp4 scripts/config_whitelist.txt
+else
+	mv scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt
+fi
+
+rm scripts/config_whitelist.txt.tmp*
 
 unset LC_ALL LC_COLLATE
-- 
1.9.1

[U-Boot] [PATCH v2 2/2] Sync config_whitelist.txt

[Masahiro Yamada]

It is a good practice to drop a option from the whitelist when we
convert it to Kconfig, but we may sometimes forget to do that.

So, it might be a good idea to sync the whitelist from time to time.

This commit was generated by:
  scripts/build-whitelist.sh

Looks like we had a bit progress...

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

You do not need to apply this, but this is a reminder
for periodical sync, like we sync defconfigs from time to time.

Tom can directly run scripts/build-whitelist.sh in the u-boot/master
while drinking coffee.


Changes in v2:
  - Resync on the current u-boot/master

 scripts/config_whitelist.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cb4516f..d91f99a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -891,7 +891,6 @@ CONFIG_DMC_DDRTR2
 CONFIG_DNET_AUTONEG_TIMEOUT
 CONFIG_DNP5370_EXT_WD_DISABLE
 CONFIG_DOS_PARTITION
-CONFIG_DPLL_SSC_RATE_1PER
 CONFIG_DP_DDR_CTRL
 CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
 CONFIG_DP_DDR_NUM_CTRLS
@@ -1256,7 +1255,6 @@ CONFIG_FO300
 CONFIG_FOO
 CONFIG_FORCE_DDR_DATA_BUS_WIDTH_32
 CONFIG_FORMIKE
-CONFIG_FPGA
 CONFIG_FPGA_ALTERA
 CONFIG_FPGA_COUNT
 CONFIG_FPGA_CYCLON2
@@ -1265,7 +1263,6 @@ CONFIG_FPGA_SOCFPGA
 CONFIG_FPGA_SPARTAN2
 CONFIG_FPGA_SPARTAN3
 CONFIG_FPGA_STRATIX_V
-CONFIG_FPGA_XILINX
 CONFIG_FPGA_ZYNQPL
 CONFIG_FSLDMAFEC
 CONFIG_FSL_CADMUS
@@ -1656,7 +1653,6 @@ CONFIG_ICACHE
 CONFIG_ICACHE_OFF
 CONFIG_ICON
 CONFIG_ICS307_REFCLK_HZ
-CONFIG_IDENT_STRING
 CONFIG_IDE_8xx_DIRECT
 CONFIG_IDE_8xx_PCCARD
 CONFIG_IDE_INIT_POSTRESET
@@ -3991,8 +3987,6 @@ CONFIG_SCSI_SYM53C8XX
 CONFIG_SC_TIMER_CLK
 CONFIG_SDCARD
 CONFIG_SDHCI
-CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT
-CONFIG_SDHCI_CMD_MAX_TIMEOUT
 CONFIG_SDRAM_BANK0
 CONFIG_SDRAM_BANK1
 CONFIG_SDRAM_ECC
-- 
1.9.1

[U-Boot] [PATCH v2 1/2] build-whitelist: do not add new options to whitelist when update

[Simon Glass]

On 23 September 2016 at 10:00, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> If somebody adds references to new CONFIG options in source files,
> they will be added in the whitelist when we sync it.  (For example,
> if we run scripts/build-whitelist.sh against commit 201c9d884dca,
> new options CONFIG_SPL_DFU_SUPPORT and CONFIG_USB_XHCI_UNIPHIER will
> appear in the list.)
>
> In order to make steady progress of Kconfig migration, we want to
> only decrease options in the whitelist, but never increase.
>
> So, when we update the whitelist, we should create a temporary list,
> then take the intersection of the temporary list and the current
> whitelist.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v2:
>   - V1 fails to create scripts/config-whitelist.txt from scratch.
>     Fix it.
>
>  scripts/build-whitelist.sh | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH v2 2/2] Sync config_whitelist.txt

[Simon Glass]

On 23 September 2016 at 10:00, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> It is a good practice to drop a option from the whitelist when we
> convert it to Kconfig, but we may sometimes forget to do that.
>
> So, it might be a good idea to sync the whitelist from time to time.
>
> This commit was generated by:
>   scripts/build-whitelist.sh
>
> Looks like we had a bit progress...
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> You do not need to apply this, but this is a reminder
> for periodical sync, like we sync defconfigs from time to time.
>
> Tom can directly run scripts/build-whitelist.sh in the u-boot/master
> while drinking coffee.
>
>
> Changes in v2:
>   - Resync on the current u-boot/master
>
>  scripts/config_whitelist.txt | 6 ------
>  1 file changed, 6 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>