Skip to content

Commit de27473

Browse files
committed
u-boot: 2026.04: drop #warnings in fdt_fixup_ethernet logging patch
- those were added to ensure that code was actually being compiled - we're pretty sure now, so avoid spurious warnings during compilation Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
1 parent 61abb5c commit de27473

File tree

1 file changed

+16
-29
lines changed

1 file changed

+16
-29
lines changed

patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@ Date: Mon, 12 Jan 2026 18:26:25 +0100
44
Subject: fdt_fixup_ethernet: add logs
55

66
---
7-
boot/fdt_support.c | 57 +++++++---
8-
boot/image-fdt.c | 25 ++++
9-
2 files changed, 67 insertions(+), 15 deletions(-)
7+
boot/fdt_support.c | 56 +++++++---
8+
boot/image-fdt.c | 18 +++
9+
2 files changed, 59 insertions(+), 15 deletions(-)
1010

1111
diff --git a/boot/fdt_support.c b/boot/fdt_support.c
1212
index 111111111111..222222222222 100644
1313
--- a/boot/fdt_support.c
1414
+++ b/boot/fdt_support.c
15-
@@ -630,29 +630,34 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
16-
return fdt_fixup_memory_banks(blob, &start, &size, 1);
17-
}
15+
@@ -632,27 +632,31 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
1816

19-
+#warning "Compiling fdt_fixup_ethernet() for MAC debugging."
2017
void fdt_fixup_ethernet(void *fdt)
2118
{
2219
+ log_info("[fdt_fixup_ethernet] called\n");
@@ -50,7 +47,7 @@ index 111111111111..222222222222 100644
5047
/* Select property number 'prop' */
5148
for (j = 0; j < prop; j++)
5249
offset = fdt_next_property_offset(fdt, offset);
53-
@@ -660,7 +665,10 @@ void fdt_fixup_ethernet(void *fdt)
50+
@@ -660,7 +664,10 @@ void fdt_fixup_ethernet(void *fdt)
5451
if (offset < 0)
5552
break;
5653

@@ -61,7 +58,7 @@ index 111111111111..222222222222 100644
6158
if (!strncmp(name, "ethernet", 8)) {
6259
/* Treat plain "ethernet" same as "ethernet0". */
6360
if (!strcmp(name, "ethernet")
64-
@@ -679,33 +687,52 @@ void fdt_fixup_ethernet(void *fdt)
61+
@@ -679,33 +686,52 @@ void fdt_fixup_ethernet(void *fdt)
6562
else
6663
sprintf(mac, "eth%daddr", i);
6764
} else {
@@ -135,61 +132,51 @@ index 111111111111..222222222222 100644
135132
// SPDX-License-Identifier: GPL-2.0+
136133
/*
137134
* Copyright (c) 2013, Google Inc.
138-
@@ -584,13 +585,31 @@ __weak int ft_verify_fdt(void *fdt)
139-
return 1;
140-
}
135+
@@ -586,11 +587,25 @@ __weak int ft_verify_fdt(void *fdt)
141136

142-
+#warning "Compiling arch_fixup_fdt() weak stub for MAC debugging."
143137
__weak int arch_fixup_fdt(void *blob)
144138
{
145139
+ log_info("[arch_fixup_fdt] called (weak stub)\n");
146-
return 0;
147-
}
148-
149-
+#warning "Compiling ft_board_setup() weak stub for MAC debugging."
140+
+ return 0;
141+
+}
142+
+
150143
+__weak int ft_board_setup(void *blob, struct bd_info *bd)
151144
+{
152145
+ log_info("[ft_board_setup] called (weak stub)\n");
153146
+ return 0;
154147
+}
155148
+
156-
+#warning "Compiling ft_system_setup() weak stub for MAC debugging."
157149
+__weak int ft_system_setup(void *blob, struct bd_info *bd)
158150
+{
159151
+ log_info("[ft_system_setup] called (weak stub)\n");
160-
+ return 0;
161-
+}
162-
+
163-
+#warning "Compiling image_setup_libfdt()"
152+
return 0;
153+
}
154+
164155
int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
165156
{
166157
+ log_info("[image_setup_libfdt] called\n");
167158
ulong *initrd_start = &images->initrd_start;
168159
ulong *initrd_end = &images->initrd_end;
169160
bool skip_board_fixup = false;
170-
@@ -638,6 +657,8 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
161+
@@ -638,6 +653,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
171162
strlen(images->fit_uname_cfg) + 1, 1);
172163

173164
/* Update ethernet nodes */
174-
+ #warning "Compiling fdt_fixup_ethernet() call site in image_setup_libfdt()"
175165
+ log_info("[image_setup_libfdt] calling fdt_fixup_ethernet\n");
176166
fdt_fixup_ethernet(blob);
177167
#if IS_ENABLED(CONFIG_CMD_PSTORE)
178168
/* Append PStore configuration */
179-
@@ -651,6 +672,8 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
169+
@@ -651,6 +667,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
180170
}
181171

182172
if (IS_ENABLED(CONFIG_OF_BOARD_SETUP) && !skip_board_fixup) {
183-
+ #warning "Compiling ft_board_setup() call site in image_setup_libfdt()"
184173
+ log_info("[image_setup_libfdt] calling ft_board_setup\n");
185174
fdt_ret = ft_board_setup(blob, gd->bd);
186175
if (fdt_ret) {
187176
printf("ERROR: board-specific fdt fixup failed: %s\n",
188-
@@ -658,7 +681,9 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
189-
goto err;
177+
@@ -659,6 +676,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
190178
}
191179
}
192-
+ #warning "Compiling ft_system_setup() call site in image_setup_libfdt()"
193180
if (IS_ENABLED(CONFIG_OF_SYSTEM_SETUP)) {
194181
+ log_info("[image_setup_libfdt] calling ft_system_setup\n");
195182
fdt_ret = ft_system_setup(blob, gd->bd);

0 commit comments

Comments
 (0)