Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d8003fa03733901b73d6c4667b4d80fc8eb1ddd3

Authored by Stelian Pop
Committed by Jean-Christophe PLAGNIOL-VILLARD
1 parent c91e17affa
Exists in master and in 57 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.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

AT91: Replace AT91_BASE_EMAC by the board specific values. 

AT91_BASE_EMAC is never used outside the board specific files,
so replace its usage by the board specific AT91xxx_BASE_EMAC.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Showing 5 changed files with 4 additions and 7 deletions Side-by-side Diff

board/afeb9260/afeb9260.c
Diff comments   View file @ d8003fa
... ... @@ -237,7 +237,7 @@
237 237 {
238 238 int rc = 0;
239 239 #ifdef CONFIG_MACB
240   - rc = macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x01);
  240 + rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00);
241 241 #endif
242 242 return rc;
243 243 }
board/atmel/at91cap9adk/at91cap9adk.c
Diff comments   View file @ d8003fa
... ... @@ -412,7 +412,7 @@
412 412 {
413 413 int rc = 0;
414 414 #ifdef CONFIG_MACB
415   - rc = macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x00);
  415 + rc = macb_eth_initialize(0, (void *)AT91CAP9_BASE_EMAC, 0x00);
416 416 #endif
417 417 return rc;
418 418 }
board/atmel/at91sam9260ek/at91sam9260ek.c
Diff comments   View file @ d8003fa
... ... @@ -255,7 +255,7 @@
255 255 {
256 256 int rc = 0;
257 257 #ifdef CONFIG_MACB
258   - rc = macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x00);
  258 + rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00);
259 259 #endif
260 260 return rc;
261 261 }
board/atmel/at91sam9263ek/at91sam9263ek.c
Diff comments   View file @ d8003fa
... ... @@ -344,7 +344,7 @@
344 344 {
345 345 int rc = 0;
346 346 #ifdef CONFIG_MACB
347   - rc = macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x00);
  347 + rc = macb_eth_initialize(0, (void *)AT91SAM9263_BASE_EMAC, 0x00);
348 348 #endif
349 349 return rc;
350 350 }
include/asm-arm/arch-at91/hardware.h
Diff comments   View file @ d8003fa
... ... @@ -20,7 +20,6 @@
20 20 #include <asm/arch/at91rm9200.h>
21 21 #elif defined(CONFIG_AT91SAM9260)
22 22 #include <asm/arch/at91sam9260.h>
23   -#define AT91_BASE_EMAC AT91SAM9260_BASE_EMAC
24 23 #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0
25 24 #define AT91_ID_UHP AT91SAM9260_ID_UHP
26 25 #define AT91_PMC_UHP AT91SAM926x_PMC_UHP
... ... @@ -31,7 +30,6 @@
31 30 #define AT91_PMC_UHP AT91SAM926x_PMC_UHP
32 31 #elif defined(CONFIG_AT91SAM9263)
33 32 #include <asm/arch/at91sam9263.h>
34   -#define AT91_BASE_EMAC AT91SAM9263_BASE_EMAC
35 33 #define AT91_BASE_SPI AT91SAM9263_BASE_SPI0
36 34 #define AT91_ID_UHP AT91SAM9263_ID_UHP
37 35 #define AT91_PMC_UHP AT91SAM926x_PMC_UHP
... ... @@ -41,7 +39,6 @@
41 39 #define AT91_ID_UHP AT91SAM9RL_ID_UHP
42 40 #elif defined(CONFIG_AT91CAP9)
43 41 #include <asm/arch/at91cap9.h>
44   -#define AT91_BASE_EMAC AT91CAP9_BASE_EMAC
45 42 #define AT91_BASE_SPI AT91CAP9_BASE_SPI0
46 43 #define AT91_ID_UHP AT91CAP9_ID_UHP
47 44 #define AT91_PMC_UHP AT91CAP9_PMC_UHP