From 6aa9c0f453cf920762e0b90d56d80f7cb36d5e6d Mon Sep 17 00:00:00 2001 From: Benjamin ROBIN Date: Sat, 17 May 2025 22:09:30 +0200 Subject: env: Fix network support when CONFIG_NET_LWIP is set When lwIP (CONFIG_NET_LWIP) is used instead of legacy stack (CONFIG_NET), environment flags support associated with network was not built: restore support of "i" and "m" environment flags. Signed-off-by: Benjamin ROBIN Acked-by: Jerome Forissier Reviewed-by: Tom Rini --- include/env_callback.h | 2 +- include/env_flags.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/env_callback.h b/include/env_callback.h index 47a31f6cf52..918ccb3b14f 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -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," \ diff --git a/include/env_flags.h b/include/env_flags.h index 2476043b0e3..92c7ea8529a 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -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 */ -- cgit v1.2.3 From 31e215fde81417299e45a6ae4a7ee880fac84c37 Mon Sep 17 00:00:00 2001 From: Mayuresh Chitale Date: Thu, 29 May 2025 03:30:51 +0000 Subject: Revert "riscv: image: Add new image type for RV64" This reverts commit 14a4792a71db3561bea065415ac1f2ac69ef32b5 as discussed in [1]. [1] https://lists.denx.de/pipermail/u-boot/2025-May/590841.html Signed-off-by: Mayuresh Chitale Reviewed-by: Leo Yu-Chi Liang --- include/image.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/image.h b/include/image.h index 4620782c069..c1db8383459 100644 --- a/include/image.h +++ b/include/image.h @@ -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, }; -- cgit v1.2.3 From 0fb68337f2482f0397681b92d13bcfbf3741cd06 Mon Sep 17 00:00:00 2001 From: Lukasz Czechowski Date: Tue, 20 May 2025 13:36:42 +0200 Subject: debug_uart: Replace debug functions with dummies if CONFIG_DEBUG_UART is not set In case DEBUG UART is not used, define dummy macros replacing the actual function implementations that will not be available. This allows to compile code and avoid linker errors. Redefine the DEBUG_UART_FUNCS macro if DEBUG UART is not available, to avoid compilation errors. Signed-off-by: Lukasz Czechowski Reviewed-by: Kever Yang --- include/debug_uart.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'include') diff --git a/include/debug_uart.h b/include/debug_uart.h index 714b369e6fe..d5e397d5e0a 100644 --- a/include/debug_uart.h +++ b/include/debug_uart.h @@ -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 -- cgit v1.2.3