All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/6] scripts: remove some configs in config_whitelist.txt
@ 2021-10-04  9:59 Patrick Delaunay
  2021-10-04  9:59 ` [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST Patrick Delaunay
                   ` (6 more replies)
  0 siblings, 7 replies; 19+ messages in thread
From: Patrick Delaunay @ 2021-10-04  9:59 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Heiko Schocher, Priyanka Jain, Rick Chen,
	Sean Anderson, Simon Glass, Stefan Roese, U-Boot STM32

Remove some config finishing by _ badly added by
scripts/build-whitelist.sh when joker is used in comments.

for example:
  doc/uImage.FIT/command_syntax_extensions.txt:
     ... #ifdef CONFIG_OF_*  |	...

  cmd/nvedit.c:# error Define one of CONFIG_ENV_IS_IN_{EEPROM| \
     FLASH|MMC|FAT|EXT4|\

Remove also configs only used in comments:
- CONFIG_BOOGER in include/linux/kconfig.h
- CONFIG_COMMANDS
- CONFIG_INIT_IGNORE_ERROR
- CONFIG_REG_*
- CONFIG_HOTPLUG : drivers/watchdog/omap_wdt.c:18

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h |  8 ++++----
 include/configs/M5235EVB.h                       |  2 +-
 include/configs/dra7xx_evm.h                     |  1 -
 scripts/config_whitelist.txt                     | 14 --------------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
index ea2f113f98..df392a2714 100644
--- a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
+++ b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
@@ -11,7 +11,7 @@
 
 #include <asm/arch/sys_proto.h>
 
-/* CONFIG_REG_0 */
+/* CFG REG_0 */
 #define CFG_REG_0_OFFSET		0xC
 #define CFG_REG_ROM_READ_SHIFT		1
 #define CFG_REG_ROM_READ_MASK		(1 << 1)
@@ -22,18 +22,18 @@
 #define CFG_REG_ROM_READ_START		(1 << 1)
 #define CFG_REG_ROM_READ_END		(0 << 1)
 
-/* CONFIG_REG_2 */
+/* CFG REG_2 */
 #define CFG_REG_2_OFFSET		0x14
 #define CFG_REG_REFCLK_PERIOD_SHIFT	0
 #define CFG_REG_REFCLK_PERIOD_MASK	(0xFFFF << 0)
 #define CFG_REG_REFCLK_PERIOD		0x2EF
 
-/* CONFIG_REG_8 */
+/* CFG REG_8 */
 #define CFG_REG_8_OFFSET		0x2C
 #define CFG_IODELAY_UNLOCK_KEY		0x0000AAAA
 #define CFG_IODELAY_LOCK_KEY		0x0000AAAB
 
-/* CONFIG_REG_3/4 */
+/* CFG REG_3/4 */
 #define CFG_REG_3_OFFSET	0x18
 #define CFG_REG_4_OFFSET	0x1C
 #define CFG_REG_DLY_CNT_SHIFT	16
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index f983281cc1..b37c915538 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -54,7 +54,7 @@
 #define CONFIG_SYS_I2C_PINMUX_CLR	~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
 #define CONFIG_SYS_I2C_PINMUX_SET	(GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
+/* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 #define CONFIG_BOOTFILE		"u-boot.bin"
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 361ee9663d..16766943ab 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -113,7 +113,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT	512
 #define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
 #define CONFIG_SYS_FLASH_SIZE		(64 * 1024 * 1024) /* 64 MB */
-/* #define CONFIG_INIT_IGNORE_ERROR */
 #define CONFIG_SYS_MAX_FLASH_BANKS	1
 #define CONFIG_SYS_FLASH_BASE		(0x08000000)
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 61ae682dcd..ca043b2f26 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -75,10 +75,8 @@ CONFIG_BOARD_IS_OPENRD_ULTIMATE
 CONFIG_BOARD_NAME
 CONFIG_BOARD_POSTCLK_INIT
 CONFIG_BOARD_SIZE_LIMIT
-CONFIG_BOOGER
 CONFIG_BOOTFILE
 CONFIG_BOOTMODE
-CONFIG_BOOTP_
 CONFIG_BOOTP_BOOTFILESIZE
 CONFIG_BOOTP_DHCP_REQUEST_DELAY
 CONFIG_BOOTP_ID_CACHE_SIZE
