<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23867">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/cbfstool: Move x86 Linux trampoline<br><br>Move linux trampoline code to support more than one architecture.<br><br>* Move the x86 trampoline to payloads/external/linux<br>* Add make rules to compile it only if the toolchain is present<br>* Add architecture independent Makefile for all trampolines<br>* Rename the trampoline to linux_trampoline_x86<br><br>Change-Id: I1d8630554e9fd845840de88142e5115c0bf92842<br>---<br>M Makefile.inc<br>A payloads/external/linux/Makefile<br>A payloads/external/linux/Makefile.inc<br>R payloads/external/linux/bzimage_loader.h<br>R payloads/external/linux/linux_trampoline.h<br>R payloads/external/linux/linux_trampoline_x86.S<br>A payloads/external/linux/linux_trampoline_x86.c<br>R payloads/external/linux/trampoline/x86/linux_trampoline.c<br>M util/cbfstool/Makefile<br>M util/cbfstool/Makefile.inc<br>M util/cbfstool/cbfs-payload-linux.c<br>11 files changed, 86 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/23867/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.inc b/Makefile.inc</span><br><span>index be658ef..d117d59 100644</span><br><span>--- a/Makefile.inc</span><br><span>+++ b/Makefile.inc</span><br><span>@@ -93,7 +93,7 @@</span><br><span> subdirs-y += $(wildcard src/arch/*)</span><br><span> subdirs-y += src/mainboard/$(MAINBOARDDIR)</span><br><span> subdirs-y += src/security</span><br><span style="color: hsl(0, 100%, 40%);">-subdirs-y += payloads payloads/external</span><br><span style="color: hsl(120, 100%, 40%);">+subdirs-y += payloads payloads/external payloads/external/linux</span><br><span> </span><br><span> subdirs-y += site-local</span><br><span> subdirs-y += util/checklist util/testing</span><br><span>diff --git a/payloads/external/linux/Makefile b/payloads/external/linux/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..0f5f2fd</span><br><span>--- /dev/null</span><br><span>+++ b/payloads/external/linux/Makefile</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: clean</span><br><span style="color: hsl(120, 100%, 40%);">+clean:</span><br><span style="color: hsl(120, 100%, 40%);">+ $(RM) */linux_trampoline.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.bin: %.elf</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " OBJCOPY $@"</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OBJCOPY) -Obinary -j .data $< $@</span><br><span style="color: hsl(120, 100%, 40%);">+ rm $<</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.elf: %.S</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " CC $@"</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) $(CFLAGS) -o $@ $< -ffreestanding -nostdlib -nostdinc -Wl,--defsym=_start=0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.c: %.bin</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " XXD $@"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "/* This file is automatically generated. Do not manually change */" > $@</span><br><span style="color: hsl(120, 100%, 40%);">+ xxd -c 16 -i $< >> $@</span><br><span style="color: hsl(120, 100%, 40%);">+ rm $<</span><br><span>diff --git a/payloads/external/linux/Makefile.inc b/payloads/external/linux/Makefile.inc</span><br><span>new file mode 100644</span><br><span>index 0000000..c0a2b0c</span><br><span>--- /dev/null</span><br><span>+++ b/payloads/external/linux/Makefile.inc</span><br><span>@@ -0,0 +1,37 @@</span><br><span style="color: hsl(120, 100%, 40%);">+################################################################################</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## Copyright (C) 2009-2010 coresystems GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+## Copyright (C) 2015 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+## it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+## the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+## but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+## GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+######################################################################</span><br><span style="color: hsl(120, 100%, 40%);">+# set up payload config and version files for later inclusion</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+linuxdir:=$(top)/payloads/external/linux</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(GCC_CC_x86_32),)</span><br><span style="color: hsl(120, 100%, 40%);">+$(linuxdir)/linux_trampoline_x86.c: $(linuxdir)/linux_trampoline_x86.S $(top)/src/arch/x86/include/*</span><br><span style="color: hsl(120, 100%, 40%);">+ $(MAKE) -C $(linuxdir) linux_trampoline_x86.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ HOSTCC="$(HOSTCC)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ CC="$(GCC_CC_x86_32)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ OBJCOPY="$(OBJCOPY_x86_32)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$(CFLAGS_x86_32) -I$(top)/src/arch/x86/include"</span><br><span style="color: hsl(120, 100%, 40%);">+else ifneq ($(GCC_CC_x86_64),)</span><br><span style="color: hsl(120, 100%, 40%);">+$(linuxdir)/linux_trampoline_x86.c: $(linuxdir)/linux_trampoline_x86.S $(top)/src/arch/x86/include/*</span><br><span style="color: hsl(120, 100%, 40%);">+ $(MAKE) -C $(linuxdir) linux_trampoline_x86.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ HOSTCC="$(HOSTCC)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ CC="$(GCC_CC_x86_64)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ OBJCOPY="$(OBJCOPY_x86_64)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$(CLFAGS_x86_64) -m32 -I$(top)/src/arch/x86/include"</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/util/cbfstool/linux.h b/payloads/external/linux/bzimage_loader.h</span><br><span>similarity index 97%</span><br><span>rename from util/cbfstool/linux.h</span><br><span>rename to payloads/external/linux/bzimage_loader.h</span><br><span>index 249c7d7..a01d3d7 100644</span><br><span>--- a/util/cbfstool/linux.h</span><br><span>+++ b/payloads/external/linux/bzimage_loader.h</span><br><span>@@ -188,3 +188,7 @@</span><br><span> u8 command_line[COMMAND_LINE_SIZE]; /* 0x800 */</span><br><span> u8 reserved17[1792]; /* 0x900 - 0x1000 */</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* trampoline */</span><br><span style="color: hsl(120, 100%, 40%);">+extern unsigned char linux_trampoline_x86_bin[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern unsigned int linux_trampoline_x86_bin_len;</span><br><span>diff --git a/util/cbfstool/linux_trampoline.h b/payloads/external/linux/linux_trampoline.h</span><br><span>similarity index 100%</span><br><span>rename from util/cbfstool/linux_trampoline.h</span><br><span>rename to payloads/external/linux/linux_trampoline.h</span><br><span>diff --git a/util/cbfstool/linux_trampoline.S b/payloads/external/linux/linux_trampoline_x86.S</span><br><span>similarity index 100%</span><br><span>rename from util/cbfstool/linux_trampoline.S</span><br><span>rename to payloads/external/linux/linux_trampoline_x86.S</span><br><span>diff --git a/payloads/external/linux/linux_trampoline_x86.c b/payloads/external/linux/linux_trampoline_x86.c</span><br><span>new file mode 100644</span><br><span>index 0000000..a60d747</span><br><span>--- /dev/null</span><br><span>+++ b/payloads/external/linux/linux_trampoline_x86.c</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* This file is automatically generated. Do not manually change */</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned char linux_trampoline_x86_bin[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xfc, 0x31, 0xd2, 0xb9, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x01, 0x00, 0x01, 0xcb, 0x8b,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x01, 0x3d, 0x4c, 0x42, 0x49, 0x4f, 0x74, 0x07, 0x83, 0xc1, 0x10, 0x39, 0xcb, 0x75, 0xe9, 0x39,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xcb, 0x0f, 0x84, 0x87, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x3b, 0x11, 0x75, 0x05, 0x8b, 0x4b, 0x08, 0xeb, 0xcf, 0x83, 0x3b, 0x01, 0x75, 0x33, 0x8b, 0x43,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x04, 0x83, 0xe8, 0x08, 0xc1, 0xe8, 0x02, 0x3d, 0xa0, 0x00, 0x00, 0x00, 0x7e, 0x05, 0xb8, 0xa0,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x00, 0x00, 0x89, 0xc6, 0xbf, 0x05, 0x00, 0x00, 0x00, 0xf7, 0xf7, 0xa3, 0xe8, 0x01, 0x09,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x89, 0xf0, 0x91, 0x8d, 0x73, 0x08, 0xbf, 0xd0, 0x02, 0x09, 0x00, 0xf3, 0xa5, 0x91, 0xeb,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x05, 0x83, 0x3b, 0x12, 0x75, 0x00, 0x03, 0x5b, 0x04, 0x49, 0x75, 0xb3, 0xb8, 0x00, 0x00, 0x04,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x0f, 0x01, 0x00, 0x8b, 0x58, 0x02, 0xc7, 0x43, 0x10, 0xff, 0xff, 0x00, 0x00, 0xc7, 0x43,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x14, 0x00, 0x9b, 0xcf, 0x00, 0xc7, 0x43, 0x18, 0xff, 0xff, 0x00, 0x00, 0xc7, 0x43, 0x1c, 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x93, 0xcf, 0x00, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, 0x02, 0x09, 0x00, 0xf4, 0xeb,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xfd</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned int linux_trampoline_x86_bin_len = 177;</span><br><span>diff --git a/util/cbfstool/linux_trampoline.c b/payloads/external/linux/trampoline/x86/linux_trampoline.c</span><br><span>similarity index 100%</span><br><span>rename from util/cbfstool/linux_trampoline.c</span><br><span>rename to payloads/external/linux/trampoline/x86/linux_trampoline.c</span><br><span>diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile</span><br><span>index caa8c7d..76efcad 100644</span><br><span>--- a/util/cbfstool/Makefile</span><br><span>+++ b/util/cbfstool/Makefile</span><br><span>@@ -30,15 +30,6 @@</span><br><span> $(RM) $(objutil)/cbfstool/ifwitool $(ifwiobj)</span><br><span> $(RM) $(objutil)/cbfstool/cbfs-compression-tool $(cbfscompobj)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-linux_trampoline.c: linux_trampoline.S</span><br><span style="color: hsl(0, 100%, 40%);">- rm -f linux_trampoline.c</span><br><span style="color: hsl(0, 100%, 40%);">- $(CC) -m32 -o linux_trampoline linux_trampoline.S -ffreestanding -nostdlib -nostdinc -Wl,--defsym=_start=0</span><br><span style="color: hsl(0, 100%, 40%);">- $(OBJCOPY) -Obinary -j .data linux_trampoline trampoline</span><br><span style="color: hsl(0, 100%, 40%);">- echo "/* This file is automatically generated. Do not manually change */" > trampoline.c</span><br><span style="color: hsl(0, 100%, 40%);">- xxd -c 16 -i trampoline >> trampoline.c</span><br><span style="color: hsl(0, 100%, 40%);">- mv trampoline.c linux_trampoline.c</span><br><span style="color: hsl(0, 100%, 40%);">- rm linux_trampoline trampoline</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> .SILENT:</span><br><span> </span><br><span> include Makefile.inc</span><br><span>diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc</span><br><span>index 8e4d8b6..0575e1d 100644</span><br><span>--- a/util/cbfstool/Makefile.inc</span><br><span>+++ b/util/cbfstool/Makefile.inc</span><br><span>@@ -38,8 +38,9 @@</span><br><span> cbfsobj += kv_pair.o</span><br><span> cbfsobj += valstr.o</span><br><span> # linux as payload</span><br><span style="color: hsl(0, 100%, 40%);">-cbfsobj += linux_trampoline.o</span><br><span style="color: hsl(120, 100%, 40%);">+cbfsobj += linux_trampoline_x86.o</span><br><span> cbfsobj += cbfs-payload-linux.o</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # compression algorithms</span><br><span> cbfsobj += $(compressionobj)</span><br><span> </span><br><span>@@ -83,6 +84,7 @@</span><br><span> TOOLCPPFLAGS += -DNEED_VB2_SHA_LIBRARY</span><br><span> TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/include</span><br><span> TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/2lib/include</span><br><span style="color: hsl(120, 100%, 40%);">+TOOLCPPFLAGS += -I$(top)/payloads/external/linux</span><br><span> # UEFI header file support. It's not pretty, but that's what we currently</span><br><span> # have right now.</span><br><span> TOOLCPPFLAGS += -I$(top)/src</span><br><span>@@ -101,6 +103,10 @@</span><br><span> TOOLCFLAGS+=-std=c99</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+$(objutil)/cbfstool/linux_trampoline_%.o: $(top)/payloads/external/linux/linux_trampoline_%.c</span><br><span style="color: hsl(120, 100%, 40%);">+ printf " HOSTCC $(subst $(objutil)/,,$(@))\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> $(objutil)/cbfstool/%.o: $(objutil)/cbfstool/%.c</span><br><span> printf " HOSTCC $(subst $(objutil)/,,$(@))\n"</span><br><span> $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<</span><br><span>diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c</span><br><span>index 6b4bf27..9646384 100644</span><br><span>--- a/util/cbfstool/cbfs-payload-linux.c</span><br><span>+++ b/util/cbfstool/cbfs-payload-linux.c</span><br><span>@@ -19,11 +19,7 @@</span><br><span> </span><br><span> #include "common.h"</span><br><span> #include "cbfs.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "linux.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* trampoline */</span><br><span style="color: hsl(0, 100%, 40%);">-extern unsigned char trampoline[];</span><br><span style="color: hsl(0, 100%, 40%);">-extern unsigned int trampoline_len;</span><br><span style="color: hsl(120, 100%, 40%);">+#include "bzimage_loader.h"</span><br><span> </span><br><span> /*</span><br><span> * Current max number of segments include:</span><br><span>@@ -97,8 +93,8 @@</span><br><span> </span><br><span> static int bzp_add_trampoline(struct bzpayload *bzp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bzp_add_segment(bzp, &bzp->trampoline, trampoline,</span><br><span style="color: hsl(0, 100%, 40%);">- trampoline_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ bzp_add_segment(bzp, &bzp->trampoline, linux_trampoline_x86_bin,</span><br><span style="color: hsl(120, 100%, 40%);">+ linux_trampoline_x86_bin_len);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23867">change 23867</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23867"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1d8630554e9fd845840de88142e5115c0bf92842 </div>
<div style="display:none"> Gerrit-Change-Number: 23867 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>