summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/Makefile.inc16
-rw-r--r--payloads/external/FILO/Makefile (renamed from payloads/external/FILO/Makefile.inc)0
-rw-r--r--payloads/external/GRUB2/Makefile (renamed from payloads/external/GRUB2/Makefile.inc)0
-rw-r--r--payloads/external/Makefile.inc12
-rw-r--r--payloads/external/Memtest86Plus/Makefile (renamed from payloads/external/Memtest86Plus/Makefile.inc)0
-rw-r--r--payloads/external/SeaBIOS/Makefile (renamed from payloads/external/SeaBIOS/Makefile.inc)0
-rw-r--r--payloads/external/U-Boot/Makefile (renamed from payloads/external/U-Boot/Makefile.inc)0
-rw-r--r--payloads/external/depthcharge/Makefile (renamed from payloads/external/depthcharge/Makefile.inc)0
8 files changed, 14 insertions, 14 deletions
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
index 6a96a22455..6a96a22455 100644
--- a/payloads/external/FILO/Makefile.inc
+++ b/payloads/external/FILO/Makefile
diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile
index 11630c8469..11630c8469 100644
--- a/payloads/external/GRUB2/Makefile.inc
+++ b/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
index ee79032313..ee79032313 100644
--- a/payloads/external/Memtest86Plus/Makefile.inc
+++ b/payloads/external/Memtest86Plus/Makefile
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile
index 0ac04d7a2f..0ac04d7a2f 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile
diff --git a/payloads/external/U-Boot/Makefile.inc b/payloads/external/U-Boot/Makefile
index 255db297ff..255db297ff 100644
--- a/payloads/external/U-Boot/Makefile.inc
+++ b/payloads/external/U-Boot/Makefile
diff --git a/payloads/external/depthcharge/Makefile.inc b/payloads/external/depthcharge/Makefile
index 4e766870fc..4e766870fc 100644
--- a/payloads/external/depthcharge/Makefile.inc
+++ b/payloads/external/depthcharge/Makefile