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

cbfstool: remove trampoline_start and trampoline_size 

It's not needed, so we can remove some extra file mangling, too.

Change-Id: I80d707708e70c07a29653258b4cb6e9cd88d3de3
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/12508
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Stefan Reinauer 2015-12-01 17:58:08 -08:00
parent 0316e1a69f
commit 5dda4df424
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/cbfstool/Makefile
View File

@ -24,9 +24,6 @@ linux_trampoline.c: linux_trampoline.S
$(OBJCOPY) -Obinary -j .data linux_trampoline trampoline $(OBJCOPY) -Obinary -j .data linux_trampoline trampoline
echo "/* This file is automatically generated. Do not manually change */" > trampoline.c echo "/* This file is automatically generated. Do not manually change */" > trampoline.c
xxd -c 16 -i trampoline >> trampoline.c xxd -c 16 -i trampoline >> trampoline.c
perl -pi -e 's,unsigned int.*$$,,g;s,unsigned char,const unsigned char,g' trampoline.c
echo "const void * const trampoline_start = &trampoline;" >> trampoline.c
echo "const unsigned long trampoline_size = sizeof trampoline;" >> trampoline.c
mv trampoline.c linux_trampoline.c mv trampoline.c linux_trampoline.c
rm linux_trampoline trampoline rm linux_trampoline trampoline

8
util/cbfstool/cbfs-payload-linux.c
View File

@ -22,8 +22,8 @@
#include "linux.h" #include "linux.h"
/* trampoline */ /* trampoline */
extern void *trampoline_start; extern unsigned char trampoline[];
extern long trampoline_size; extern unsigned int trampoline_len;
/* /*
* Current max number of segments include: * Current max number of segments include:
@ -97,8 +97,8 @@ static void bzp_add_segment(struct bzpayload *bzp, struct buffer *b, void *data,
static int bzp_add_trampoline(struct bzpayload *bzp) static int bzp_add_trampoline(struct bzpayload *bzp)
{ {
bzp_add_segment(bzp, &bzp->trampoline, trampoline_start, bzp_add_segment(bzp, &bzp->trampoline, trampoline,
trampoline_size); trampoline_len);
return 0; return 0;
} }

6
util/cbfstool/linux_trampoline.c
View File

@ -1,5 +1,5 @@
/* This file is automatically generated. Do not manually change */ /* This file is automatically generated. Do not manually change */
const unsigned char trampoline[] = { unsigned char trampoline[] = {
0xfc, 0x31, 0xd2, 0xb9, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x01, 0x00, 0x01, 0xcb, 0x8b, 0xfc, 0x31, 0xd2, 0xb9, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x01, 0x00, 0x01, 0xcb, 0x8b,
0x01, 0x3d, 0x4c, 0x42, 0x49, 0x4f, 0x74, 0x07, 0x83, 0xc1, 0x10, 0x39, 0xcb, 0x75, 0xe9, 0x39, 0x01, 0x3d, 0x4c, 0x42, 0x49, 0x4f, 0x74, 0x07, 0x83, 0xc1, 0x10, 0x39, 0xcb, 0x75, 0xe9, 0x39,
0xcb, 0x0f, 0x84, 0x87, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, 0xcb, 0x0f, 0x84, 0x87, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83,
@ -13,6 +13,4 @@ const unsigned char trampoline[] = {
0x93, 0xcf, 0x00, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, 0x02, 0x09, 0x00, 0xf4, 0xeb, 0x93, 0xcf, 0x00, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, 0x02, 0x09, 0x00, 0xf4, 0xeb,
0xfd 0xfd
}; };
unsigned int trampoline_len = 177;
const void * const trampoline_start = &trampoline;
const unsigned long trampoline_size = sizeof trampoline;