From 40afaaffe2ced5462f8ba8ce388aabfe0f94b276 Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Thu, 21 Jul 2022 20:16:06 +0200 Subject: [PATCH] Fixed UEFI example too --- config/examples/x86_64_efi.config | 3 ++- src/update_ram.c | 4 ++-- tools/efi/compile_efi_linux.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/examples/x86_64_efi.config b/config/examples/x86_64_efi.config index fde04385..a6e5652a 100644 --- a/config/examples/x86_64_efi.config +++ b/config/examples/x86_64_efi.config @@ -7,4 +7,5 @@ DEBUG=1 SPMATH=0 # required for keytools WOLFBOOT_SECTOR_SIZE?=0x1000 -WOLFBOOT_NO_PARTITIONS=1 \ No newline at end of file +WOLFBOOT_NO_PARTITIONS=1 +WOLFBOOT_LOAD_ADDRESS=0 diff --git a/src/update_ram.c b/src/update_ram.c index 34a54c76..2341f352 100644 --- a/src/update_ram.c +++ b/src/update_ram.c @@ -150,8 +150,8 @@ void RAMFUNCTION wolfBoot_start(void) } #endif /* MMU */ #else - wolfBoot_printf("Loading %d bytes to RAM at %08lx\n", - os_image.fw_size, WOLFBOOT_LOAD_ADDRESS); + wolfBoot_printf("Loading %d bytes to RAM at %08lx\n", os_image.fw_size, + (WOLFBOOT_LOAD_ADDRESS)); memcpy((void*)WOLFBOOT_LOAD_ADDRESS, os_image.fw_base, os_image.fw_size); #ifdef MMU dts_buf = hal_get_dts_address(); diff --git a/tools/efi/compile_efi_linux.sh b/tools/efi/compile_efi_linux.sh index eb36ff33..5e23d475 100755 --- a/tools/efi/compile_efi_linux.sh +++ b/tools/efi/compile_efi_linux.sh @@ -22,8 +22,8 @@ if [ -f "./tools/keytools/sign" ]; then SIGN_TOOL="./tools/keytools/sign" fi -$SIGN_TOOL --ed25519 $IMAGE_DIR/images/bzImage ed25519.der 1 -$SIGN_TOOL --ed25519 $IMAGE_DIR/images/bzImage ed25519.der 2 +$SIGN_TOOL --ed25519 $IMAGE_DIR/images/bzImage wolfBoot_signing_private_key.der 1 +$SIGN_TOOL --ed25519 $IMAGE_DIR/images/bzImage wolfboot_signing_private_key.der 2 mkdir -p /tmp/efi sudo mount /tmp/efi.disk /tmp/efi