@@ -147,7 +145,6 @@ CONFIG_CM_T3X
 CONFIG_CM_T43
 CONFIG_CM_TCRAM
 CONFIG_COLDFIRE
-CONFIG_COMMANDS
 CONFIG_COMMON_BOOT
 CONFIG_COMPAT
 CONFIG_CONS_EXTC_PINSEL
@@ -227,7 +224,6 @@ CONFIG_DNET_AUTONEG_TIMEOUT
 CONFIG_DP_DDR_CTRL
 CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
 CONFIG_DP_DDR_NUM_CTRLS
-CONFIG_DRAM_TIMINGS_
 CONFIG_DRIVER_DM9000
 CONFIG_DSP_CLUSTER_START
 CONFIG_DWCDDR21MCTL
@@ -267,7 +263,6 @@ CONFIG_ENV_CALLBACK_LIST_STATIC
 CONFIG_ENV_FLAGS_LIST_DEFAULT
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
-CONFIG_ENV_IS_IN_
 CONFIG_ENV_MAX_ENTRIES
 CONFIG_ENV_MIN_ENTRIES
 CONFIG_ENV_OFFSET_OOB
@@ -460,7 +455,6 @@ CONFIG_HIKEY_GPIO
 CONFIG_HITACHI_SX14
 CONFIG_HOSTNAME
 CONFIG_HOST_MAX_DEVICES
-CONFIG_HOTPLUG
 CONFIG_HPS_ALTERAGRP_DBGATCLK
 CONFIG_HPS_ALTERAGRP_MAINCLK
 CONFIG_HPS_ALTERAGRP_MPUCLK
@@ -634,7 +628,6 @@ CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IMX_HDMI
 CONFIG_IMX_VIDEO_SKIP
 CONFIG_INETSPACE_V2
-CONFIG_INIT_IGNORE_ERROR
 CONFIG_INI_ALLOW_MULTILINE
 CONFIG_INI_CASE_INSENSITIVE
 CONFIG_INI_MAX_LINE
@@ -943,7 +936,6 @@ CONFIG_NUM_DSP_CPUS
 CONFIG_NUM_PAMU
 CONFIG_ODROID_REV_AIN
 CONFIG_OFF_PADCONF
-CONFIG_OF_
 CONFIG_OMAP_EHCI_PHY1_RESET_GPIO
 CONFIG_OMAP_EHCI_PHY2_RESET_GPIO
 CONFIG_OMAP_EHCI_PHY3_RESET_GPIO
@@ -1073,10 +1065,6 @@ CONFIG_RD_LVL
 CONFIG_REALMODE_DEBUG
 CONFIG_RED_LED
 CONFIG_REG
-CONFIG_REG_0
-CONFIG_REG_2
-CONFIG_REG_3
-CONFIG_REG_8
 CONFIG_REMAKE_ELF
 CONFIG_REQ
 CONFIG_RESERVED_01_BASE
@@ -1233,7 +1221,6 @@ CONFIG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
 CONFIG_SPI_IDLE_VAL
 CONFIG_SPI_N25Q256A_RESET
-CONFIG_SPL_
 CONFIG_SPL_ATMEL_SIZE
 CONFIG_SPL_BOARD_LOAD_IMAGE
 CONFIG_SPL_BOOTROM_SAVE
@@ -2339,7 +2326,6 @@ CONFIG_SYS_MMC_U_BOOT_DST
 CONFIG_SYS_MMC_U_BOOT_OFFS
 CONFIG_SYS_MMC_U_BOOT_SIZE
 CONFIG_SYS_MMC_U_BOOT_START
