[coreboot-gerrit] New patch to review for coreboot: payloads/external/Makefile.inc: Clean up makefile
Martin Roth (martinroth@google.com)
gerrit at coreboot.org
Mon Oct 17 18:27:30 CEST 2016
Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17046
-gerrit
commit 4cebbacc47bee749a48b4cbbf76d2b2c97d88263
Author: Martin Roth <martinroth at google.com>
Date: Mon Oct 17 10:11:10 2016 -0600
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 at google.com>
---
payloads/external/Makefile.inc | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 98ed4d2..9f05abd 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 \
@@ -93,11 +95,15 @@ bootorder-type := raw
endif
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL)
+# Depthcharge
+
$(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)" \
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
@@ -108,6 +114,7 @@ filo:
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 \
@@ -118,15 +125,24 @@ grub2:
CONFIG_GRUB2_EXTRA_MODULES=$(CONFIG_GRUB2_EXTRA_MODULES)
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 +153,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 +164,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)
More information about the coreboot-gerrit
mailing list