Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 12ca05a38bd47b207a6e616e80f2ab0453faf527

Authored by Simon Glass
Committed by Tom Rini
1 parent 83302fb8f7
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

config: Drop CONFIG_CONSOLE_DEV 

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>

Showing 21 changed files with 26 additions and 27 deletions Side-by-side Diff

include/configs/advantech_dms-ba16.h
Diff comments   View file @ 12ca05a
... ... @@ -16,7 +16,7 @@
16 16 #define CONFIG_DEFAULT_FDT_FILE "imx6q-dms-ba16.dtb"
17 17  
18 18 #define CONFIG_MXC_UART_BASE UART4_BASE
19   -#define CONFIG_CONSOLE_DEV "ttymxc3"
  19 +#define CONSOLE_DEV "ttymxc3"
20 20 #define CONFIG_EXTRA_BOOTARGS "panic=10"
21 21  
22 22 #define CONFIG_BOOT_DIR ""
... ... @@ -114,7 +114,7 @@
114 114 "fdt_addr=0x18000000\0" \
115 115 "boot_fdt=yes\0" \
116 116 "ip_dyn=yes\0" \
117   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  117 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
118 118 "fdt_high=0xffffffff\0" \
119 119 "initrd_high=0xffffffff\0" \
120 120 "sddev=0\0" \
include/configs/aristainetos-common.h
Diff comments   View file @ 12ca05a
... ... @@ -57,7 +57,7 @@
57 57 "rescue_sys_length=f10000\0" \
58 58 "panel=lb07wv8\0" \
59 59 "splashpos=m,m\0" \
60   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  60 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
61 61 "fdt_high=0xffffffff\0" \
62 62 "initrd_high=0xffffffff\0" \
63 63 "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
include/configs/aristainetos.h
Diff comments   View file @ 12ca05a
... ... @@ -18,7 +18,7 @@
18 18 #define CONFIG_BOARDNAME "aristainetos"
19 19  
20 20 #define CONFIG_MXC_UART_BASE UART5_BASE
21   -#define CONFIG_CONSOLE_DEV "ttymxc4"
  21 +#define CONSOLE_DEV "ttymxc4"
22 22  
23 23 #define CONFIG_FEC_XCV_TYPE RMII
24 24  
include/configs/aristainetos2.h
Diff comments   View file @ 12ca05a
... ... @@ -19,7 +19,7 @@
19 19 #define CONFIG_BOARD_LATE_INIT
20 20  
21 21 #define CONFIG_MXC_UART_BASE UART2_BASE
22   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  22 +#define CONSOLE_DEV "ttymxc1"
23 23  
24 24 #define CONFIG_FEC_XCV_TYPE RGMII
25 25 #define CONFIG_PHY_MICREL_KSZ9031
include/configs/aristainetos2b.h
Diff comments   View file @ 12ca05a
... ... @@ -19,7 +19,7 @@
19 19 #define CONFIG_BOARD_LATE_INIT
20 20  
21 21 #define CONFIG_MXC_UART_BASE UART2_BASE
22   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  22 +#define CONSOLE_DEV "ttymxc1"
23 23  
24 24 #define CONFIG_FEC_XCV_TYPE RGMII
25 25 #define CONFIG_PHY_MICREL_KSZ9031
include/configs/cgtqmx6eval.h
Diff comments   View file @ 12ca05a
... ... @@ -127,7 +127,7 @@
127 127 /* Command definition */
128 128  
129 129 #define CONFIG_MXC_UART_BASE UART2_BASE
130   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  130 +#define CONSOLE_DEV "ttymxc1"
131 131 #define CONFIG_MMCROOT "/dev/mmcblk0p2"
132 132 #define CONFIG_SYS_MMC_ENV_DEV 0
133 133  
... ... @@ -139,7 +139,7 @@
139 139 "fdt_addr_r=0x18000000\0" \
140 140 "boot_fdt=try\0" \
141 141 "ip_dyn=yes\0" \
142   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  142 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
143 143 "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
144 144 "dfu_alt_info_spl=spl raw 0x400\0" \
145 145 "dfu_alt_info_img=u-boot raw 0x10000\0" \
include/configs/el6x_common.h
Diff comments   View file @ 12ca05a
... ... @@ -73,7 +73,7 @@
73 73 "board="__stringify(CONFIG_BOARD_NAME)"\0" \
74 74 "cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \
75 75 "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \
76   - "console=" CONFIG_CONSOLE_DEV "\0" \
  76 + "console=" CONSOLE_DEV "\0" \