-CONFIG_SYS_MONITOR_
 CONFIG_SYS_MONITOR_BASE
 CONFIG_SYS_MONITOR_LEN
 CONFIG_SYS_MONITOR_SEC
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
@ 2021-10-04  9:59 ` Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  2021-10-04  9:59 ` [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION Patrick Delaunay
                   ` (5 subsequent siblings)
  6 siblings, 2 replies; 19+ messages in thread
From: Patrick Delaunay @ 2021-10-04  9:59 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Priyanka Jain, Simon Glass, Stefan Roese, U-Boot STM32

This define was left over from a previous revision, and was never used.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 include/configs/am335x_sl50.h | 7 -------
 scripts/config_whitelist.txt  | 1 -
 2 files changed, 8 deletions(-)

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index dff946801c..7fbf421149 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -62,13 +62,6 @@
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_BE
 
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
-/* Remove other SPL modes. */
-/* disable host part of MUSB in SPL */
-#undef CONFIG_MUSB_HOST
-/* disable EFI partitions and partition UUID support */
-#endif
-
 /* Network. */
 
 #endif	/* ! __CONFIG_AM335X_SL50_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ca043b2f26..b125568a26 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -857,7 +857,6 @@ CONFIG_MTD_UBI_DEBUG_PARANOID
 CONFIG_MTD_UBI_GLUEBI
 CONFIG_MTD_UBI_MODULE
 CONFIG_MULTI_CS
-CONFIG_MUSB_HOST
 CONFIG_MVGBE_PORTS
 CONFIG_MVMFP_V2
 CONFIG_MVS
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
  2021-10-04  9:59 ` [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST Patrick Delaunay
@ 2021-10-04  9:59 ` Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  2021-10-04  9:59 ` [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7 Patrick Delaunay
                   ` (4 subsequent siblings)
  6 siblings, 2 replies; 19+ messages in thread
From: Patrick Delaunay @ 2021-10-04  9:59 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Priyanka Jain, Rick Chen, Sean Anderson,
	Simon Glass, Stefan Roese, U-Boot STM32

Remove the latest reference of CONFIG_NO_RELOCATION in code

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 include/configs/thunderx_88xx.h | 1 -
 scripts/config_whitelist.txt    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 1ce0347300..600689843b 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -58,7 +58,6 @@
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS		64		/* max command args */
-#define CONFIG_NO_RELOCATION		1
 #define PLL_REF_CLK			50000000	/* 50 MHz */
 #define NS_PER_REF_CLK_TICK		(1000000000/PLL_REF_CLK)
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b125568a26..6479b49291 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -927,7 +927,6 @@ CONFIG_NON_SECURE
 CONFIG_NORBOOT
 CONFIG_NORFLASH_PS32BIT
 CONFIG_NO_ETH
-CONFIG_NO_RELOCATION
 CONFIG_NO_WAIT
 CONFIG_NS16550_MIN_FUNCTIONS
 CONFIG_NS8382X
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
  2021-10-04  9:59 ` [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST Patrick Delaunay
  2021-10-04  9:59 ` [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION Patrick Delaunay
@ 2021-10-04  9:59 ` Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  2021-10-04  9:59 ` [PATCH 5/6] Remove unused CONFIG_CONS_NONE Patrick Delaunay
                   ` (3 subsequent siblings)
  6 siblings, 2 replies; 19+ messages in thread
From: Patrick Delaunay @ 2021-10-04  9:59 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Heiko Schocher, Igor Opaniuk, Matt Merhar,
	Priyanka Jain, Rick Chen, Simon Glass, Stefan Roese,
	Wolfgang Denk, U-Boot STM32

Remove the latest reference of CONFIG_SYS_FLASH_AMD_CHECK_DQ7 in code

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 include/configs/P2041RDB.h   | 1 -
 include/configs/corenet_ds.h | 1 -
 scripts/config_whitelist.txt | 1 -
 3 files changed, 3 deletions(-)

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 1e75066eb1..d17cdaadee 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -205,7 +205,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #endif /* CONFIG_NAND_FSL_ELBC */
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_SYS_FLASH_AMD_CHECK_DQ7
 #define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
 #define CONFIG_HWCONFIG
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 79fca968dc..b79991f8c9 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -206,7 +206,6 @@
 #endif /* CONFIG_NAND_FSL_ELBC */
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_SYS_FLASH_AMD_CHECK_DQ7
 #define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}
 
 #define CONFIG_HWCONFIG
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6479b49291..fe618ff39a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1713,7 +1713,6 @@ CONFIG_SYS_FLASH1_BASE_PHYS
 CONFIG_SYS_FLASH1_BASE_PHYS_EARLY
 CONFIG_SYS_FLASHBOOT
 CONFIG_SYS_FLASH_ADDR_BASE
-CONFIG_SYS_FLASH_AMD_CHECK_DQ7
 CONFIG_SYS_FLASH_AUTOPROTECT_LIST
 CONFIG_SYS_FLASH_BANKS_LIST
 CONFIG_SYS_FLASH_BANKS_SIZES
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 5/6] Remove unused CONFIG_CONS_NONE
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
                   ` (2 preceding siblings ...)
  2021-10-04  9:59 ` [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7 Patrick Delaunay
@ 2021-10-04  9:59 ` Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  2021-10-04  9:59 ` [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt Patrick Delaunay
                   ` (2 subsequent siblings)
  6 siblings, 2 replies; 19+ messages in thread
From: Patrick Delaunay @ 2021-10-04  9:59 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Heiko Schocher, Priyanka Jain, Rick Chen,
	Sean Anderson, Simon Glass, Stefan Roese, U-Boot STM32

Remove the latest reference of CONFIG_CONS_NONE in code

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 include/configs/MPC8560ADS.h | 1 -
 scripts/config_whitelist.txt | 1 -
 2 files changed, 2 deletions(-)

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 3a9ea03292..dcd538fdf1 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -191,7 +191,6 @@
 
 /* Serial Port */
 #define CONFIG_CONS_ON_SCC	/* define if console on SCC */
-#undef  CONFIG_CONS_NONE	/* define if console on something else */
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fe618ff39a..b3ebd20c57 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -149,7 +149,6 @@ CONFIG_COMMON_BOOT
 CONFIG_COMPAT
 CONFIG_CONS_EXTC_PINSEL
 CONFIG_CONS_EXTC_RATE
-CONFIG_CONS_NONE
 CONFIG_CONS_ON_SCC
 CONFIG_CONS_SCIF0
 CONFIG_CONS_SCIF1
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
                   ` (3 preceding siblings ...)
  2021-10-04  9:59 ` [PATCH 5/6] Remove unused CONFIG_CONS_NONE Patrick Delaunay
@ 2021-10-04  9:59 ` Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
  2021-10-14 15:09 ` [PATCH 1/6] scripts: remove some configs " Simon Glass
  2021-10-15 18:02 ` Tom Rini
  6 siblings, 1 reply; 19+ messages in thread
From: Patrick Delaunay @ 2021-10-04  9:59 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Priyanka Jain, Simon Glass, Stefan Roese, U-Boot STM32

Redefine the macro CONFIG_IS_ENABLED is not allowed,
so this entry can be removed in whitelist file.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

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

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b3ebd20c57..41a0952c97 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -649,7 +649,6 @@ CONFIG_IRAM_SIZE
 CONFIG_IRAM_STACK
 CONFIG_IRAM_TOP
 CONFIG_IRDA_BASE
-CONFIG_IS_ENABLED
 CONFIG_JFFS2_DEV
 CONFIG_JFFS2_LZO
 CONFIG_JFFS2_NAND
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* Re: [PATCH 1/6] scripts: remove some configs in config_whitelist.txt
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
                   ` (4 preceding siblings ...)
  2021-10-04  9:59 ` [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt Patrick Delaunay
@ 2021-10-14 15:09 ` Simon Glass
  2021-10-15 18:02 ` Tom Rini
  6 siblings, 0 replies; 19+ messages in thread
From: Simon Glass @ 2021-10-14 15:09 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: U-Boot Mailing List, Heiko Schocher, Priyanka Jain, Rick Chen,
	Sean Anderson, Stefan Roese, U-Boot STM32

On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> Remove some config finishing by _ badly added by
> scripts/build-whitelist.sh when joker is used in comments.
>
> for example:
>   doc/uImage.FIT/command_syntax_extensions.txt:
>      ... #ifdef CONFIG_OF_*  |  ...
>
>   cmd/nvedit.c:# error Define one of CONFIG_ENV_IS_IN_{EEPROM| \
>      FLASH|MMC|FAT|EXT4|\
>
> Remove also configs only used in comments:
> - CONFIG_BOOGER in include/linux/kconfig.h
> - CONFIG_COMMANDS
> - CONFIG_INIT_IGNORE_ERROR
> - CONFIG_REG_*
> - CONFIG_HOTPLUG : drivers/watchdog/omap_wdt.c:18
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h |  8 ++++----
>  include/configs/M5235EVB.h                       |  2 +-
>  include/configs/dra7xx_evm.h                     |  1 -
>  scripts/config_whitelist.txt                     | 14 --------------
>  4 files changed, 5 insertions(+), 20 deletions(-)
>

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST
  2021-10-04  9:59 ` [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST Patrick Delaunay
@ 2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Simon Glass @ 2021-10-14 15:09 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: U-Boot Mailing List, Priyanka Jain, Stefan Roese, U-Boot STM32

On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> This define was left over from a previous revision, and was never used.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  include/configs/am335x_sl50.h | 7 -------
>  scripts/config_whitelist.txt  | 1 -

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION
  2021-10-04  9:59 ` [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION Patrick Delaunay
@ 2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Simon Glass @ 2021-10-14 15:09 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: U-Boot Mailing List, Priyanka Jain, Rick Chen, Sean Anderson,
	Stefan Roese, U-Boot STM32

On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> Remove the latest reference of CONFIG_NO_RELOCATION in code
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  include/configs/thunderx_88xx.h | 1 -
>  scripts/config_whitelist.txt    | 1 -
>  2 files changed, 2 deletions(-)

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7
  2021-10-04  9:59 ` [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7 Patrick Delaunay
@ 2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Simon Glass @ 2021-10-14 15:09 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: U-Boot Mailing List, Heiko Schocher, Igor Opaniuk, Matt Merhar,
	Priyanka Jain, Rick Chen, Stefan Roese, Wolfgang Denk,
	U-Boot STM32

On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> Remove the latest reference of CONFIG_SYS_FLASH_AMD_CHECK_DQ7 in code
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  include/configs/P2041RDB.h   | 1 -
>  include/configs/corenet_ds.h | 1 -
>  scripts/config_whitelist.txt | 1 -
>  3 files changed, 3 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 5/6] Remove unused CONFIG_CONS_NONE
  2021-10-04  9:59 ` [PATCH 5/6] Remove unused CONFIG_CONS_NONE Patrick Delaunay
@ 2021-10-14 15:09   ` Simon Glass
  2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Simon Glass @ 2021-10-14 15:09 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: U-Boot Mailing List, Heiko Schocher, Priyanka Jain, Rick Chen,
	Sean Anderson, Stefan Roese, U-Boot STM32

On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> Remove the latest reference of CONFIG_CONS_NONE in code
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  include/configs/MPC8560ADS.h | 1 -
>  scripts/config_whitelist.txt | 1 -
>  2 files changed, 2 deletions(-)

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt
  2021-10-04  9:59 ` [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt Patrick Delaunay
@ 2021-10-14 15:09   ` Simon Glass
  2021-10-22 17:13     ` Patrick DELAUNAY
  0 siblings, 1 reply; 19+ messages in thread
From: Simon Glass @ 2021-10-14 15:09 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: U-Boot Mailing List, Priyanka Jain, Stefan Roese, U-Boot STM32

Hi Patrick,

On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> Redefine the macro CONFIG_IS_ENABLED is not allowed,
> so this entry can be removed in whitelist file.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  scripts/config_whitelist.txt | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index b3ebd20c57..41a0952c97 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -649,7 +649,6 @@ CONFIG_IRAM_SIZE
>  CONFIG_IRAM_STACK
>  CONFIG_IRAM_TOP
>  CONFIG_IRDA_BASE
> -CONFIG_IS_ENABLED
>  CONFIG_JFFS2_DEV
>  CONFIG_JFFS2_LZO
>  CONFIG_JFFS2_NAND
> --
> 2.25.1
>

For this to work you need to actually remove it from the source tree
(which we can't), otherwise you get:

Error: You must add new CONFIG options using Kconfig
The following new ad-hoc CONFIG options were detected:
CONFIG_IS_ENABLED

I don't think this is worth it though, so I suggest dropping this patch.

Regards,
Simon

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 1/6] scripts: remove some configs in config_whitelist.txt
  2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
                   ` (5 preceding siblings ...)
  2021-10-14 15:09 ` [PATCH 1/6] scripts: remove some configs " Simon Glass
@ 2021-10-15 18:02 ` Tom Rini
  6 siblings, 0 replies; 19+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Heiko Schocher, Priyanka Jain, Rick Chen, Sean Anderson,
	Simon Glass, Stefan Roese, U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

On Mon, Oct 04, 2021 at 11:59:50AM +0200, Patrick Delaunay wrote:

> Remove some config finishing by _ badly added by
> scripts/build-whitelist.sh when joker is used in comments.
> 
> for example:
>   doc/uImage.FIT/command_syntax_extensions.txt:
>      ... #ifdef CONFIG_OF_*  |	...
> 
>   cmd/nvedit.c:# error Define one of CONFIG_ENV_IS_IN_{EEPROM| \
>      FLASH|MMC|FAT|EXT4|\
> 
> Remove also configs only used in comments:
> - CONFIG_BOOGER in include/linux/kconfig.h
> - CONFIG_COMMANDS
> - CONFIG_INIT_IGNORE_ERROR
> - CONFIG_REG_*
> - CONFIG_HOTPLUG : drivers/watchdog/omap_wdt.c:18
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Tested-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST
  2021-10-04  9:59 ` [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
@ 2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Priyanka Jain, Simon Glass, Stefan Roese, U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

On Mon, Oct 04, 2021 at 11:59:51AM +0200, Patrick Delaunay wrote:

> This define was left over from a previous revision, and was never used.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION
  2021-10-04  9:59 ` [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
@ 2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Priyanka Jain, Rick Chen, Sean Anderson, Simon Glass,
	Stefan Roese, U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

On Mon, Oct 04, 2021 at 11:59:52AM +0200, Patrick Delaunay wrote:

> Remove the latest reference of CONFIG_NO_RELOCATION in code
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7
  2021-10-04  9:59 ` [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7 Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
@ 2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Heiko Schocher, Igor Opaniuk, Matt Merhar, Priyanka Jain,
	Rick Chen, Simon Glass, Stefan Roese, Wolfgang Denk,
	U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On Mon, Oct 04, 2021 at 11:59:53AM +0200, Patrick Delaunay wrote:

> Remove the latest reference of CONFIG_SYS_FLASH_AMD_CHECK_DQ7 in code
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 5/6] Remove unused CONFIG_CONS_NONE
  2021-10-04  9:59 ` [PATCH 5/6] Remove unused CONFIG_CONS_NONE Patrick Delaunay
  2021-10-14 15:09   ` Simon Glass
@ 2021-10-15 18:02   ` Tom Rini
  1 sibling, 0 replies; 19+ messages in thread
From: Tom Rini @ 2021-10-15 18:02 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Heiko Schocher, Priyanka Jain, Rick Chen, Sean Anderson,
	Simon Glass, Stefan Roese, U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

On Mon, Oct 04, 2021 at 11:59:54AM +0200, Patrick Delaunay wrote:

> Remove the latest reference of CONFIG_CONS_NONE in code
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt
  2021-10-14 15:09   ` Simon Glass
@ 2021-10-22 17:13     ` Patrick DELAUNAY
  2021-10-26  3:29       ` Simon Glass
  0 siblings, 1 reply; 19+ messages in thread
From: Patrick DELAUNAY @ 2021-10-22 17:13 UTC (permalink / raw)
  To: Simon Glass
  Cc: U-Boot Mailing List, Priyanka Jain, Stefan Roese, U-Boot STM32

Hi Simon

On 10/14/21 5:09 PM, Simon Glass wrote:
> Hi Patrick,
>
> On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
> <patrick.delaunay@foss.st.com> wrote:
>> Redefine the macro CONFIG_IS_ENABLED is not allowed,
>> so this entry can be removed in whitelist file.
>>
>> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
>> ---
>>
>>   scripts/config_whitelist.txt | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
>> index b3ebd20c57..41a0952c97 100644
>> --- a/scripts/config_whitelist.txt
>> +++ b/scripts/config_whitelist.txt
>> @@ -649,7 +649,6 @@ CONFIG_IRAM_SIZE
>>   CONFIG_IRAM_STACK
>>   CONFIG_IRAM_TOP
>>   CONFIG_IRDA_BASE
>> -CONFIG_IS_ENABLED
>>   CONFIG_JFFS2_DEV
>>   CONFIG_JFFS2_LZO
>>   CONFIG_JFFS2_NAND
>> --
>> 2.25.1
>>
> For this to work you need to actually remove it from the source tree
> (which we can't), otherwise you get:
>
> Error: You must add new CONFIG options using Kconfig
> The following new ad-hoc CONFIG options were detected:
> CONFIG_IS_ENABLED
>
> I don't think this is worth it though, so I suggest dropping this patch.
>
> Regards,
> Simon


Yes ! sorry

CONFIG_IS_ENABLED is present in u-boot.cfg,

as CONFIG_VAL


even if it is strange for these macro defined in "linux/kconfig.h"

but agree to drop this tentative.


Do you think I can remove the CONFIG_IS_ENABLED and CONFIG_VAL

in u-boot.cfg when the file is generated ?


Patrick





^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt
  2021-10-22 17:13     ` Patrick DELAUNAY
@ 2021-10-26  3:29       ` Simon Glass
  0 siblings, 0 replies; 19+ messages in thread
From: Simon Glass @ 2021-10-26  3:29 UTC (permalink / raw)
  To: Patrick DELAUNAY
  Cc: U-Boot Mailing List, Priyanka Jain, Stefan Roese, U-Boot STM32

Hi Patrick,

On Fri, 22 Oct 2021 at 11:13, Patrick DELAUNAY
<patrick.delaunay@foss.st.com> wrote:
>
> Hi Simon
>
> On 10/14/21 5:09 PM, Simon Glass wrote:
> > Hi Patrick,
> >
> > On Mon, 4 Oct 2021 at 04:00, Patrick Delaunay
> > <patrick.delaunay@foss.st.com> wrote:
> >> Redefine the macro CONFIG_IS_ENABLED is not allowed,
> >> so this entry can be removed in whitelist file.
> >>
> >> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> >> ---
> >>
> >>   scripts/config_whitelist.txt | 1 -
> >>   1 file changed, 1 deletion(-)
> >>
> >> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> >> index b3ebd20c57..41a0952c97 100644
> >> --- a/scripts/config_whitelist.txt
> >> +++ b/scripts/config_whitelist.txt
> >> @@ -649,7 +649,6 @@ CONFIG_IRAM_SIZE
> >>   CONFIG_IRAM_STACK
> >>   CONFIG_IRAM_TOP
> >>   CONFIG_IRDA_BASE
> >> -CONFIG_IS_ENABLED
> >>   CONFIG_JFFS2_DEV
> >>   CONFIG_JFFS2_LZO
> >>   CONFIG_JFFS2_NAND
> >> --
> >> 2.25.1
> >>
> > For this to work you need to actually remove it from the source tree
> > (which we can't), otherwise you get:
> >
> > Error: You must add new CONFIG options using Kconfig
> > The following new ad-hoc CONFIG options were detected:
> > CONFIG_IS_ENABLED
> >
> > I don't think this is worth it though, so I suggest dropping this patch.
> >
> > Regards,
> > Simon
>
>
> Yes ! sorry
>
> CONFIG_IS_ENABLED is present in u-boot.cfg,
>
> as CONFIG_VAL
>
>
> even if it is strange for these macro defined in "linux/kconfig.h"
>
> but agree to drop this tentative.
>
>
> Do you think I can remove the CONFIG_IS_ENABLED and CONFIG_VAL
>
> in u-boot.cfg when the file is generated ?

If you like.

Regards,
Simon

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2021-10-26  3:30 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-04  9:59 [PATCH 1/6] scripts: remove some configs in config_whitelist.txt Patrick Delaunay
2021-10-04  9:59 ` [PATCH 2/6] am33x: Remove unused define CONFIG_MUSB_HOST Patrick Delaunay
2021-10-14 15:09   ` Simon Glass
2021-10-15 18:02   ` Tom Rini
2021-10-04  9:59 ` [PATCH 3/6] Remove unused CONFIG_NO_RELOCATION Patrick Delaunay
2021-10-14 15:09   ` Simon Glass
2021-10-15 18:02   ` Tom Rini
2021-10-04  9:59 ` [PATCH 4/6] Remove unused CONFIG_SYS_FLASH_AMD_CHECK_DQ7 Patrick Delaunay
2021-10-14 15:09   ` Simon Glass
2021-10-15 18:02   ` Tom Rini
2021-10-04  9:59 ` [PATCH 5/6] Remove unused CONFIG_CONS_NONE Patrick Delaunay
2021-10-14 15:09   ` Simon Glass
2021-10-15 18:02   ` Tom Rini
2021-10-04  9:59 ` [PATCH 6/6] scripts: remove CONFIG_IS_ENABLED in config_whitelist.txt Patrick Delaunay
2021-10-14 15:09   ` Simon Glass
2021-10-22 17:13     ` Patrick DELAUNAY
2021-10-26  3:29       ` Simon Glass
2021-10-14 15:09 ` [PATCH 1/6] scripts: remove some configs " Simon Glass
2021-10-15 18:02 ` Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.