[U-Boot] [PATCH v3 06/29] config: Drop CONFIG_CONSOLE_DEV
Heiko Schocher
hs at denx.de
Fri Sep 30 06:46:55 CEST 2016
Hello Simon,
Am 29.09.2016 um 22:23 schrieb Simon Glass:
> This is not really a config. Rename it to avoid confusion.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> include/configs/advantech_dms-ba16.h | 4 ++--
> include/configs/aristainetos-common.h | 2 +-
> include/configs/aristainetos.h | 2 +-
> include/configs/aristainetos2.h | 2 +-
> include/configs/aristainetos2b.h | 2 +-
> include/configs/cgtqmx6eval.h | 4 ++--
> include/configs/el6x_common.h | 2 +-
> include/configs/embestmx6boards.h | 2 +-
> include/configs/ge_bx50v3.h | 4 ++--
> include/configs/mx6cuboxi.h | 4 ++--
> include/configs/mx6qsabreauto.h | 2 +-
> include/configs/mx6sabre_common.h | 2 +-
> include/configs/mx6sabresd.h | 2 +-
> include/configs/o2dnt-common.h | 6 +++---
> include/configs/pcm058.h | 2 +-
> include/configs/tqma6.h | 2 +-
> include/configs/tqma6_mba6.h | 2 +-
> include/configs/tqma6_wru4.h | 2 +-
> include/configs/zc5202.h | 2 +-
> include/configs/zc5601.h | 2 +-
> scripts/config_whitelist.txt | 1 -
> 21 files changed, 26 insertions(+), 27 deletions(-)
Reviewed-by: Heiko Schocher <hs at denx.de>
bye,
Heiko
>
> diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
> index 22410ce..4f07f23 100644
> --- a/include/configs/advantech_dms-ba16.h
> +++ b/include/configs/advantech_dms-ba16.h
> @@ -16,7 +16,7 @@
> #define CONFIG_DEFAULT_FDT_FILE "imx6q-dms-ba16.dtb"
>
> #define CONFIG_MXC_UART_BASE UART4_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc3"
> +#define CONSOLE_DEV "ttymxc3"
> #define CONFIG_EXTRA_BOOTARGS "panic=10"
>
> #define CONFIG_BOOT_DIR ""
> @@ -117,7 +117,7 @@
> "fdt_addr=0x18000000\0" \
> "boot_fdt=yes\0" \
> "ip_dyn=yes\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "fdt_high=0xffffffff\0" \
> "initrd_high=0xffffffff\0" \
> "sddev=0\0" \
> diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
> index a0e9076..3401f66 100644
> --- a/include/configs/aristainetos-common.h
> +++ b/include/configs/aristainetos-common.h
> @@ -57,7 +57,7 @@
> "rescue_sys_length=f10000\0" \
> "panel=lb07wv8\0" \
> "splashpos=m,m\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "fdt_high=0xffffffff\0" \
> "initrd_high=0xffffffff\0" \
> "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
> diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
> index be93deb..1799cc1 100644
> --- a/include/configs/aristainetos.h
> +++ b/include/configs/aristainetos.h
> @@ -18,7 +18,7 @@
> #define CONFIG_BOARDNAME "aristainetos"
>
> #define CONFIG_MXC_UART_BASE UART5_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc4"
> +#define CONSOLE_DEV "ttymxc4"
>
> #define CONFIG_FEC_XCV_TYPE RMII
>
> diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
> index 152f5e9..8fa3eb5 100644
> --- a/include/configs/aristainetos2.h
> +++ b/include/configs/aristainetos2.h
> @@ -19,7 +19,7 @@
> #define CONFIG_BOARD_LATE_INIT
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
>
> #define CONFIG_FEC_XCV_TYPE RGMII
> #define CONFIG_PHY_MICREL_KSZ9031
> diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h
> index 78791db..df9b5c9 100644
> --- a/include/configs/aristainetos2b.h
> +++ b/include/configs/aristainetos2b.h
> @@ -19,7 +19,7 @@
> #define CONFIG_BOARD_LATE_INIT
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
>
> #define CONFIG_FEC_XCV_TYPE RGMII
> #define CONFIG_PHY_MICREL_KSZ9031
> diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
> index 6c3d98b..8090200 100644
> --- a/include/configs/cgtqmx6eval.h
> +++ b/include/configs/cgtqmx6eval.h
> @@ -128,7 +128,7 @@
> /* Command definition */
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
> #define CONFIG_MMCROOT "/dev/mmcblk0p2"
> #define CONFIG_SYS_MMC_ENV_DEV 0
>
> @@ -140,7 +140,7 @@
> "fdt_addr_r=0x18000000\0" \
> "boot_fdt=try\0" \
> "ip_dyn=yes\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
> "dfu_alt_info_spl=spl raw 0x400\0" \
> "dfu_alt_info_img=u-boot raw 0x10000\0" \
> diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
> index 81b79b2..7e9bcb1 100644
> --- a/include/configs/el6x_common.h
> +++ b/include/configs/el6x_common.h
> @@ -73,7 +73,7 @@
> "board="__stringify(CONFIG_BOARD_NAME)"\0" \
> "cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \
> "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "fdtfile=undefined\0" \
> "fdt_high=0xffffffff\0" \
> "fdt_addr_r=0x18000000\0" \
> diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
> index 87f16d9..6266d95 100644
> --- a/include/configs/embestmx6boards.h
> +++ b/include/configs/embestmx6boards.h
> @@ -14,7 +14,7 @@
> #define __RIOTBOARD_CONFIG_H
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
> #define CONFIG_MMCROOT "/dev/mmcblk1p2"
>
> #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
> diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
> index 435b0ca..cf805b3 100644
> --- a/include/configs/ge_bx50v3.h
> +++ b/include/configs/ge_bx50v3.h
> @@ -30,7 +30,7 @@
> #endif
>
> #define CONFIG_MXC_UART_BASE UART3_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc2"
> +#define CONSOLE_DEV "ttymxc2"
>
> #define CONFIG_SUPPORT_EMMC_BOOT
>
> @@ -139,7 +139,7 @@
> "fdt_addr=0x18000000\0" \
> "boot_fdt=yes\0" \
> "ip_dyn=yes\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "fdt_high=0xffffffff\0" \
> "initrd_high=0xffffffff\0" \
> "sddev=0\0" \
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index d48fcc2..6e4a4f8 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -72,7 +72,7 @@
> /* Command definition */
>
> #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_MMC_ENV_DEV 0 /* SDHC2 */
>
> @@ -90,7 +90,7 @@
> "initrd_high=0xffffffff\0" \
> "fdt_high=0xffffffff\0" \
> "ip_dyn=yes\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "bootm_size=0x10000000\0" \
> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> "update_sd_firmware=" \
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
> index 9cf3c2c..f849f34 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6qsabreauto.h
> @@ -11,7 +11,7 @@
>
> #define CONFIG_MACH_TYPE 3529
> #define CONFIG_MXC_UART_BASE UART4_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc3"
> +#define CONSOLE_DEV "ttymxc3"
> #define CONFIG_MMCROOT "/dev/mmcblk0p2"
>
> /* USB Configs */
> diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
> index 3276940..32ebb51 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -74,7 +74,7 @@
> "fdt_addr=0x18000000\0" \
> "boot_fdt=try\0" \
> "ip_dyn=yes\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
> "dfu_alt_info_spl=spl raw 0x400\0" \
> "dfu_alt_info_img=u-boot raw 0x10000\0" \
> diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
> index 5c2734d..789c407 100644
> --- a/include/configs/mx6sabresd.h
> +++ b/include/configs/mx6sabresd.h
> @@ -15,7 +15,7 @@
>
> #define CONFIG_MACH_TYPE 3980
> #define CONFIG_MXC_UART_BASE UART1_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc0"
> +#define CONSOLE_DEV "ttymxc0"
> #define CONFIG_MMCROOT "/dev/mmcblk1p2"
>
> #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
> diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
> index 8913784..e9cf190 100644
> --- a/include/configs/o2dnt-common.h
> +++ b/include/configs/o2dnt-common.h
> @@ -95,8 +95,8 @@
>
> #undef CONFIG_BOOTARGS
>
> -#if !defined(CONFIG_CONSOLE_DEV)
> -#define CONFIG_CONSOLE_DEV "ttyPSC1"
> +#if !defined(CONSOLE_DEV)
> +#define CONSOLE_DEV "ttyPSC1"
> #endif
>
> /*
> @@ -131,7 +131,7 @@
> "addmem=setenv bootargs ${bootargs} ${memlimit}\0" \
> "addmisc=sete bootargs ${bootargs} ${miscargs}\0" \
> "addtty=sete bootargs ${bootargs} console=" \
> - CONFIG_CONSOLE_DEV ",${baudrate}\0" \
> + CONSOLE_DEV ",${baudrate}\0" \
> "bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0" \
> "kernel_addr_r=600000\0" \
> "initrd_high=0x03e00000\0" \
> diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
> index c36245b..2869c4e 100644
> --- a/include/configs/pcm058.h
> +++ b/include/configs/pcm058.h
> @@ -24,7 +24,7 @@
> /* Serial */
> #define CONFIG_MXC_UART
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
>
> #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
>
> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
> index 029eddd..983153f 100644
> --- a/include/configs/tqma6.h
> +++ b/include/configs/tqma6.h
> @@ -295,7 +295,7 @@
> "uboot=u-boot.imx\0" \
> "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
> "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \
> - "console=" CONFIG_CONSOLE_DEV "\0" \
> + "console=" CONSOLE_DEV "\0" \
> "fdt_high=0xffffffff\0" \
> "initrd_high=0xffffffff\0" \
> "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
> diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
> index 2f52598..3cae4fe 100644
> --- a/include/configs/tqma6_mba6.h
> +++ b/include/configs/tqma6_mba6.h
> @@ -25,6 +25,6 @@
> #define CONFIG_PHY_KSZ9031
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
>
> #endif /* __CONFIG_TQMA6_MBA6_H */
> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
> index 8896bc3..3e88391 100644
> --- a/include/configs/tqma6_wru4.h
> +++ b/include/configs/tqma6_wru4.h
> @@ -21,7 +21,7 @@
>
> /* UART */
> #define CONFIG_MXC_UART_BASE UART4_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc3"
> +#define CONSOLE_DEV "ttymxc3"
>
> #define CONFIG_MISC_INIT_R
>
> diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
> index 073a42c..8e75c40 100644
> --- a/include/configs/zc5202.h
> +++ b/include/configs/zc5202.h
> @@ -10,7 +10,7 @@
> #define __EL_ZC5202_H
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
> #define CONFIG_MMCROOT "/dev/mmcblk0p2"
>
> #define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5202.dtb"
> diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
> index 28b9c6b..6ede668 100644
> --- a/include/configs/zc5601.h
> +++ b/include/configs/zc5601.h
> @@ -11,7 +11,7 @@
>
>
> #define CONFIG_MXC_UART_BASE UART2_BASE
> -#define CONFIG_CONSOLE_DEV "ttymxc1"
> +#define CONSOLE_DEV "ttymxc1"
> #define CONFIG_MMCROOT "/dev/mmcblk0p1"
>
> #define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5601.dtb"
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index d66282a..56a8354 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -674,7 +674,6 @@ CONFIG_COMMON_ENV_SETTINGS
> CONFIG_COMMON_ENV_UBI
> CONFIG_COMPACT_FLASH
> CONFIG_COMPAT
> -CONFIG_CONSOLE_DEV
> CONFIG_CONSOLE_EXTRA_INFO
> CONFIG_CONSOLE_INFO_QUIET
> CONFIG_CONSOLE_SCROLL_LINES
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
More information about the U-Boot
mailing list