Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit aab096401c527641235cd93b188b34ed9dc99617

Authored by Hans de Goede
1 parent f9b7a04bc8
Exists in v2017.01-smarct4x and in 34 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-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, 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

sunxi: gmac: Move sunxi_gmac_initialize proto out of netdev.h 

netdev.h should not be included in driver-model enabled builds (doing so
causes compiler warnings about struct eth_driver not being declared), but
we do use sunxi_gmac_initialize in the driver-model case, so move it out of
netdev.h .

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

Showing 2 changed files with 3 additions and 1 deletions Side-by-side Diff

arch/arm/include/asm/arch-sunxi/sys_proto.h
Diff comments   View file @ aab0964
... ... @@ -23,5 +23,8 @@
23 23 */
24 24 void return_to_fel(uint32_t lr, uint32_t sp);
25 25  
  26 +/* Board / SoC level designware gmac init */
  27 +int sunxi_gmac_initialize(bd_t *bis);
  28 +
26 29 #endif
... ... @@ -81,7 +81,6 @@
81 81 int smc91111_initialize(u8 dev_num, int base_addr);
82 82 int smc911x_initialize(u8 dev_num, int base_addr);
83 83 int sunxi_emac_initialize(bd_t *bis);
84   -int sunxi_gmac_initialize(bd_t *bis);
85 84 int tsi108_eth_initialize(bd_t *bis);
86 85 int uec_standard_init(bd_t *bis);
87 86 int uli526x_initialize(bd_t *bis);