77 77 "fdtfile=undefined\0" \
78 78 "fdt_high=0xffffffff\0" \
79 79 "fdt_addr_r=0x18000000\0" \
include/configs/embestmx6boards.h
Diff comments   View file @ 12ca05a
... ... @@ -14,7 +14,7 @@
14 14 #define __RIOTBOARD_CONFIG_H
15 15  
16 16 #define CONFIG_MXC_UART_BASE UART2_BASE
17   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  17 +#define CONSOLE_DEV "ttymxc1"
18 18 #define CONFIG_MMCROOT "/dev/mmcblk1p2"
19 19  
20 20 #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
include/configs/ge_bx50v3.h
Diff comments   View file @ 12ca05a
... ... @@ -34,7 +34,7 @@
34 34 #endif
35 35  
36 36 #define CONFIG_MXC_UART_BASE UART3_BASE
37   -#define CONFIG_CONSOLE_DEV "ttymxc2"
  37 +#define CONSOLE_DEV "ttymxc2"
38 38  
39 39 #define CONFIG_SUPPORT_EMMC_BOOT
40 40  
... ... @@ -140,7 +140,7 @@
140 140 "fdt_addr=0x18000000\0" \
141 141 "boot_fdt=yes\0" \
142 142 "ip_dyn=yes\0" \
143   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  143 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
144 144 "fdt_high=0xffffffff\0" \
145 145 "initrd_high=0xffffffff\0" \
146 146 "sddev=0\0" \
include/configs/mx6cuboxi.h
Diff comments   View file @ 12ca05a
... ... @@ -71,7 +71,7 @@
71 71 /* Command definition */
72 72  
73 73 #define CONFIG_MXC_UART_BASE UART1_BASE
74   -#define CONFIG_CONSOLE_DEV "ttymxc0"
  74 +#define CONSOLE_DEV "ttymxc0"
75 75 #define CONFIG_SYS_FSL_USDHC_NUM 1
76 76 #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
77 77  
... ... @@ -89,7 +89,7 @@
89 89 "initrd_high=0xffffffff\0" \
90 90 "fdt_high=0xffffffff\0" \
91 91 "ip_dyn=yes\0" \
92   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  92 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
93 93 "bootm_size=0x10000000\0" \
94 94 "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
95 95 "update_sd_firmware=" \
include/configs/mx6qsabreauto.h
Diff comments   View file @ 12ca05a
... ... @@ -11,7 +11,7 @@
11 11  
12 12 #define CONFIG_MACH_TYPE 3529
13 13 #define CONFIG_MXC_UART_BASE UART4_BASE
14   -#define CONFIG_CONSOLE_DEV "ttymxc3"
  14 +#define CONSOLE_DEV "ttymxc3"
15 15 #define CONFIG_MMCROOT "/dev/mmcblk0p2"
16 16  
17 17 /* USB Configs */
include/configs/mx6sabre_common.h
Diff comments   View file @ 12ca05a
... ... @@ -74,7 +74,7 @@
74 74 "fdt_addr=0x18000000\0" \
75 75 "boot_fdt=try\0" \
76 76 "ip_dyn=yes\0" \
77   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  77 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
78 78 "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
79 79 "dfu_alt_info_spl=spl raw 0x400\0" \
80 80 "dfu_alt_info_img=u-boot raw 0x10000\0" \
include/configs/mx6sabresd.h
Diff comments   View file @ 12ca05a
... ... @@ -15,7 +15,7 @@
15 15  
16 16 #define CONFIG_MACH_TYPE 3980
17 17 #define CONFIG_MXC_UART_BASE UART1_BASE
18   -#define CONFIG_CONSOLE_DEV "ttymxc0"
  18 +#define CONSOLE_DEV "ttymxc0"
19 19 #define CONFIG_MMCROOT "/dev/mmcblk1p2"
20 20  
21 21 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
include/configs/o2dnt-common.h
Diff comments   View file @ 12ca05a
... ... @@ -94,8 +94,8 @@
94 94  
95 95 #undef CONFIG_BOOTARGS
96 96  
97   -#if !defined(CONFIG_CONSOLE_DEV)
98   -#define CONFIG_CONSOLE_DEV "ttyPSC1"
  97 +#if !defined(CONSOLE_DEV)
  98 +#define CONSOLE_DEV "ttyPSC1"
