GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/external: Rename Makefile.inc to Makefile 

These makefiles are not included by anything, so they shouldn't be
named Makefile.inc.  Also, having them all be named 'Makefile' makes
some other consolidation work I'm doing much easier.

Change-Id: I1234539ba6a0a6f47d2eb0c21de3da3607c6b8de
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/14130
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Martin Roth 2016-03-16 10:39:30 -06:00
parent c2b50ace1b
commit c8ed34075b
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
payloads/Makefile.inc
View File

@ -23,18 +23,18 @@ payloads/coreinfo/build/coreinfo.elf coreinfo:
clean-payloads: clean-payloads:
$(MAKE) -C payloads/coreinfo clean $(MAKE) -C payloads/coreinfo clean
$(MAKE) -C payloads/libpayload clean $(MAKE) -C payloads/libpayload clean
$(MAKE) -C payloads/external/depthcharge -f Makefile.inc clean $(MAKE) -C payloads/external/depthcharge clean
$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean $(MAKE) -C payloads/external/SeaBIOS clean
$(MAKE) -C payloads/external/U-Boot -f Makefile.inc clean $(MAKE) -C payloads/external/U-Boot clean
$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc clean $(MAKE) -C payloads/external/Memtest86Plus clean
distclean-payloads: distclean-payloads:
$(MAKE) -C payloads/coreinfo distclean $(MAKE) -C payloads/coreinfo distclean
$(MAKE) -C payloads/libpayload distclean $(MAKE) -C payloads/libpayload distclean
$(MAKE) -C payloads/external/depthcharge -f Makefile.inc distclean $(MAKE) -C payloads/external/depthcharge distclean
$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc distclean $(MAKE) -C payloads/external/SeaBIOS distclean
$(MAKE) -C payloads/external/U-Boot -f Makefile.inc distclean $(MAKE) -C payloads/external/U-Boot distclean
$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc distclean $(MAKE) -C payloads/external/Memtest86Plus distclean
.phony: clean-payloads distclean-payloads .phony: clean-payloads distclean-payloads

0
payloads/external/FILO/Makefile.inc → payloads/external/FILO/Makefile vendored
View File

0
payloads/external/GRUB2/Makefile.inc → payloads/external/GRUB2/Makefile vendored
View File

12
payloads/external/Makefile.inc vendored
View File

@ -40,7 +40,7 @@ payload_revision-type := raw
SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG) 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)" \ HOSTCC="$(HOSTCC)" \
CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \ 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)))" \ 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/SeaBIOS/seabios/out/autoversion.h: payloads/external/SeaBIOS/seabios/out/bios.bin.elf
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(top)/$(DOTCONFIG) $(CBFSTOOL) 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)))) \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \
MFLAGS= MAKEFLAGS= MFLAGS= MAKEFLAGS=
filo: filo:
$(MAKE) -C payloads/external/FILO -f Makefile.inc \ $(MAKE) -C payloads/external/FILO \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_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 payloads/external/FILO/filo/build/version.h: filo
grub2: grub2:
$(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \ $(MAKE) -C payloads/external/GRUB2 \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_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/GRUB2/grub2/build/default_payload.elf: grub2
payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG) 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_MASTER=$(CONFIG_UBOOT_MASTER) \
CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
@ -105,7 +105,7 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
endif endif
payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG) 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)" \ CC="$(CC_x86_32)" \
LD="$(LD_x86_32)" \ LD="$(LD_x86_32)" \
OBJCOPY="$(OBJCOPY_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" \

0
payloads/external/Memtest86Plus/Makefile.inc → payloads/external/Memtest86Plus/Makefile vendored
View File

0
payloads/external/SeaBIOS/Makefile.inc → payloads/external/SeaBIOS/Makefile vendored
View File

0
payloads/external/U-Boot/Makefile.inc → payloads/external/U-Boot/Makefile vendored
View File

0
payloads/external/depthcharge/Makefile.inc → payloads/external/depthcharge/Makefile vendored
View File