diff options
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 13c975b..23be324 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -311,7 +311,7 @@ quiet_cmd_dtc = DTC $@ # Bring in any U-Boot-specific include after the '/dts-v1/;' header cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ cat $< $(if $(u_boot_dtsi),\ - | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \ + | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ @@ -363,19 +363,25 @@ cmd_S_efi= \ $(obj)/%_efi.S: $(obj)/%.efi $(call cmd,S_efi) -$(obj)/%.efi: $(obj)/%.so - $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j .dynamic \ - -j .dynsym -j .rel* -j .rela* -j .reloc \ +quiet_cmd_efi_objcopy = OBJCOPY $@ +cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j \ + .dynamic -j .dynsym -j .rel* -j .rela* -j .reloc \ $(if $(EFI_TARGET),$(EFI_TARGET),-O binary) $^ $@ +$(obj)/%.efi: $(obj)/%.so + $(call cmd,efi_objcopy) + +quiet_cmd_efi_ld = LD $@ +cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \ + -Bsymbolic $^ -o $@ + EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS) $(obj)/helloworld.so: $(EFI_LDS_PATH) $(obj)/helloworld.so: $(obj)/helloworld.o arch/$(ARCH)/lib/$(EFI_CRT0) \ arch/$(ARCH)/lib/$(EFI_RELOC) - $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared -Bsymbolic \ - $^ -o $@ + $(call cmd,efi_ld) # ACPI # --------------------------------------------------------------------------- |