diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 792df606f9..ee3c41a133 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -23,18 +23,18 @@ payloads/coreinfo/build/coreinfo.elf coreinfo: clean-payloads: $(MAKE) -C payloads/coreinfo clean $(MAKE) -C payloads/libpayload clean - $(MAKE) -C payloads/external/depthcharge -f Makefile.inc clean - $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean - $(MAKE) -C payloads/external/U-Boot -f Makefile.inc clean - $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc clean + $(MAKE) -C payloads/external/depthcharge clean + $(MAKE) -C payloads/external/SeaBIOS clean + $(MAKE) -C payloads/external/U-Boot clean + $(MAKE) -C payloads/external/Memtest86Plus clean distclean-payloads: $(MAKE) -C payloads/coreinfo distclean $(MAKE) -C payloads/libpayload distclean - $(MAKE) -C payloads/external/depthcharge -f Makefile.inc distclean - $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc distclean - $(MAKE) -C payloads/external/U-Boot -f Makefile.inc distclean - $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc distclean + $(MAKE) -C payloads/external/depthcharge distclean + $(MAKE) -C payloads/external/SeaBIOS distclean + $(MAKE) -C payloads/external/U-Boot distclean + $(MAKE) -C payloads/external/Memtest86Plus distclean .phony: clean-payloads distclean-payloads diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile similarity index 100% rename from payloads/external/FILO/Makefile.inc rename to payloads/external/FILO/Makefile diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile similarity index 100% rename from payloads/external/GRUB2/Makefile.inc rename to payloads/external/GRUB2/Makefile diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 5a6f6254ad..5335db9c91 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -40,7 +40,7 @@ payload_revision-type := raw SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG) - $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \ + $(MAKE) -C payloads/external/SeaBIOS \ HOSTCC="$(HOSTCC)" \ CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \ CFLAGS="$(patsubst $(word $(SEABIOS_CC_OFFSET),$(CC_x86_32))%,,$(wordlist $(SEABIOS_CC_OFFSET),9999,$(CC_x86_32)))" \ @@ -64,12 +64,12 @@ payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out payloads/external/SeaBIOS/seabios/out/autoversion.h: payloads/external/SeaBIOS/seabios/out/bios.bin.elf payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(top)/$(DOTCONFIG) $(CBFSTOOL) - $(MAKE) -C payloads/external/depthcharge -f Makefile.inc \ + $(MAKE) -C payloads/external/depthcharge \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ MFLAGS= MAKEFLAGS= filo: - $(MAKE) -C payloads/external/FILO -f Makefile.inc \ + $(MAKE) -C payloads/external/FILO \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ @@ -81,7 +81,7 @@ payloads/external/FILO/filo/.config: filo payloads/external/FILO/filo/build/version.h: filo grub2: - $(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \ + $(MAKE) -C payloads/external/GRUB2 \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ @@ -90,7 +90,7 @@ grub2: payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG) - $(MAKE) -C payloads/external/U-Boot -f Makefile.inc \ + $(MAKE) -C payloads/external/U-Boot \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) @@ -105,7 +105,7 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) endif payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG) - $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc all \ + $(MAKE) -C payloads/external/Memtest86Plus all \ CC="$(CC_x86_32)" \ LD="$(LD_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" \ diff --git a/payloads/external/Memtest86Plus/Makefile.inc b/payloads/external/Memtest86Plus/Makefile similarity index 100% rename from payloads/external/Memtest86Plus/Makefile.inc rename to payloads/external/Memtest86Plus/Makefile diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile similarity index 100% rename from payloads/external/SeaBIOS/Makefile.inc rename to payloads/external/SeaBIOS/Makefile diff --git a/payloads/external/U-Boot/Makefile.inc b/payloads/external/U-Boot/Makefile similarity index 100% rename from payloads/external/U-Boot/Makefile.inc rename to payloads/external/U-Boot/Makefile diff --git a/payloads/external/depthcharge/Makefile.inc b/payloads/external/depthcharge/Makefile similarity index 100% rename from payloads/external/depthcharge/Makefile.inc rename to payloads/external/depthcharge/Makefile