Eric Lee / smarc-uboot

14
Download as
Browse Code ยป

Commit 9baa2bce28901321d6f62399b5ebeb3fcb8e8a57

Authored by Adam Ford
Committed by Tom Rini
1 parent cc3fedb204
Exists in smarc_8mq_lf_v2020.04 and in 11 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_8m-imx_v2019.04_4.19.35_1.1.0, 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

Removed unused references to CONFIG_SERIALx 

After creating CONS_INDEX and migrating a bunch of boards to it,
there are a bunch of defined references to CONFIG_SERIALx which
are not referenced in any C code or #ifdef, so they can now be
removed

Signed-off-by: Adam Ford <aford173@gmail.com>

Showing 36 changed files with 6 additions and 43 deletions Side-by-side Diff

configs/am43xx_evm_ethboot_defconfig
Diff comments   View file @ 9baa2bc
... ... @@ -3,7 +3,7 @@
3 3 CONFIG_AM43XX=y
4 4 CONFIG_SPL=y
5 5 CONFIG_DISTRO_DEFAULTS=y
6   -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
  6 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
7 7 # CONFIG_USE_BOOTCOMMAND is not set
8 8 CONFIG_SYS_CONSOLE_INFO_QUIET=y
9 9 # CONFIG_MISC_INIT_R is not set
configs/am43xx_evm_qspiboot_defconfig
Diff comments   View file @ 9baa2bc
... ... @@ -5,7 +5,7 @@
5 5 CONFIG_AM43XX=y
6 6 CONFIG_DEFAULT_DEVICE_TREE="am437x-sk-evm"
7 7 CONFIG_DISTRO_DEFAULTS=y
8   -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
  8 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI,QSPI_BOOT"
9 9 CONFIG_QSPI_BOOT=y
10 10 # CONFIG_USE_BOOTCOMMAND is not set
11 11 CONFIG_SYS_CONSOLE_INFO_QUIET=y
configs/am43xx_evm_usbhost_boot_defconfig
Diff comments   View file @ 9baa2bc
... ... @@ -7,7 +7,7 @@
7 7 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
8 8 CONFIG_DISTRO_DEFAULTS=y
9 9 CONFIG_SPL_LOAD_FIT=y
10   -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
  10 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
11 11 # CONFIG_USE_BOOTCOMMAND is not set
12 12 CONFIG_SYS_CONSOLE_INFO_QUIET=y
13 13 # CONFIG_MISC_INIT_R is not set
configs/birdland_bav335a_defconfig
Diff comments   View file @ 9baa2bc
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_SPL_LIBDISK_SUPPORT=y
13 13 CONFIG_BAV_VERSION=1
14 14 CONFIG_DISTRO_DEFAULTS=y
15   -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
  15 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
16 16 # CONFIG_USE_BOOTCOMMAND is not set
17 17 CONFIG_SYS_CONSOLE_INFO_QUIET=y
18 18 CONFIG_VERSION_VARIABLE=y
configs/birdland_bav335b_defconfig
Diff comments   View file @ 9baa2bc
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_SPL_LIBDISK_SUPPORT=y
13 13 CONFIG_BAV_VERSION=2
14 14 CONFIG_DISTRO_DEFAULTS=y
15   -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
  15 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
16 16 # CONFIG_USE_BOOTCOMMAND is not set
17 17 CONFIG_SYS_CONSOLE_INFO_QUIET=y
18 18 CONFIG_VERSION_VARIABLE=y
configs/brxre1_defconfig
Diff comments   View file @ 9baa2bc
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_SPL_SERIAL_SUPPORT=y
10 10 CONFIG_SPL=y
11 11 CONFIG_NR_DRAM_BANKS=1
12   -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
  12 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
