[PATCH 1/3] kbuild: drop non-existent targets from CLEAN_FILES

[PATCH 1/3] kbuild: drop non-existent targets from CLEAN_FILES

[Ahmad Fatoum]

From: Ahmad Fatoum <a.fatoum@barebox.org>

A number of these targets are a no longer generated and if support for
them were to be added, it would be PBL-prefixed and handled in images/,
so these left-overs can safely be dropped.

Nothing needs to be removed in .gitignore, as a /barebox* rule is
matching all of the removed files and more.

Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8824102537ba..2534fb4b467b 100644
--- a/Makefile
+++ b/Makefile
@@ -1386,11 +1386,9 @@ endif # CONFIG_MODULES
 CLEAN_DIRS  += $(MODVERDIR)
 CLEAN_FILES +=	barebox System.map include/generated/barebox_default_env.h \
                 .tmp_version .tmp_barebox* barebox.bin barebox.map \
-		.tmp_kallsyms* barebox.ldr compile_commands.json \
+		.tmp_kallsyms* compile_commands.json \
 		.tmp_barebox.o barebox.o barebox-flash-image \
-		barebox.srec barebox.s5p barebox.ubl \
-		barebox.uimage \
-		barebox.efi barebox.canon-a1100.bin
+		barebox.srec barebox.efi
 
 CLEAN_FILES +=	scripts/bareboxenv-target scripts/kernel-install-target \
 		scripts/bareboxcrc32-target scripts/bareboximd-target \
-- 
2.47.3

[PATCH 2/3] sandbox: fix race with .old_version removal

[Ahmad Fatoum]

From: Ahmad Fatoum <a.fatoum@barebox.org>

On sandbox, .old_version is created and removed by the barebox.o recipe
and the barebox ELF itself is never built and instead it's a symlink
created by the barebox__ rule override.

Drop the rm -f .old_version in that case, so the file is not removed too soon.

A cleaner way would be to factor this logic out to a shell script like
Linux does as it's serialized anyway and there's no benefit of having
the steps as make targets, but that's left as future exercise.

Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 2534fb4b467b..f958114480f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1083,7 +1083,9 @@ PHONY += check
 # ---------------------------------------------------------------------------
 barebox: $(BAREBOX_LDS) $(BAREBOX_OBJS) $(kallsyms.o) FORCE
 	$(call if_changed_rule,barebox__)
+ifeq ($(BAREBOX_PROPER),barebox)
 	$(Q)rm -f .old_version
+endif
 
 barebox.fit: images/barebox-$(CONFIG_ARCH_LINUX_NAME).fit
 	$(Q)ln -fsn $< $@
-- 
2.47.3

[PATCH 3/3] ARM: lib64: rename pbl.o to delay.o

[Ahmad Fatoum]

From: Ahmad Fatoum <a.fatoum@barebox.org>

The file only contains a delay function using the architected timer.
The name pbl.c is also unfortunate, because it's compiled to pbl.pbl.o,
so let's just give rename it to something more suitable.

Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
 arch/arm/lib64/Makefile           | 2 +-
 arch/arm/lib64/{pbl.c => delay.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/lib64/{pbl.c => delay.c} (100%)

diff --git a/arch/arm/lib64/Makefile b/arch/arm/lib64/Makefile
index e86a2e5a2f3d..b229255039b6 100644
--- a/arch/arm/lib64/Makefile
+++ b/arch/arm/lib64/Makefile
@@ -9,4 +9,4 @@ extra-y += barebox.lds
 obj-pbl-y   += runtime-offset.o
 obj-pbl-y   += setjmp.o
 obj-y += io.o
-pbl-y	+= div0.o pbl.o
+pbl-y	+= div0.o delay.o
diff --git a/arch/arm/lib64/pbl.c b/arch/arm/lib64/delay.c
similarity index 100%
rename from arch/arm/lib64/pbl.c
rename to arch/arm/lib64/delay.c
-- 
2.47.3

Re: [PATCH 1/3] kbuild: drop non-existent targets from CLEAN_FILES

[Sascha Hauer]

On Fri, 28 Nov 2025 11:41:26 +0100, Ahmad Fatoum wrote:
> A number of these targets are a no longer generated and if support for
> them were to be added, it would be PBL-prefixed and handled in images/,
> so these left-overs can safely be dropped.
> 
> Nothing needs to be removed in .gitignore, as a /barebox* rule is
> matching all of the removed files and more.
> 
> [...]

Applied, thanks!

[1/3] kbuild: drop non-existent targets from CLEAN_FILES
      https://git.pengutronix.de/cgit/barebox/commit/?id=3209a7307e65 (link may not be stable)
[2/3] sandbox: fix race with .old_version removal
      https://git.pengutronix.de/cgit/barebox/commit/?id=d0c80df5b537 (link may not be stable)
[3/3] ARM: lib64: rename pbl.o to delay.o
      https://git.pengutronix.de/cgit/barebox/commit/?id=a60bfac3c670 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>