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

config: Drop CONFIG_CONSOLE_DEV

Browse Source 
This is not really a config. Rename it to avoid confusion.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
master
Simon Glass 8 years ago committed by Tom Rini
parent 83302fb8f7
commit 12ca05a38b
21 changed files with 26 additions and 27 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. 4
      include/configs/advantech_dms-ba16.h
  2. 2
      include/configs/aristainetos-common.h
  3. 2
      include/configs/aristainetos.h
  4. 2
      include/configs/aristainetos2.h
  5. 2
      include/configs/aristainetos2b.h
  6. 4
      include/configs/cgtqmx6eval.h
  7. 2
      include/configs/el6x_common.h
  8. 2
      include/configs/embestmx6boards.h
  9. 4
      include/configs/ge_bx50v3.h
  10. 4
      include/configs/mx6cuboxi.h
  11. 2
      include/configs/mx6qsabreauto.h
  12. 2
      include/configs/mx6sabre_common.h
  13. 2
      include/configs/mx6sabresd.h
  14. 6
      include/configs/o2dnt-common.h
  15. 2
      include/configs/pcm058.h
  16. 2
      include/configs/tqma6.h
  17. 2
      include/configs/tqma6_mba6.h
  18. 2
      include/configs/tqma6_wru4.h
  19. 2
      include/configs/zc5202.h
  20. 2
      include/configs/zc5601.h
  21. 1
      scripts/config_whitelist.txt

4
include/configs/advantech_dms-ba16.h
Unescape View File

@ -16,7 +16,7 @@
#define CONFIG_DEFAULT_FDT_FILE "imx6q-dms-ba16.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6q-dms-ba16.dtb"
#define CONFIG_MXC_UART_BASE UART4_BASE #define CONFIG_MXC_UART_BASE UART4_BASE
#define CONFIG_CONSOLE_DEV "ttymxc3" #define CONSOLE_DEV "ttymxc3"
#define CONFIG_EXTRA_BOOTARGS "panic=10" #define CONFIG_EXTRA_BOOTARGS "panic=10"
#define CONFIG_BOOT_DIR "" #define CONFIG_BOOT_DIR ""
@ -114,7 +114,7 @@
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"boot_fdt=yes\0" \ "boot_fdt=yes\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"sddev=0\0" \ "sddev=0\0" \

2
include/configs/aristainetos-common.h
Unescape View File

@ -57,7 +57,7 @@
"rescue_sys_length=f10000\0" \ "rescue_sys_length=f10000\0" \
"panel=lb07wv8\0" \ "panel=lb07wv8\0" \
"splashpos=m,m\0" \ "splashpos=m,m\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \

2
include/configs/aristainetos.h
Unescape View File

@ -18,7 +18,7 @@
#define CONFIG_BOARDNAME "aristainetos" #define CONFIG_BOARDNAME "aristainetos"
#define CONFIG_MXC_UART_BASE UART5_BASE #define CONFIG_MXC_UART_BASE UART5_BASE
#define CONFIG_CONSOLE_DEV "ttymxc4" #define CONSOLE_DEV "ttymxc4"
#define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_XCV_TYPE RMII

2
include/configs/aristainetos2.h
Unescape View File

@ -19,7 +19,7 @@
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_PHY_MICREL_KSZ9031

2
include/configs/aristainetos2b.h
Unescape View File

@ -19,7 +19,7 @@
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_PHY_MICREL_KSZ9031

4
include/configs/cgtqmx6eval.h
Unescape View File

@ -127,7 +127,7 @@
/* Command definition */ /* Command definition */
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define CONFIG_MMCROOT "/dev/mmcblk0p2" #define CONFIG_MMCROOT "/dev/mmcblk0p2"
#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV 0
@ -139,7 +139,7 @@
"fdt_addr_r=0x18000000\0" \ "fdt_addr_r=0x18000000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"dfuspi=dfu 0 sf 0:0:10000000:0\0" \ "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
"dfu_alt_info_spl=spl raw 0x400\0" \ "dfu_alt_info_spl=spl raw 0x400\0" \
"dfu_alt_info_img=u-boot raw 0x10000\0" \ "dfu_alt_info_img=u-boot raw 0x10000\0" \

2
include/configs/el6x_common.h
Unescape View File

@ -73,7 +73,7 @@
"board="__stringify(CONFIG_BOARD_NAME)"\0" \ "board="__stringify(CONFIG_BOARD_NAME)"\0" \
"cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \ "cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \
"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \ "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"fdtfile=undefined\0" \ "fdtfile=undefined\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_addr_r=0x18000000\0" \ "fdt_addr_r=0x18000000\0" \

2
include/configs/embestmx6boards.h
Unescape View File

@ -14,7 +14,7 @@
#define __RIOTBOARD_CONFIG_H #define __RIOTBOARD_CONFIG_H
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define CONFIG_MMCROOT "/dev/mmcblk1p2" #define CONFIG_MMCROOT "/dev/mmcblk1p2"
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)

4
include/configs/ge_bx50v3.h
Unescape View File

@ -34,7 +34,7 @@
#endif #endif
#define CONFIG_MXC_UART_BASE UART3_BASE #define CONFIG_MXC_UART_BASE UART3_BASE
#define CONFIG_CONSOLE_DEV "ttymxc2" #define CONSOLE_DEV "ttymxc2"
#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_BOOT
@ -140,7 +140,7 @@
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"boot_fdt=yes\0" \ "boot_fdt=yes\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"sddev=0\0" \ "sddev=0\0" \

4
include/configs/mx6cuboxi.h
Unescape View File

