sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hook up corebootPkg as Tianocore payload

Browse Source 
This unplugs Stefan's PIANO project.

Change Tianocore payload configuration to use corebootPkg.
As argument you have to give it the COREBOOT.FD generated by
the Tianocore build system.

It automatically determines base address and entry point.

Compression setting is honored (ie. no compression if you don't
want), but corebootPkg currently assumes that coreboot is doing
it. Loading a 6MB payload into CBFS without compression will fail
more often than not.

Change-Id: If9c64c9adb4a846a677c8af40f149ce697059ee6
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/2280
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi
2013-02-04 19:15:06 +01:00
committed by Stefan Reinauer
parent 63950f83f9
commit ed08bcc12d
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/arch/x86/Makefile.inc
View File

@@ -48,9 +48,6 @@ endif
ifeq ($(CONFIG_PAYLOAD_FILO),y)
COREBOOT_ROM_DEPENDENCIES+=filo
endif
ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y)
COREBOOT_ROM_DEPENDENCIES+=tianocore
endif
ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
COREBOOT_ROM_DEPENDENCIES+=$(objcbfs)/coreboot_ap.elf
endif
@@ -103,10 +100,20 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y)
$(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
endif
ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y)
@printf " PAYLOAD Tiano Core (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"
$(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
@printf " PAYLOAD Tiano Core FD $(CONFIG_TIANOCORE_FILE)\n"
$(CBFSTOOL) $@.tmp add -f $(CONFIG_TIANOCORE_FILE) -n $(CONFIG_CBFS_PREFIX)/tianocore.fd -t raw
@printf " PAYLOAD Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"
$(eval $(shell \
TMPFILE=`mktemp`; \
head -c1200 $(CONFIG_TIANOCORE_FILE) | \
tail -c1100 > $$TMPFILE && \
LC_ALL=C objdump -x $$TMPFILE | \
grep .text | while read idx nam size vma lma off align; do \
printf "TIANO_ENTRY:=%d " 0x$$vma; \
expr `printf "%d - %d - 100" 0x$$vma 0x$$off`; \
done && \
rm $$TMPFILE))
$(eval TIANO_BASE:=$(word 2,$(TIANO_ENTRY)))
$(eval TIANO_ENTRY:=$(word 1,$(TIANO_ENTRY)))
$(CBFSTOOL) $@.tmp add-flat-binary -f $(CONFIG_TIANOCORE_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -l $(TIANO_BASE) -e $(TIANO_ENTRY) -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
endif
ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
@printf " CONFIG $(DOTCONFIG)\n"
@@ -417,8 +424,3 @@ filo:
CONFIG_FILO_MASTER=$(CONFIG_FILO_MASTER) \
CONFIG_FILO_STABLE=$(CONFIG_FILO_STABLE)
tianocore:
$(MAKE) -C payloads/tianocoreboot \
CC="$(CC)" AS="$(AS)" OBJCOPY="$(OBJCOPY)" \
obj=$(abspath $(obj))/tiano