13 13 CONFIG_BOOTDELAY=-2
14 14 # CONFIG_CONSOLE_MUX is not set
15 15 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
include/configs/am3517_crane.h
Diff comments   View file @ 9baa2bc
... ... @@ -56,7 +56,6 @@
56 56 * select serial console configuration
57 57 */
58 58 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
59   -#define CONFIG_SERIAL3 3 /* UART3 on CRANEBOARD */
60 59  
61 60 /* allow to overwrite serial and ethaddr */
62 61 #define CONFIG_ENV_OVERWRITE
include/configs/bcmstb.h
Diff comments   View file @ 9baa2bc
... ... @@ -114,7 +114,6 @@
114 114 /*
115 115 * Serial console configuration.
116 116 */
117   -#define CONFIG_SERIAL3 3
118 117  
119 118 #define CONFIG_BAUDRATE 115200
120 119 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
include/configs/cm_t335.h
Diff comments   View file @ 9baa2bc
... ... @@ -79,7 +79,6 @@
79 79 #define CONFIG_SYS_AUTOLOAD "no"
80 80  
81 81 /* Serial console configuration */
82   -#define CONFIG_SERIAL1 1 /* UART0 */
83 82  
84 83 /* NS16550 Configuration */
85 84 #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
include/configs/cm_t35.h
Diff comments   View file @ 9baa2bc
... ... @@ -60,7 +60,6 @@
60 60 * select serial console configuration
61 61 */
62 62 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
63   -#define CONFIG_SERIAL3 3 /* UART3 */
64 63  
65 64 /* allow to overwrite serial and ethaddr */
66 65 #define CONFIG_ENV_OVERWRITE
include/configs/cm_t3517.h
Diff comments   View file @ 9baa2bc
... ... @@ -64,7 +64,6 @@
64 64 * select serial console configuration
65 65 */
66 66 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
67   -#define CONFIG_SERIAL3 3 /* UART3 */
68 67  
69 68 /* allow to overwrite serial and ethaddr */
70 69 #define CONFIG_ENV_OVERWRITE
include/configs/eco5pk.h
Diff comments   View file @ 9baa2bc
... ... @@ -16,10 +16,8 @@
16 16  
17 17 /* Our console port is port3 */
18 18 #undef CONFIG_SYS_NS16550_COM1
19   -#undef CONFIG_SERIAL1
20 19  
21 20 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
22   -#define CONFIG_SERIAL3
23 21  
24 22 #define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK
25 23  
include/configs/mcx.h
Diff comments   View file @ 9baa2bc
... ... @@ -58,7 +58,6 @@
58 58 * select serial console configuration
59 59 */
60 60 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
61   -#define CONFIG_SERIAL3 3 /* UART3 */
62 61  
63 62 /* allow to overwrite serial and ethaddr */
64 63 #define CONFIG_ENV_OVERWRITE
include/configs/nokia_rx51.h
Diff comments   View file @ 9baa2bc
... ... @@ -72,7 +72,6 @@
72 72 * select serial console configuration
73 73 */
74 74 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
75   -#define CONFIG_SERIAL3 3 /* UART3 on RX-51 */
76 75  
77 76 /* allow to overwrite serial and ethaddr */
78 77 #define CONFIG_ENV_OVERWRITE
include/configs/odroid.h
Diff comments   View file @ 9baa2bc
... ... @@ -36,7 +36,6 @@
36 36 #include <linux/sizes.h>
37 37  
38 38 /* select serial console configuration */
39   -#define CONFIG_SERIAL1
40 39  
41 40 /* Console configuration */
42 41  
include/configs/odroid_xu3.h
Diff comments   View file @ 9baa2bc
... ... @@ -15,7 +15,6 @@
15 15 #define CONFIG_SYS_SDRAM_BASE 0x40000000
16 16  
17 17 /* select serial console configuration */
18   -#define CONFIG_SERIAL2 /* use SERIAL 2 */
19 18  
20 19 #define TZPC_BASE_OFFSET 0x10000
21 20  
include/configs/omap3_cairo.h
Diff comments   View file @ 9baa2bc
... ... @@ -198,8 +198,6 @@
198 198 * function per_clocks_enable().
199 199 */
200 200 #ifdef CONFIG_SPL_BUILD
201   -#undef CONFIG_SERIAL3
202   -#define CONFIG_SERIAL2
203 201 #endif
204 202  
205 203 /* Provide the MACH_TYPE value the vendor kernel requires */
include/configs/omap3_pandora.h
Diff comments   View file @ 9baa2bc
... ... @@ -33,7 +33,6 @@
33 33 #define CONFIG_SYS_NS16550_REG_SIZE (-4)
34 34 #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
35 35 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
36   -#define CONFIG_SERIAL3 3
37 36  
38 37 /* commands to include */
39 38  
include/configs/origen.h
Diff comments   View file @ 9baa2bc
... ... @@ -29,7 +29,6 @@
29 29 #define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN
30 30  
31 31 /* select serial console configuration */
32   -#define CONFIG_SERIAL2
33 32  
34 33 /* Console configuration */
35 34 #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
include/configs/peach-pi.h
Diff comments   View file @ 9baa2bc
... ... @@ -24,7 +24,6 @@
24 24 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
25 25  
26 26 /* select serial console configuration */
27   -#define CONFIG_SERIAL3 /* use SERIAL 3 */
28 27 #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
29 28  
30 29 /* Display */
include/configs/peach-pit.h
Diff comments   View file @ 9baa2bc
... ... @@ -24,7 +24,6 @@
24 24 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
25 25  
26 26 /* select serial console configuration */
27   -#define CONFIG_SERIAL3 /* use SERIAL 3 */
28 27 #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
29 28  
30 29 /* DRAM Memory Banks */
include/configs/pengwyn.h
Diff comments   View file @ 9baa2bc
... ... @@ -10,7 +10,6 @@
10 10 #ifndef __CONFIG_PENGWYN_H
11 11 #define __CONFIG_PENGWYN_H
12 12  
13   -#define CONFIG_SERIAL1
14 13  
15 14 #include <configs/ti_am335x_common.h>
16 15  
include/configs/pepper.h
Diff comments   View file @ 9baa2bc
... ... @@ -70,7 +70,6 @@
70 70 "fi;" \
71 71  
72 72 /* Serial console configuration */
73   -#define CONFIG_SERIAL1 1
74 73 #define CONFIG_SYS_NS16550_COM1 0x44e09000
75 74  
76 75 /* Ethernet support */
include/configs/s5p_goni.h
Diff comments   View file @ 9baa2bc
... ... @@ -39,7 +39,6 @@
39 39 /*
40 40 * select serial console configuration
41 41 */
42   -#define CONFIG_SERIAL2 1 /* use SERIAL2 */
43 42  
44 43 /* MMC */
45 44 #define SDHCI_MAX_HOSTS 4
include/configs/s5pc210_universal.h
Diff comments   View file @ 9baa2bc
... ... @@ -23,7 +23,6 @@
23 23 #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
24 24  
25 25 /* select serial console configuration */
26   -#define CONFIG_SERIAL2
27 26  
28 27 /* Console configuration */
29 28  
include/configs/siemens-am33x-common.h
Diff comments   View file @ 9baa2bc
... ... @@ -82,7 +82,6 @@
82 82 #define CONFIG_SYS_NS16550_COM1 0x44e09000
83 83 #define CONFIG_SYS_NS16550_COM4 0x481a6000
84 84  
85   -#define CONFIG_SERIAL1 1
86 85  
87 86 /* I2C Configuration */
88 87 #define CONFIG_I2C
include/configs/smdk5420.h
Diff comments   View file @ 9baa2bc
... ... @@ -25,7 +25,6 @@
25 25 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
26 26  
27 27 /* select serial console configuration */
28   -#define CONFIG_SERIAL3 /* use SERIAL 3 */
29 28 #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
30 29  
31 30 #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
include/configs/smdkc100.h
Diff comments   View file @ 9baa2bc
... ... @@ -44,7 +44,6 @@
44 44 /*
45 45 * select serial console configuration
46 46 */
47   -#define CONFIG_SERIAL0 1 /* use SERIAL 0 on SMDKC100 */
48 47  
49 48 /* PWM */
50 49 #define CONFIG_PWM 1
include/configs/smdkv310.h
Diff comments   View file @ 9baa2bc
... ... @@ -28,7 +28,6 @@
28 28 #define S5P_CHECK_LPA 0xABAD0000
29 29  
30 30 /* select serial console configuration */
31   -#define CONFIG_SERIAL1 1 /* use SERIAL 1 */
32 31 #define EXYNOS4_DEFAULT_UART_OFFSET 0x010000
33 32  
34 33 /* allow to overwrite serial and ethaddr */
include/configs/tam3517-common.h
Diff comments   View file @ 9baa2bc
... ... @@ -51,7 +51,6 @@
51 51 * select serial console configuration
52 52 */
53 53 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
54   -#define CONFIG_SERIAL1 /* UART1 */
55 54  
56 55 /* allow to overwrite serial and ethaddr */
57 56 #define CONFIG_ENV_OVERWRITE
include/configs/ti816x_evm.h
Diff comments   View file @ 9baa2bc
... ... @@ -52,9 +52,6 @@
52 52 /* allow overwriting serial config and ethaddr */
53 53 #define CONFIG_ENV_OVERWRITE
54 54  
55   -#define CONFIG_SERIAL1
56   -#define CONFIG_SERIAL2
57   -#define CONFIG_SERIAL3
58 55  
59 56 /*
60 57 * GPMC NAND block. We support 1 device and the physical address to
include/configs/ti_omap3_common.h
Diff comments   View file @ 9baa2bc
... ... @@ -41,7 +41,6 @@
41 41 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
42 42 #define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2
43 43 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
44   -#define CONFIG_SERIAL3 3
45 44 #endif
46 45  
47 46 /* Physical Memory Map */
include/configs/trats.h
Diff comments   View file @ 9baa2bc
... ... @@ -32,7 +32,6 @@
32 32 #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000)
33 33  
34 34 /* select serial console configuration */
35   -#define CONFIG_SERIAL2
36 35  
37 36 #define CONFIG_MACH_TYPE MACH_TYPE_TRATS
38 37  
include/configs/trats2.h
Diff comments   View file @ 9baa2bc
... ... @@ -30,7 +30,6 @@
30 30 #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
31 31  
32 32 /* select serial console configuration */
33   -#define CONFIG_SERIAL2
34 33  
35 34 /* Console configuration */
36 35  
include/configs/tricorder.h
Diff comments   View file @ 9baa2bc
... ... @@ -47,7 +47,6 @@
47 47  
48 48 /* select serial console configuration */
49 49 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
50   -#define CONFIG_SERIAL3 3
51 50 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
52 51 115200}
53 52  
scripts/config_whitelist.txt
Diff comments   View file @ 9baa2bc
... ... @@ -1722,10 +1722,6 @@
1722 1722 CONFIG_SECURITY
1723 1723 CONFIG_SEC_DEQ_TIMEOUT
1724 1724 CONFIG_SEC_FW_SIZE
1725   -CONFIG_SERIAL0
1726   -CONFIG_SERIAL1
1727   -CONFIG_SERIAL2
1728   -CONFIG_SERIAL3
1729 1725 CONFIG_SERIAL_BOOT
1730 1726 CONFIG_SERIAL_FLASH
1731 1727 CONFIG_SERIAL_HW_FLOW_CONTROL