Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig

Browse Source 
This converts the following to Kconfig:
   CONFIG_SYS_CONSOLE_ENV_OVERWRITE

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
master
Simon Glass 8 years ago committed by Tom Rini
parent b87ca80b9b
commit 3505bc5561
29 changed files with 18 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      README
  2. 9
      common/Kconfig
  3. 1
      configs/socfpga_arria5_defconfig
  4. 1
      configs/socfpga_cyclone5_defconfig
  5. 1
      configs/socfpga_de0_nano_soc_defconfig
  6. 1
      configs/socfpga_is1_defconfig
  7. 1
      configs/socfpga_mcvevk_defconfig
  8. 1
      configs/socfpga_sockit_defconfig
  9. 1
      configs/socfpga_socrates_defconfig
  10. 1
      configs/socfpga_sr1500_defconfig
  11. 1
      configs/socfpga_vining_fpga_defconfig
  12. 1
      include/configs/MIP405.h
  13. 1
      include/configs/MigoR.h
  14. 1
      include/configs/PIP405.h
  15. 1
      include/configs/ap325rxa.h
  16. 1
      include/configs/ap_sh4a_4a.h
  17. 1
      include/configs/armadillo-800eva.h
  18. 1
      include/configs/ecovec.h
  19. 1
      include/configs/kzm9g.h
  20. 1
      include/configs/ms7722se.h
  21. 1
      include/configs/r0p7734.h
  22. 1
      include/configs/rcar-gen2-common.h
  23. 1
      include/configs/rcar-gen3-common.h
  24. 1
      include/configs/sh7752evb.h
  25. 1
      include/configs/sh7753evb.h
  26. 1
      include/configs/sh7757lcr.h
  27. 1
      include/configs/sh7785lcr.h
  28. 1
      include/configs/socfpga_common.h
  29. 1
      scripts/config_whitelist.txt

3
README
Unescape View File

@ -3533,9 +3533,6 @@ Configuration Settings:
- CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
Enable the call to overwrite_console().
- CONFIG_SYS_CONSOLE_ENV_OVERWRITE
Enable overwrite of previous console environment settings.
- CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END:
Begin and End addresses of the area used by the
simple memory test.

9
common/Kconfig
Unescape View File

@ -309,6 +309,15 @@ config SYS_CONSOLE_IS_IN_ENV
environment variables can be updated after boot to change the
input/output devices.
config SYS_CONSOLE_ENV_OVERWRITE
bool "Update environment variables during console init"
help
The console environment variables (stdout, stdin, stderr) can be
used to determine the correct console devices on start-up. This
option writes the console devices to these variables on console
start-up (after relocation). This causes the environment to be
updated to match the console devices actually chosen.
endmenu
config SYS_NO_FLASH

1
configs/socfpga_arria5_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_cyclone5_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_de0_nano_soc_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_is1_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_mcvevk_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_sockit_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_socrates_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_sr1500_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
configs/socfpga_vining_fpga_defconfig
Unescape View File

@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
CONFIG_FIT=y
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y

1
include/configs/MIP405.h
Unescape View File

@ -111,7 +111,6 @@
* defines if the overwrite_console should be stored in the
* environment
**************************************************************/
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/**************************************************************
* loads config

1
include/configs/MigoR.h
Unescape View File

@ -43,7 +43,6 @@
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console
information at boot */
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (MIGO_R_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

1
include/configs/PIP405.h
Unescape View File

@ -107,7 +107,6 @@
* defines if the overwrite_console should be stored in the
* environment
**************************************************************/
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/**************************************************************
* loads config

1
include/configs/ap325rxa.h
Unescape View File

@ -57,7 +57,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (AP325RXA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

1
include/configs/ap_sh4a_4a.h
Unescape View File

@ -73,7 +73,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)

1
include/configs/armadillo-800eva.h
Unescape View File

@ -60,7 +60,6 @@
#define CONFIG_SCIF_A
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (ARMADILLO_800EVA_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \

1
include/configs/ecovec.h
Unescape View File

@ -93,7 +93,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)

1
include/configs/kzm9g.h
Unescape View File

@ -56,7 +56,6 @@
#define CONFIG_CONS_SCIF4
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (KZM_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END \

1
include/configs/ms7722se.h
Unescape View File

@ -42,7 +42,6 @@
#define CONFIG_CONS_SCIF0 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

1
include/configs/r0p7734.h
Unescape View File

@ -78,7 +78,6 @@
/* Suppress display of console information at boot */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE (0x88000000)

1
include/configs/rcar-gen2-common.h
Unescape View File

@ -42,7 +42,6 @@
/* console */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256

1
include/configs/rcar-gen3-common.h
Unescape View File

@ -50,7 +50,6 @@
/* console */
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 256

1
include/configs/sh7752evb.h
Unescape View File

@ -46,7 +46,6 @@
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7752EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \

1
include/configs/sh7753evb.h
Unescape View File

@ -46,7 +46,6 @@
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7753EVB_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \

1
include/configs/sh7757lcr.h
Unescape View File

@ -46,7 +46,6 @@
#define CONFIG_CONS_SCIF2 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7757LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \

1
include/configs/sh7785lcr.h
Unescape View File

@ -62,7 +62,6 @@
#define CONFIG_SCIF_EXT_CLOCK 1
#undef CONFIG_SYS_CONSOLE_INFO_QUIET
#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (SH7785LCR_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \

1
include/configs/socfpga_common.h
Unescape View File

@ -252,7 +252,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
* U-Boot environment
*/
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#if !defined(CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE 4096
#endif

1
scripts/config_whitelist.txt
Unescape View File

@ -4597,7 +4597,6 @@ CONFIG_SYS_CMXFCR_VALUE1
CONFIG_SYS_CMXFCR_VALUE2
CONFIG_SYS_CMXFCR_VALUE3
CONFIG_SYS_CMXSCR_VALUE
CONFIG_SYS_CONSOLE_ENV_OVERWRITE
CONFIG_SYS_CONSOLE_INFO_QUIET
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
CONFIG_SYS_CORE_SRAM

Write Preview
Loading…
Cancel
Save