tint: Fix tint and add Kconfig option

Fix the compiler errors with tint, improves the Makefile,
adds Kconfig integration and secondary payload option.

Change-Id: Ia99e30f566d5ccf0d083e52bf174970535daefc5
Signed-off-by: Antonello Dettori <dettori.an@gmail.com>
Reviewed-on: https://review.coreboot.org/14989
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Antonello Dettori 2016-05-27 23:44:47 +02:00 committed by Martin Roth
parent bc141debb5
commit 4f7d329caa
6 changed files with 775 additions and 209 deletions

View File

@ -106,5 +106,13 @@ config NVRAMCUI_SECONDARY_PAYLOAD
nvramcui can be loaded as a secondary payload under SeaBIOS, GRUB,
or any other payload that can load additional payloads.
config TINT_SECONDARY_PAYLOAD
bool "Load tint as a secondary payload"
default n
depends on ARCH_X86
help
tint can be loaded as a secondary payload under SeaBIOS, GRUB,
or any other payload that can load additional payloads.
endmenu # "Secondary Payloads"
endmenu

View File

@ -29,7 +29,8 @@ payloads/external/depthcharge \
payloads/external/SeaBIOS \
payloads/external/U-Boot \
payloads/external/Memtest86Plus \
payloads/external/iPXE
payloads/external/iPXE \
payloads/external/tint
payloads/coreinfo/build/coreinfo.elf coreinfo:
$(MAKE) -C payloads/coreinfo defaultbuild

View File

@ -124,6 +124,9 @@ payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG)
CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \
CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
payloads/external/tint/tint/tint.elf tint:
$(MAKE) -C payloads/external/tint
cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest
img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest
img/memtest-type := payload
@ -134,6 +137,10 @@ 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: $(top)/$(DOTCONFIG)
$(MAKE) -C payloads/external/Memtest86Plus all \
CC="$(CC_x86_32)" \

33
payloads/external/tint/Makefile vendored Normal file
View File

@ -0,0 +1,33 @@
project_url=http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool/main/t/tint/tint_0.03b.tar.gz
archive_name=tint_0.03b.tar.gz
unexport KCONFIG_AUTOHEADER
unexport KCONFIG_AUTOCONFIG
unexport KCONFIG_DEPENDENCIES
unexport KCONFIG_SPLITCONFIG
unexport KCONFIG_TRISTATE
unexport KCONFIG_NEGATIVES
all: tint
tint: patch
echo " MAKE TINT "
$(MAKE) -C tint
patch: download
cd tint; \
if [ -e debian ]; then patch -l -p1 < ../libpayload_tint.patch; fi
download:
test -d tint || { wget $(project_url); \
tar -xvf $(archive_name); \
rm $(archive_name); \
mv tint-0.03b tint; }
clean:
test -d tint && $(MAKE) -C tint clean || exit 0
distclean:
rm -rf tint
.PHONY: download patch tint clean distclean

View File

@ -1,8 +0,0 @@
-------------------------------------------------------------------------------
tint
-------------------------------------------------------------------------------
For instructions on how to download, patch, and build tint as a coreboot
payload, please see
http://www.coreboot.org/Tint

File diff suppressed because it is too large Load Diff