Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f2760c4acd5b7a198632d002528ec7c227ea27b8

Authored by Marek Vasut
Committed by Tom Rini
1 parent c1f5805a9d
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: Enhance the manual relocation 

Enhance the manual relocation of drivers operations structure by
checking if the entries are NULL and increment them only if they
are not. This allows for setting any entry to NULL and it will
survive the manual relocation.

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>

Showing 1 changed file with 14 additions and 6 deletions Side-by-side Diff

drivers/serial/serial.c
Diff comments   View file @ f2760c4
... ... @@ -97,12 +97,20 @@
97 97 void serial_register(struct serial_device *dev)
98 98 {
99 99 #ifdef CONFIG_NEEDS_MANUAL_RELOC
100   - dev->start += gd->reloc_off;
101   - dev->setbrg += gd->reloc_off;
102   - dev->getc += gd->reloc_off;
103   - dev->tstc += gd->reloc_off;
104   - dev->putc += gd->reloc_off;
105   - dev->puts += gd->reloc_off;
  100 + if (dev->start)
  101 + dev->start += gd->reloc_off;
  102 + if (dev->stop)
  103 + dev->stop += gd->reloc_off;
  104 + if (dev->setbrg)
  105 + dev->setbrg += gd->reloc_off;
  106 + if (dev->getc)
  107 + dev->getc += gd->reloc_off;
  108 + if (dev->tstc)
  109 + dev->tstc += gd->reloc_off;
  110 + if (dev->putc)
  111 + dev->putc += gd->reloc_off;
  112 + if (dev->puts)
  113 + dev->puts += gd->reloc_off;
106 114 #endif
107 115  
108 116 dev->next = serial_devices;