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

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>
This commit is contained in:
Martin Roth 2016-10-17 10:11:10 -06:00
parent 06590a2014
commit 9369e10f1f
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
payloads/external/Makefile.inc vendored
View File

@ -60,6 +60,8 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision
payload_revision-file := $(PAYLOAD_VERSION) payload_revision-file := $(PAYLOAD_VERSION)
payload_revision-type := raw payload_revision-type := raw
# SeaBIOS
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: $(DOTCONFIG) payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG)
$(MAKE) -C payloads/external/SeaBIOS \ $(MAKE) -C payloads/external/SeaBIOS \
@ -92,11 +94,16 @@ bootorder-file := $(strip $(CONFIG_SEABIOS_BOOTORDER_FILE))
bootorder-type := raw bootorder-type := raw
endif endif
# Depthcharge
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL)
$(MAKE) -C payloads/external/depthcharge \ $(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: filo:
$(MAKE) -C payloads/external/FILO \ $(MAKE) -C payloads/external/FILO \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
@ -109,6 +116,8 @@ payloads/external/FILO/filo/build/filo.elf: filo
payloads/external/FILO/filo/.config: filo payloads/external/FILO/filo/.config: filo
payloads/external/FILO/filo/build/version.h: filo payloads/external/FILO/filo/build/version.h: filo
# Grub
grub2: grub2:
$(MAKE) -C payloads/external/GRUB2 \ $(MAKE) -C payloads/external/GRUB2 \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
@ -119,14 +128,24 @@ grub2:
payloads/external/GRUB2/grub2/build/default_payload.elf: 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) payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(DOTCONFIG)
$(MAKE) -C payloads/external/U-Boot \ $(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)
# TINT
payloads/external/tint/tint/tint.elf tint: payloads/external/tint/tint/tint.elf tint:
$(MAKE) -C payloads/external/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 cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest
img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest
img/memtest-type := payload img/memtest-type := payload
@ -137,10 +156,6 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD) SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD)
endif 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) payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG)
$(MAKE) -C payloads/external/Memtest86Plus all \ $(MAKE) -C payloads/external/Memtest86Plus all \
CC="$(CC_x86_32)" \ CC="$(CC_x86_32)" \
@ -152,6 +167,8 @@ payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG)
$(MEMTEST_SERIAL_OPTIONS) \ $(MEMTEST_SERIAL_OPTIONS) \
MFLAGS= MAKEFLAGS= MFLAGS= MAKEFLAGS=
# iPXE
PXE_ROM_PCI_ID:=$(subst $(comma),,$(CONFIG_PXE_ROM_ID)) PXE_ROM_PCI_ID:=$(subst $(comma),,$(CONFIG_PXE_ROM_ID))
ifeq ($(CONFIG_PXE_ROM),y) ifeq ($(CONFIG_PXE_ROM),y)