Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 095728803eedfce850a2f85828f79500cb09979e

Authored by Tom Rini
2 parents e80e588bb8 e3bb3254f8
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

Merge branch 'master' of git://git.denx.de/u-boot-net

Showing 13 changed files Side-by-side Diff

... ... @@ -2975,9 +2975,6 @@
2975 2975 non page size aligned address and this could cause major
2976 2976 problems.
2977 2977  
2978   -- CONFIG_SYS_TFTP_LOADADDR:
2979   - Default load address for network file downloads
2980   -
2981 2978 - CONFIG_SYS_LOADS_BAUD_CHANGE:
2982 2979 Enable temporary baudrate change while serial download
2983 2980  
... ... @@ -1688,6 +1688,16 @@
1688 1688 E1000_WRITE_REG(hw, TXDCTL, ctrl);
1689 1689 }
1690 1690  
  1691 + /* Set the receive descriptor write back policy */
  1692 +
  1693 + if (hw->mac_type >= e1000_82571) {
  1694 + ctrl = E1000_READ_REG(hw, RXDCTL);
  1695 + ctrl =
  1696 + (ctrl & ~E1000_RXDCTL_WTHRESH) |
  1697 + E1000_RXDCTL_FULL_RX_DESC_WB;
  1698 + E1000_WRITE_REG(hw, RXDCTL, ctrl);
  1699 + }
  1700 +
1691 1701 switch (hw->mac_type) {
1692 1702 default:
1693 1703 break;
... ... @@ -1551,6 +1551,7 @@
1551 1551 #define E1000_RXDCTL_HTHRESH 0x00003F00 /* RXDCTL Host Threshold */
1552 1552 #define E1000_RXDCTL_WTHRESH 0x003F0000 /* RXDCTL Writeback Threshold */
1553 1553 #define E1000_RXDCTL_GRAN 0x01000000 /* RXDCTL Granularity */
  1554 +#define E1000_RXDCTL_FULL_RX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
1554 1555  
1555 1556 /* Transmit Descriptor Control */
1556 1557 #define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
drivers/net/phy/marvell.c
Diff comments   View file @ 0957288
... ... @@ -425,6 +425,16 @@
425 425 .shutdown = &genphy_shutdown,
426 426 };
427 427  
  428 +static struct phy_driver M88E1118R_driver = {
  429 + .name = "Marvell 88E1118R",
  430 + .uid = 0x1410e40,
  431 + .mask = 0xffffff0,
  432 + .features = PHY_GBIT_FEATURES,
  433 + .config = &m88e1118_config,
  434 + .startup = &m88e1118_startup,
  435 + .shutdown = &genphy_shutdown,
  436 +};
  437 +
428 438 static struct phy_driver M88E1121R_driver = {
429 439 .name = "Marvell 88E1121R",
430 440 .uid = 0x1410cb0,
... ... @@ -461,6 +471,7 @@
461 471 phy_register(&M88E1145_driver);
462 472 phy_register(&M88E1121R_driver);
463 473 phy_register(&M88E1118_driver);
  474 + phy_register(&M88E1118R_driver);
464 475 phy_register(&M88E1111S_driver);
465 476 phy_register(&M88E1011S_driver);
466 477  
drivers/net/sh_eth.c
Diff comments   View file @ 0957288
... ... @@ -417,7 +417,7 @@
417 417 printf(SHETHER_NAME ": 100Base/");
418 418 #if defined(SH_ETH_TYPE_GETHER)
419 419 sh_eth_write(eth, GECMR_100B, GECMR);
420   -#elif defined(CONFIG_CPU_SH7757)
  420 +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752)
421 421 sh_eth_write(eth, 1, RTRATE);
422 422 #elif defined(CONFIG_CPU_SH7724)
423 423 val = ECMR_RTM;
... ... @@ -426,7 +426,7 @@
426 426 printf(SHETHER_NAME ": 10Base/");
427 427 #if defined(SH_ETH_TYPE_GETHER)
428 428 sh_eth_write(eth, GECMR_10B, GECMR);
429   -#elif defined(CONFIG_CPU_SH7757)
  429 +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752)
430 430 sh_eth_write(eth, 0, RTRATE);
431 431 #endif
432 432 }
drivers/net/sh_eth.h
Diff comments   View file @ 0957288
... ... @@ -288,7 +288,7 @@
288 288 #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734)
289 289 #define SH_ETH_TYPE_GETHER
290 290 #define BASE_IO_ADDR 0xfee00000
291   -#elif defined(CONFIG_CPU_SH7757)
  291 +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752)
