Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6c58a030f86829fa4f0d4337cf4b794c41a1823e

Authored by Jean-Christophe PLAGNIOL-VILLARD
1 parent d6e9ee92e8
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.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-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_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, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

serial: move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE 

move also conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Showing 10 changed files with 9 additions and 13 deletions Side-by-side Diff

drivers/serial/Makefile
Diff comments   View file @ 6c58a03
... ... @@ -35,7 +35,7 @@
35 35 COBJS-y += serial_pl010.o
36 36 COBJS-y += serial_pl011.o
37 37 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
38   -COBJS-y += serial_sh.o
  38 +COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
39 39 COBJS-$(CONFIG_USB_TTY) += usbtty.o
40 40  
41 41 COBJS := $(COBJS-y)
drivers/serial/serial_sh.c
Diff comments   View file @ 6c58a03
... ... @@ -20,8 +20,6 @@
20 20 #include <common.h>
21 21 #include <asm/processor.h>
22 22  
23   -#ifdef CFG_SCIF_CONSOLE
24   -
25 23 #if defined (CONFIG_CONS_SCIF0)
26 24 #define SCIF_BASE SCIF0_BASE
27 25 #elif defined (CONFIG_CONS_SCIF1)
... ... @@ -215,6 +213,4 @@
215 213  
216 214 return ch;
217 215 }
218   -
219   -#endif /* CFG_SCIF_CONSOLE */
include/configs/MigoR.h
Diff comments   View file @ 6c58a03
... ... @@ -67,7 +67,7 @@
67 67 #define CFG_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */
68 68  
69 69 /* SCIF */
70   -#define CFG_SCIF_CONSOLE 1
  70 +#define CONFIG_SCIF_CONSOLE 1
71 71 #define CONFIG_CONS_SCIF0 1
72 72 #undef CFG_CONSOLE_INFO_QUIET /* Suppress display of console
73 73 information at boot */
include/configs/mpr2.h
Diff comments   View file @ 6c58a03
... ... @@ -86,7 +86,7 @@
86 86 #define CFG_HZ (CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
87 87  
88 88 /* UART */
89   -#define CFG_SCIF_CONSOLE 1
  89 +#define CONFIG_SCIF_CONSOLE 1
90 90 #define CONFIG_CONS_SCIF0 1
91 91  
92 92 #endif /* __MPR2_H */
include/configs/ms7720se.h
Diff comments   View file @ 6c58a03
... ... @@ -63,7 +63,7 @@
63 63 #define CFG_BAUDRATE_TABLE { 115200 }
64 64  
65 65 /* SCIF */
66   -#define CFG_SCIF_CONSOLE 1
  66 +#define CONFIG_SCIF_CONSOLE 1
67 67 #define CONFIG_CONS_SCIF0 1
68 68  
69 69 #define CFG_MEMTEST_START MS7720SE_SDRAM_BASE
include/configs/ms7722se.h
Diff comments   View file @ 6c58a03
... ... @@ -62,7 +62,7 @@
62 62 #define CFG_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */
63 63  
64 64 /* SCIF */
65   -#define CFG_SCIF_CONSOLE 1
  65 +#define CONFIG_SCIF_CONSOLE 1
66 66 #define CONFIG_CONS_SCIF0 1
67 67 #undef CFG_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */
68 68 #undef CFG_CONSOLE_OVERWRITE_ROUTINE
include/configs/ms7750se.h
Diff comments   View file @ 6c58a03
... ... @@ -42,7 +42,7 @@
42 42 #define CONFIG_CMD_FLASH
43 43 #define CONFIG_CMD_ENV
44 44  
45   -#define CFG_SCIF_CONSOLE 1
  45 +#define CONFIG_SCIF_CONSOLE 1
46 46 #define CONFIG_BAUDRATE 38400
47 47 #define CONFIG_CONS_SCIF1 1
48 48 #define BOARD_LATE_INIT 1
include/configs/r2dplus.h
Diff comments   View file @ 6c58a03
... ... @@ -26,7 +26,7 @@
26 26 #define CONFIG_DOS_PARTITION
27 27  
28 28 /* SCIF */
29   -#define CFG_SCIF_CONSOLE 1
  29 +#define CONFIG_SCIF_CONSOLE 1
30 30 #define CONFIG_BAUDRATE 115200
31 31 #define CONFIG_CONS_SCIF1 1
32 32 #define BOARD_LATE_INIT 1
include/configs/r7780mp.h
Diff comments   View file @ 6c58a03
... ... @@ -49,7 +49,7 @@
49 49 #define CONFIG_CMD_EXT2
50 50 #define CONFIG_DOS_PARTITION
51 51  
52   -#define CFG_SCIF_CONSOLE 1
  52 +#define CONFIG_SCIF_CONSOLE 1
53 53 #define CONFIG_BAUDRATE 115200
54 54 #define CONFIG_CONS_SCIF0 1
55 55  
include/configs/sh7763rdp.h
Diff comments   View file @ 6c58a03
... ... @@ -52,7 +52,7 @@
52 52 #undef CONFIG_SHOW_BOOT_PROGRESS
53 53  
54 54 /* SCIF */
55   -#define CFG_SCIF_CONSOLE 1
  55 +#define CONFIG_SCIF_CONSOLE 1
56 56 #define CONFIG_BAUDRATE 115200
57 57 #define CONFIG_CONS_SCIF2 1
58 58