diff options
| author | Martin Roth <martinroth@google.com> | 2016-10-17 10:11:10 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-10-25 21:14:36 +0200 |
| commit | 9369e10f1f4e9497a09eb7848d18d78b89593147 (patch) | |
| tree | f1dabf48247587b33f390b7c4491e573da14ab3c /payloads | |
| parent | 06590a20142249ef11e306dc8f4f3469e4847b5a (diff) | |
payloads/external/Makefile.inc: Clean up makefile
- Add comments dividing the payload sections.
- Move separate TINT and Memtest sections that were intermingled.
Change-Id: If0bbd6e182359c5186a8b958dd2c9ab9f0e0a3f3
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/17046
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/Makefile.inc | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 98ed4d2f35..e4d3e12431 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -60,6 +60,8 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision payload_revision-file := $(PAYLOAD_VERSION) payload_revision-type := raw +# SeaBIOS + SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG) $(MAKE) -C payloads/external/SeaBIOS \ @@ -92,11 +94,16 @@ bootorder-file := $(strip $(CONFIG_SEABIOS_BOOTORDER_FILE)) bootorder-type := raw endif +# Depthcharge + payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) + $(MAKE) -C payloads/external/depthcharge \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ MFLAGS= MAKEFLAGS= +# FILO + filo: $(MAKE) -C payloads/external/FILO \ HOSTCC="$(HOSTCC)" \ @@ -109,6 +116,8 @@ payloads/external/FILO/filo/build/filo.elf: filo payloads/external/FILO/filo/.config: filo payloads/external/FILO/filo/build/version.h: filo +# Grub + grub2: $(MAKE) -C payloads/external/GRUB2 \ HOSTCC="$(HOSTCC)" \ @@ -119,14 +128,24 @@ grub2: payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 +# U-Boot + payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(DOTCONFIG) $(MAKE) -C payloads/external/U-Boot \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) +# TINT + payloads/external/tint/tint/tint.elf tint: $(MAKE) -C payloads/external/tint +cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint +img/tint-file := payloads/external/tint/tint/tint.elf +img/tint-type := payload + +# Memtest86+ + cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest img/memtest-type := payload @@ -137,10 +156,6 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD) endif -cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint -img/tint-file := payloads/external/tint/tint/tint.elf -img/tint-type := payload - payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG) $(MAKE) -C payloads/external/Memtest86Plus all \ CC="$(CC_x86_32)" \ @@ -152,6 +167,8 @@ payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG) $(MEMTEST_SERIAL_OPTIONS) \ MFLAGS= MAKEFLAGS= +# iPXE + PXE_ROM_PCI_ID:=$(subst $(comma),,$(CONFIG_PXE_ROM_ID)) ifeq ($(CONFIG_PXE_ROM),y) |