Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f0eb1f61b02ebd5c86c1db4399f7d78518377910

Authored by Marek Vasut
Committed by Tom Rini
1 parent 2a333aeb8f
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: mpc8xx: Move serial registration from serial_initialize() 

Move the registration of serial_smc and serial_scc ports from
default serial_initialize() into CPU specific function called from
serial_initialize(). This slims down the serial_initialize() call
to a bare tracker of all possible serial port registration routines
in U-Boot.

The exports of both serial_scc_device and serial_smc_device can
not yet be removed as they are still used in default_serial_console()
calls.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>

Showing 2 changed files with 14 additions and 8 deletions Side-by-side Diff

arch/powerpc/cpu/mpc8xx/serial.c
Diff comments   View file @ f0eb1f6
... ... @@ -681,6 +681,17 @@
681 681 #endif
682 682 }
683 683  
  684 +void mpc8xx_serial_initialize(void)
  685 +{
  686 +#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
  687 + serial_register(&serial_smc_device);
  688 +#endif
  689 +#if defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) || \
  690 + defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
  691 + serial_register(&serial_scc_device);
  692 +#endif
  693 +}
  694 +
684 695 #ifdef CONFIG_MODEM_SUPPORT
685 696 void disable_putc(void)
686 697 {
... ... @@ -40,6 +40,8 @@
40 40 void name(void) \
41 41 __attribute__((weak, alias("serial_null")));
42 42  
  43 +serial_initfunc(mpc8xx_serial_initialize);
  44 +
43 45 void serial_register(struct serial_device *dev)
44 46 {
45 47 #ifdef CONFIG_NEEDS_MANUAL_RELOC
... ... @@ -57,14 +59,7 @@
57 59  
58 60 void serial_initialize(void)
59 61 {
60   -#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
61   - serial_register(&serial_smc_device);
62   -#endif
63   -#if defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) || \
64   - defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
65   - serial_register(&serial_scc_device);
66   -#endif
67   -
  62 + mpc8xx_serial_initialize();
68 63 #if defined(CONFIG_SYS_NS16550_SERIAL)
69 64 #if defined(CONFIG_SYS_NS16550_COM1)
70 65 serial_register(&eserial1_device);