Skip to contentSkip to conversation

xtensa: add boot subdirectories targets to extra-y

PATCH In review Max Filippov 2 participants 3 messages Jul 21, 2020 – Jul 22, 2020 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore

Max Filippov

author maintainer
#0 lore raw

PATCH v2 1/1 xtensa: add boot subdirectories targets to extra-y

The commit 8fe87a92f262 ("kbuild: always create directories of targets") exposed an issue in the xtensa makefiles that results in the following build error in a clean directory:
scripts/Makefile.build:374: arch/xtensa/boot/boot-elf/boot.lds] Error 1
arch/xtensa/boot/boot-elf/bootstrap.S:21: fatal error:
opening dependency file arch/xtensa/boot/boot-elf/.bootstrap.o.d:
No such file or directory

Intermediate targets in arch/xtensa/boot/boot-elf don't get into 'targets' and build directory is not created for them. Add boot.lds and bootstrap.o to extra-y in subdirectories of arch/xtensa/boot.

Cc Masahiro Yamada <[email protected]>

---
Changes v1->v2:
- update boot-redboot/Makefile in the same manner as boot-elf/Makefile.

 arch/xtensa/boot/boot-elf/Makefile     | 1 +
 arch/xtensa/boot/boot-redboot/Makefile | 1 +
 2 files changed, 2 insertions(+)
arch/xtensa/boot/boot-elf/Makefile +1 -0
index 12ae1e91cb75..ad341c0fff15 100644
@@ -15,6 +15,7 @@ export CPPFLAGS_boot.lds += -P -C
 export KBUILD_AFLAGS += -mtext-section-literals
 
 boot-y		:= bootstrap.o
+extra-y		:= boot.lds $(boot-y)
 
 OBJS		:= $(addprefix $(obj)/,$(boot-y))
 
arch/xtensa/boot/boot-redboot/Makefile +1 -0
index 8632473ad319..022a76a2282a 100644
@@ -13,6 +13,7 @@ endif
 LD_ARGS	= -T $(srctree)/$(obj)/boot.ld
 
 boot-y	:= bootstrap.o
+extra-y	:= $(boot-y)
 
 OBJS	:= $(addprefix $(obj)/,$(boot-y))
 LIBS	:= arch/xtensa/boot/lib/lib.a arch/xtensa/lib/lib.a
Signature · 1 line
2.20.1
#1 lore raw
Quoted 14 lines · Max Filippov

The commit 8fe87a92f262 ("kbuild: always create directories of targets") exposed an issue in the xtensa makefiles that results in the following build error in a clean directory:
scripts/Makefile.build:374: arch/xtensa/boot/boot-elf/boot.lds] Error 1
arch/xtensa/boot/boot-elf/bootstrap.S:21: fatal error:
opening dependency file arch/xtensa/boot/boot-elf/.bootstrap.o.d:
No such file or directory

Intermediate targets in arch/xtensa/boot/boot-elf don't get into 'targets' and build directory is not created for them. Add boot.lds and bootstrap.o to extra-y in subdirectories of arch/xtensa/boot.

Quoted 5 lines
Cc Masahiro Yamada <[email protected]>

---
Changes v1->v2:
- update boot-redboot/Makefile in the same manner as boot-elf/Makefile.

Oops, sorry and thanks.

But, we need to fix this in the kbuild tree to retain the bisectability.

I will insert the following before the offending commit.
https://patchwork.kernel.org/patch/11676883/

I used 'targets' instead of 'extra-y' because they are built on demand while building the final boot image.

Quoted 29 lines
 arch/xtensa/boot/boot-elf/Makefile     | 1 +
 arch/xtensa/boot/boot-redboot/Makefile | 1 +
 2 files changed, 2 insertions(+)
arch/xtensa/boot/boot-elf/Makefile +1 -0
index 12ae1e91cb75..ad341c0fff15 100644
@@ -15,6 +15,7 @@ export CPPFLAGS_boot.lds += -P -C
 export KBUILD_AFLAGS += -mtext-section-literals
 
 boot-y         := bootstrap.o
+extra-y                := boot.lds $(boot-y)
 
 OBJS           := $(addprefix $(obj)/,$(boot-y))
 
arch/xtensa/boot/boot-redboot/Makefile +1 -1
index 8632473ad319..022a76a2282a 100644
@@ -13,6 +13,7 @@ endif
 LD_ARGS        = -T $(srctree)/$(obj)/boot.ld
 
 boot-y := bootstrap.o
+extra-y        := $(boot-y)
 
 OBJS   := $(addprefix $(obj)/,$(boot-y))
 LIBS   := arch/xtensa/boot/lib/lib.a arch/xtensa/lib/lib.a
--
Quoted 2 lines

2.20.1

--
Best Regards
Masahiro Yamada

author maintainer
#2 lore raw
Quoted 8 lines · Masahiro Yamada
Quoted 3 lines · Max Filippov

The commit 8fe87a92f262 ("kbuild: always create directories of targets") exposed an issue in the xtensa makefiles that results in the following build error in a clean directory:

But, we need to fix this in the kbuild tree to retain the bisectability.

Quoted 6 lines

I will insert the following before the offending commit.
https://patchwork.kernel.org/patch/11676883/

I used 'targets' instead of 'extra-y' because they are built on demand while building the final boot image.

Sure, please go ahead with your version.
Thank you for taking care of it.

-- Max