]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'v2024.01-rc6' into next
authorTom Rini <trini@konsulko.com>
Wed, 3 Jan 2024 14:22:47 +0000 (09:22 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 3 Jan 2024 14:22:47 +0000 (09:22 -0500)
Prepare v2024.01-rc6

1  2 
Makefile
configs/am65x_evm_a53_defconfig
configs/imx8mm_data_modul_edm_sbc_defconfig
configs/imx8mp_data_modul_edm_sbc_defconfig
configs/imx8mp_dhcom_pdk2_defconfig
configs/imx8mp_dhcom_pdk3_defconfig
net/Kconfig
net/wget.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/Kconfig
Simple merge
diff --cc net/wget.c
index 6ae2237a0a8c5276a928a5301cf2f4dfb4e83417,e1e580c835121eb2b43ed715bbd2e428b7bcc792..817c5ebd5d095c850f973b55254f2f39a8201af9
  #include <net.h>
  #include <net/tcp.h>
  #include <net/wget.h>
 +#include <stdlib.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
  
+ /* The default, change with environment variable 'httpdstp' */
+ #define SERVER_PORT           80
  static const char bootfile1[] = "GET ";
  static const char bootfile3[] = " HTTP/1.0\r\n\r\n";
  static const char http_eom[] = "\r\n\r\n";