292 292 #if defined(CONFIG_SH_ETHER_USE_GETHER)
293 293 #define SH_ETH_TYPE_GETHER
294 294 #define BASE_IO_ADDR 0xfee00000
... ... @@ -346,7 +346,7 @@
346 346  
347 347 /* GECMR */
348 348 enum GECMR_BIT {
349   -#if defined(CONFIG_CPU_SH7757)
  349 +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752)
350 350 GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00,
351 351 #else
352 352 GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00,
include/configs/CRAYL1.h
Diff comments   View file @ 0957288
... ... @@ -153,7 +153,6 @@
153 153  
154 154  
155 155 #define CONFIG_SYS_LOAD_ADDR 0x100000 /* where to load what we get from TFTP */
156   -#define CONFIG_SYS_TFTP_LOADADDR CONFIG_SYS_LOAD_ADDR
157 156 #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */
158 157 #define CONFIG_SYS_DRAM_TEST 1
159 158  
include/configs/GEN860T.h
Diff comments   View file @ 0957288
... ... @@ -96,11 +96,6 @@
96 96 #define CONFIG_SYS_LOADS_BAUD_CHANGE
97 97  
98 98 /*
99   - * Set default load address for tftp network downloads
100   - */
101   -#define CONFIG_SYS_TFTP_LOADADDR 0x01000000
102   -
103   -/*
104 99 * Turn off the watchdog timer
105 100 */
106 101 #undef CONFIG_WATCHDOG
include/configs/TOP860.h
Diff comments   View file @ 0957288
... ... @@ -416,7 +416,6 @@
416 416 #define CONFIG_IPADDR 10.0.4.111
417 417  
418 418 #define CONFIG_SYS_LOAD_ADDR 0x00100000 /* default load address */
419   -#define CONFIG_SYS_TFTP_LOADADDR 0x00100000
420 419  
421 420 /*
422 421 * For booting Linux, the board info and command line data
include/configs/ep8260.h
Diff comments   View file @ 0957288
... ... @@ -371,7 +371,6 @@
371 371 #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
372 372  
373 373 #define CONFIG_SYS_LOAD_ADDR 0x00100000 /* default load address */
374   -#define CONFIG_SYS_TFTP_LOADADDR 0x00100000 /* default load address for network file downloads */
375 374  
376 375 #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */
377 376  
include/configs/utx8245.h
Diff comments   View file @ 0957288
... ... @@ -65,7 +65,6 @@
65 65 #define CONFIG_BOOTARGS "root=/dev/ram console=ttyS0,57600" /* RAMdisk */
66 66 #define CONFIG_ETHADDR 00:AA:00:14:00:05 /* UTX5 */
67 67 #define CONFIG_SERVERIP 10.8.17.105 /* Spree */
68   -#define CONFIG_SYS_TFTP_LOADADDR 10000
69 68  
70 69 #define CONFIG_EXTRA_ENV_SETTINGS \
71 70 "kernel_addr=FFA00000\0" \
... ... @@ -103,7 +103,7 @@
103 103 void link_local_start(void)
104 104 {
105 105 ip = getenv_IPaddr("llipaddr");
106   - if (ip != 0 && (ip & IN_CLASSB_NET) != LINKLOCAL_ADDR) {
  106 + if (ip != 0 && (ntohl(ip) & IN_CLASSB_NET) != LINKLOCAL_ADDR) {
107 107 puts("invalid link address");
108 108 net_set_state(NETLOOP_FAIL);
109 109 return;
... ... @@ -40,6 +40,7 @@
40 40  
41 41 static ulong TftpTimeoutMSecs = TIMEOUT;
42 42 static int TftpTimeoutCountMax = TIMEOUT_COUNT;
  43 +static ulong time_start; /* Record time we started tftp */
43 44  
44 45 /*
45 46 * These globals govern the timeout behavior when attempting a connection to a
... ... @@ -299,6 +300,12 @@
299 300 TftpNumchars++;
300 301 }
301 302 #endif
  303 + time_start = get_timer(time_start);
  304 + if (time_start > 0) {
  305 + puts("\n\t "); /* Line up with "Loading: " */
  306 + print_size(NetBootFileXferSize /
  307 + time_start * 1000, "/s");
  308 + }
302 309 puts("\ndone\n");
303 310 net_set_state(NETLOOP_SUCCESS);
304 311 }
... ... @@ -775,6 +782,7 @@
775 782 TftpState = STATE_SEND_RRQ;
776 783 }
777 784  
  785 + time_start = get_timer(0);
778 786 TftpTimeoutCountMax = TftpRRQTimeoutCountMax;
779 787  
780 788 NetSetTimeout(TftpTimeoutMSecs, TftpTimeout);