WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed hardcoded manifest header size

pull/330/head
Daniele Lacamera 2023-07-27 10:16:07 +02:00
parent 06b6c0103e
commit 82bf6c76c6
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hal/x86_fsp_qemu_stage1.ld.in
View File

@ -7,6 +7,8 @@ FSP_M_BASE = @FSP_M_BASE@ - 0x1000; /* default base:size 0xfffdd000:0x22000 [0xf
FSP_S_BASE = @FSP_S_BASE@ - 0x1000; /* default base:size 0xfffc8000:0x15000 [0xfffdd000:0xfffdd000] */
WOLFBOOT_LOAD_BASE = @WOLFBOOT_LOAD_BASE@;
WOLFBOOT_ORIGIN = @WOLFBOOT_ORIGIN@;
IMAGE_HEADER_SIZE = @IMAGE_HEADER_SIZE@;
PRE_HEADER_FILL_SIZE = 0x1000 - IMAGE_HEADER_SIZE;
OUTPUT_FORMAT(elf32-i386)
MEMORY
@ -47,7 +49,7 @@ SECTIONS
.fsp_t FSP_T_BASE :
AT(FSP_T_BASE)
{
. += 0x0F00;
. += PRE_HEADER_FILL_SIZE;
_fsp_t_hdr = .;
KEEP(*(.sig_fsp_t*))
_start_fsp_t = .;
@ -56,7 +58,7 @@ SECTIONS
.fsp_s FSP_S_BASE :
{
. += 0x0F00;
. += PRE_HEADER_FILL_SIZE;
_fsp_s_hdr = .;
KEEP(*(.sig_fsp_s*))
_start_fsp_s = .;
@ -65,7 +67,7 @@ SECTIONS
.fsp_m FSP_M_BASE :
{
. += 0x0F00;
. += PRE_HEADER_FILL_SIZE;
_fsp_m_hdr = .;
KEEP(*(.sig_fsp_m*))
_start_fsp_m = .;

4
src/boot_x86_fsp.c
View File

@ -35,10 +35,8 @@
#include <target.h>
#include <stage1.h>
#ifdef STAGE1_AUTH
#include "wolfboot/wolfboot.h"
#include "image.h"
#endif
#define WOLFBOOT_X86_STACK_SIZE 0x10000
@ -47,7 +45,7 @@
/* When STAGE1_AUTH is disabled, create dummy images to fill
* the space used by wolfBoot manifest headers to authenticate FSPs
*/
#define HEADER_SIZE 0x100
#define HEADER_SIZE IMAGE_HEADER_SIZE
const uint8_t __attribute__((section(".sig_fsp_t"))) empty_sig_fsp_t[HEADER_SIZE];
const uint8_t __attribute__((section(".sig_fsp_m"))) empty_sig_fsp_m[HEADER_SIZE];
const uint8_t __attribute__((section(".sig_fsp_s"))) empty_sig_fsp_s[HEADER_SIZE];

3
stage1/Makefile
View File

@ -135,7 +135,8 @@ $(LSCRIPT): $(LSCRIPT_IN) FORCE
sed -e "s/@WOLFBOOT_STAGE1_SIZE@/$(WOLFBOOT_STAGE1_SIZE)/g" | \
sed -e "s/@WOLFBOOT_STAGE1_LOAD_ADDR@/$(WOLFBOOT_STAGE1_LOAD_ADDR)/g" | \
sed -e "s/@WOLFBOOT_STAGE1_FLASH_ADDR@/$(WOLFBOOT_STAGE1_FLASH_ADDR)/g" | \
sed -e "s/@WOLFBOOT_STAGE1_BASE_ADDR@/$(WOLFBOOT_STAGE1_BASE_ADDR)/g" \
sed -e "s/@WOLFBOOT_STAGE1_BASE_ADDR@/$(WOLFBOOT_STAGE1_BASE_ADDR)/g" | \
sed -e "s/@IMAGE_HEADER_SIZE@/$(IMAGE_HEADER_SIZE)/g" \
> $@
%.hex:%.elf