Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c417fbce authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: move bin2c back to scripts/ from scripts/basic/ 



Commit 8370edea ("bin2c: move bin2c in scripts/basic") moved bin2c
to the scripts/basic/ directory, incorrectly stating "Kexec wants to
use bin2c and it wants to use it really early in the build process.
See arch/x86/purgatory/ code in later patches."

Commit bdab125c ("Revert "kexec/purgatory: Add clean-up for
purgatory directory"") and commit d6605b6b ("x86/build: Remove
unnecessary preparation for purgatory") removed the redundant
purgatory build magic entirely.

That means that the move of bin2c was unnecessary in the first place.

fixdep is the only host program that deserves to sit in the
scripts/basic/ directory.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent b56e5355

arch/powerpc/purgatory/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -6,9 +6,8 @@ LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined 
$(obj)/purgatory.ro: $(obj)/trampoline.o FORCE

		$(call if_changed,ld)



CMD_BIN2C = $(objtree)/scripts/basic/bin2c

quiet_cmd_bin2c = BIN2C   $@

      cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@

      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@



$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE

	$(call if_changed,bin2c)

arch/s390/purgatory/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) 
$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE

		$(call if_changed,ld)



CMD_BIN2C = $(objtree)/scripts/basic/bin2c

quiet_cmd_bin2c = BIN2C   $@

      cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@

      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@



$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE

	$(call if_changed,bin2c)

arch/x86/purgatory/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE 


targets += kexec-purgatory.c



CMD_BIN2C = $(objtree)/scripts/basic/bin2c

quiet_cmd_bin2c = BIN2C   $@

      cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@

      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@



$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE

	$(call if_changed,bin2c)

kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ targets += config_data.gz 
$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE

	$(call if_changed,gzip)



      filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/basic/bin2c; echo "MAGIC_END;")

      filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;")

targets += config_data.h

$(obj)/config_data.h: $(obj)/config_data.gz FORCE

	$(call filechk,ikconfiggz)

scripts/.gitignore

+1 −0
Original line number Diff line number Diff line 
#

# Generated files

#

bin2c

conmakehash

kallsyms

pnmtologo