@ -71,7 +71,7 @@
/* Command definition */ /* Command definition */
#define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_CONSOLE_DEV "ttymxc0" #define CONSOLE_DEV "ttymxc0"
#define CONFIG_SYS_FSL_USDHC_NUM 1 #define CONFIG_SYS_FSL_USDHC_NUM 1
#define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
@ -89,7 +89,7 @@
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"bootm_size=0x10000000\0" \ "bootm_size=0x10000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"update_sd_firmware=" \ "update_sd_firmware=" \

2
include/configs/mx6qsabreauto.h
Unescape View File

@ -11,7 +11,7 @@
#define CONFIG_MACH_TYPE 3529 #define CONFIG_MACH_TYPE 3529
#define CONFIG_MXC_UART_BASE UART4_BASE #define CONFIG_MXC_UART_BASE UART4_BASE
#define CONFIG_CONSOLE_DEV "ttymxc3" #define CONSOLE_DEV "ttymxc3"
#define CONFIG_MMCROOT "/dev/mmcblk0p2" #define CONFIG_MMCROOT "/dev/mmcblk0p2"
/* USB Configs */ /* USB Configs */

2
include/configs/mx6sabre_common.h
Unescape View File

@ -74,7 +74,7 @@
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"dfuspi=dfu 0 sf 0:0:10000000:0\0" \ "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
"dfu_alt_info_spl=spl raw 0x400\0" \ "dfu_alt_info_spl=spl raw 0x400\0" \
"dfu_alt_info_img=u-boot raw 0x10000\0" \ "dfu_alt_info_img=u-boot raw 0x10000\0" \

2
include/configs/mx6sabresd.h
Unescape View File

@ -15,7 +15,7 @@
#define CONFIG_MACH_TYPE 3980 #define CONFIG_MACH_TYPE 3980
#define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_CONSOLE_DEV "ttymxc0" #define CONSOLE_DEV "ttymxc0"
#define CONFIG_MMCROOT "/dev/mmcblk1p2" #define CONFIG_MMCROOT "/dev/mmcblk1p2"
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */

6
include/configs/o2dnt-common.h
Unescape View File

@ -94,8 +94,8 @@
#undef CONFIG_BOOTARGS #undef CONFIG_BOOTARGS
#if !defined(CONFIG_CONSOLE_DEV) #if !defined(CONSOLE_DEV)
#define CONFIG_CONSOLE_DEV "ttyPSC1" #define CONSOLE_DEV "ttyPSC1"
#endif #endif
/* /*
@ -130,7 +130,7 @@
"addmem=setenv bootargs ${bootargs} ${memlimit}\0" \ "addmem=setenv bootargs ${bootargs} ${memlimit}\0" \
"addmisc=sete bootargs ${bootargs} ${miscargs}\0" \ "addmisc=sete bootargs ${bootargs} ${miscargs}\0" \
"addtty=sete bootargs ${bootargs} console=" \ "addtty=sete bootargs ${bootargs} console=" \
CONFIG_CONSOLE_DEV ",${baudrate}\0" \ CONSOLE_DEV ",${baudrate}\0" \
"bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0" \ "bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0" \
"kernel_addr_r=600000\0" \ "kernel_addr_r=600000\0" \
"initrd_high=0x03e00000\0" \ "initrd_high=0x03e00000\0" \

2
include/configs/pcm058.h
Unescape View File

@ -24,7 +24,7 @@
/* Serial */ /* Serial */
#define CONFIG_MXC_UART #define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)

2
include/configs/tqma6.h
Unescape View File

@ -295,7 +295,7 @@
"uboot=u-boot.imx\0" \ "uboot=u-boot.imx\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \ "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \ "console=" CONSOLE_DEV "\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \

2
include/configs/tqma6_mba6.h
Unescape View File

@ -25,6 +25,6 @@
#define CONFIG_PHY_KSZ9031 #define CONFIG_PHY_KSZ9031
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#endif /* __CONFIG_TQMA6_MBA6_H */ #endif /* __CONFIG_TQMA6_MBA6_H */

2
include/configs/tqma6_wru4.h
Unescape View File

@ -21,7 +21,7 @@
/* UART */ /* UART */
#define CONFIG_MXC_UART_BASE UART4_BASE #define CONFIG_MXC_UART_BASE UART4_BASE
#define CONFIG_CONSOLE_DEV "ttymxc3" #define CONSOLE_DEV "ttymxc3"
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R

2
include/configs/zc5202.h
Unescape View File

@ -10,7 +10,7 @@
#define __EL_ZC5202_H #define __EL_ZC5202_H
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define CONFIG_MMCROOT "/dev/mmcblk0p2" #define CONFIG_MMCROOT "/dev/mmcblk0p2"
#define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5202.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5202.dtb"

2
include/configs/zc5601.h
Unescape View File

@ -11,7 +11,7 @@
#define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONSOLE_DEV "ttymxc1"
#define CONFIG_MMCROOT "/dev/mmcblk0p1" #define CONFIG_MMCROOT "/dev/mmcblk0p1"
#define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5601.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5601.dtb"

1
scripts/config_whitelist.txt
Unescape View File

@ -673,7 +673,6 @@ CONFIG_COMMON_ENV_SETTINGS
CONFIG_COMMON_ENV_UBI CONFIG_COMMON_ENV_UBI
CONFIG_COMPACT_FLASH CONFIG_COMPACT_FLASH
CONFIG_COMPAT CONFIG_COMPAT
CONFIG_CONSOLE_DEV
CONFIG_CONSOLE_EXTRA_INFO CONFIG_CONSOLE_EXTRA_INFO
CONFIG_CONSOLE_INFO_QUIET CONFIG_CONSOLE_INFO_QUIET
CONFIG_CONSOLE_SCROLL_LINES CONFIG_CONSOLE_SCROLL_LINES

Write Preview
Loading…
Cancel
Save