99 99 #endif
100 100  
101 101 /*
... ... @@ -130,7 +130,7 @@
130 130 "addmem=setenv bootargs ${bootargs} ${memlimit}\0" \
131 131 "addmisc=sete bootargs ${bootargs} ${miscargs}\0" \
132 132 "addtty=sete bootargs ${bootargs} console=" \
133   - CONFIG_CONSOLE_DEV ",${baudrate}SOLE_DEV ",${baudrate}\0" \" \
  133 + CONSOLE_DEV ",${baudrate}SOLE_DEV ",${baudrate}\0" \" \
134 134 "bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0" \
135 135 "kernel_addr_r=600000\0" \
136 136 "initrd_high=0x03e00000\0" \
include/configs/pcm058.h
Diff comments   View file @ 12ca05a
... ... @@ -24,7 +24,7 @@
24 24 /* Serial */
25 25 #define CONFIG_MXC_UART
26 26 #define CONFIG_MXC_UART_BASE UART2_BASE
27   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  27 +#define CONSOLE_DEV "ttymxc1"
28 28  
29 29 #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
30 30  
include/configs/tqma6.h
Diff comments   View file @ 12ca05a
... ... @@ -295,7 +295,7 @@
295 295 "uboot=u-boot.imx\0" \
296 296 "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
297 297 "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \
298   - "console=" CONFIG_CONSOLE_DEV "SOLE_DEV "\0" \" \
  298 + "console=" CONSOLE_DEV "SOLE_DEV "\0" \" \
299 299 "fdt_high=0xffffffff\0" \
300 300 "initrd_high=0xffffffff\0" \
301 301 "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
include/configs/tqma6_mba6.h
Diff comments   View file @ 12ca05a
... ... @@ -25,7 +25,7 @@
25 25 #define CONFIG_PHY_KSZ9031
26 26  
27 27 #define CONFIG_MXC_UART_BASE UART2_BASE
28   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  28 +#define CONSOLE_DEV "ttymxc1"
29 29  
30 30 #endif /* __CONFIG_TQMA6_MBA6_H */
include/configs/tqma6_wru4.h
Diff comments   View file @ 12ca05a
... ... @@ -21,7 +21,7 @@
21 21  
22 22 /* UART */
23 23 #define CONFIG_MXC_UART_BASE UART4_BASE
24   -#define CONFIG_CONSOLE_DEV "ttymxc3"
  24 +#define CONSOLE_DEV "ttymxc3"
25 25  
26 26 #define CONFIG_MISC_INIT_R
27 27  
include/configs/zc5202.h
Diff comments   View file @ 12ca05a
... ... @@ -10,7 +10,7 @@
10 10 #define __EL_ZC5202_H
11 11  
12 12 #define CONFIG_MXC_UART_BASE UART2_BASE
13   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  13 +#define CONSOLE_DEV "ttymxc1"
14 14 #define CONFIG_MMCROOT "/dev/mmcblk0p2"
15 15  
16 16 #define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5202.dtb"
include/configs/zc5601.h
Diff comments   View file @ 12ca05a
... ... @@ -11,7 +11,7 @@
11 11  
12 12  
13 13 #define CONFIG_MXC_UART_BASE UART2_BASE
14   -#define CONFIG_CONSOLE_DEV "ttymxc1"
  14 +#define CONSOLE_DEV "ttymxc1"
15 15 #define CONFIG_MMCROOT "/dev/mmcblk0p1"
16 16  
17 17 #define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5601.dtb"
scripts/config_whitelist.txt
Diff comments   View file @ 12ca05a
... ... @@ -673,7 +673,6 @@
673 673 CONFIG_COMMON_ENV_UBI
674 674 CONFIG_COMPACT_FLASH
675 675 CONFIG_COMPAT
676   -CONFIG_CONSOLE_DEV
677 676 CONFIG_CONSOLE_EXTRA_INFO
678 677 CONFIG_CONSOLE_INFO_QUIET
679 678 CONFIG_CONSOLE_SCROLL_LINES