Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ea45cb0adcf4baa8f939fea4c848f3e1906f19d9

Authored by Matthias Weisser
Committed by Wolfgang Denk
1 parent 7f79c6f2f4
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

net: Make sure IPaddr_t is 32 bits in size 

When building u-boot as 64 bit application (e.g. sandbox) ulong might be
64 bits in size. This breaks network code as IPaddr_t is 64 bytes in
size then and an IPv4 address is 32 bits in size. This patch makes sure
that IPaddr_t is always 32 bits in size. Also some warnings introduced
by this patch are fixed.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>

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

... ... @@ -33,7 +33,8 @@
33 33  
34 34 #define PKTALIGN 32
35 35  
36   -typedef ulong IPaddr_t;
  36 +/* IPv4 addresses are always 32 bits in size */
  37 +typedef u32 IPaddr_t;
37 38  
38 39  
39 40 /**
... ... @@ -728,7 +728,7 @@
728 728 */
729 729 if (memcmp(ether, NetEtherNullAddr, 6) == 0) {
730 730  
731   - debug("sending ARP for %08lx\n", dest);
  731 + debug("sending ARP for %08x\n", dest);
732 732  
733 733 NetArpWaitPacketIP = dest;
734 734 NetArpWaitPacketMAC = ether;
... ... @@ -751,7 +751,7 @@
751 751 return 1; /* waiting */
752 752 }
753 753  
754   - debug("sending UDP to %08lx/%pM\n", dest, ether);
  754 + debug("sending UDP to %08x/%pM\n", dest, ether);
755 755  
756 756 pkt = (uchar *)NetTxPacket;
757 757 pkt += NetSetEther(pkt, ether, PROT_IP);
... ... @@ -775,7 +775,7 @@
775 775  
776 776 memcpy(mac, NetEtherNullAddr, 6);
777 777  
778   - debug("sending ARP for %08lx\n", NetPingIP);
  778 + debug("sending ARP for %08x\n", NetPingIP);
779 779  
780 780 NetArpWaitPacketIP = NetPingIP;
781 781 NetArpWaitPacketMAC = mac;
... ... @@ -688,7 +688,7 @@
688 688 }
689 689  
690 690 if (BootFile[0] == '\0') {
691   - sprintf (default_filename, "/nfsroot/%02lX%02lX%02lX%02lX.img",
  691 + sprintf(default_filename, "/nfsroot/%02X%02X%02X%02X.img",
692 692 NetOurIP & 0xFF,
693 693 (NetOurIP >> 8) & 0xFF,
694 694 (NetOurIP >> 16) & 0xFF,
... ... @@ -708,7 +708,7 @@
708 708  
709 709 TftpRemoteIP = NetServerIP;
710 710 if (BootFile[0] == '\0') {
711   - sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
  711 + sprintf(default_filename, "%02X%02X%02X%02X.img",
712 712 NetOurIP & 0xFF,
713 713 (NetOurIP >> 8) & 0xFF,
714 714 (NetOurIP >> 16) & 0xFF,