Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v2025.07-rc4' into next

Browse Source 
Prepare v2025.07-rc4
This commit is contained in:
Tom Rini
2025-06-09 16:28:28 -06:00
parent 865130b730 d7c449c3d8
commit 59d00e20fc
111 changed files with 578 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/debug_uart.h
View File

@@ -128,6 +128,8 @@ void printdec(unsigned int value);
(1 << CONFIG_DEBUG_UART_SHIFT), \
CONFIG_DEBUG_UART_SHIFT)
#ifdef CONFIG_DEBUG_UART
/*
* Now define some functions - this should be inserted into the serial driver
*/
@@ -197,4 +199,22 @@ void printdec(unsigned int value);
_DEBUG_UART_ANNOUNCE \
} \
#else
#define DEBUG_UART_FUNCS
#define _printch(ch) (void)(ch)
#define printhex1(digit) (void)(digit)
#define printhex(value, digits) do { (void)(value); (void)(digits); } while(0)
#define printch(ch) (void)(ch)
#define printascii(str) (void)(str)
#define printhex2(value) (void)(value)
#define printhex4(value) (void)(value)
#define printhex8(value) (void)(value)
#define printdec(value) (void)(value)
#define debug_uart_init() ((void)0)
#endif
#endif

2
include/env_callback.h
View File

@@ -32,7 +32,7 @@
#define DNS_CALLBACK
#endif
#ifdef CONFIG_NET
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#define NET_CALLBACKS \
"bootfile:bootfile," \
"ipaddr:ipaddr," \

6
include/env_flags.h
View File

@@ -14,7 +14,7 @@ enum env_flags_vartype {
env_flags_vartype_decimal,
env_flags_vartype_hex,
env_flags_vartype_bool,
#ifdef CONFIG_NET
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
env_flags_vartype_ipaddr,
env_flags_vartype_macaddr,
#endif
@@ -41,7 +41,7 @@ enum env_flags_varaccess {
#define CFG_ENV_FLAGS_LIST_STATIC ""
#endif
#ifdef CONFIG_NET
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
#ifdef CONFIG_REGEX
#define ETHADDR_WILDCARD "\\d*"
#else
@@ -123,7 +123,7 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);
*/
enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);
#ifdef CONFIG_NET
#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP)
/*
* Check if a string has the format of an Ethernet MAC address
*/

3
include/image.h
View File

@@ -138,8 +138,7 @@ enum {
IH_ARCH_ARC, /* Synopsys DesignWare ARC */
IH_ARCH_X86_64, /* AMD x86_64, Intel and Via */
IH_ARCH_XTENSA, /* Xtensa */
IH_ARCH_RISCV, /* RISC-V 32 bit*/
IH_ARCH_RISCV64, /* RISC-V 64 bit*/
IH_ARCH_RISCV, /* RISC-V */
IH_ARCH_COUNT,
};