Skip to content

Commit b5a7e77

Browse files
dgarskedgarske
authored
Merge pull request #582 from danielinux/update-submodules-2.6.0
Updated submodules
2 parents b897746 + 3d32c38 commit b5a7e77

File tree

12 files changed

+91
-26
lines changed

12 files changed

+91
-26
lines changed

‎.github/workflows/test-build-aarch64.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Wolfboot Build workflow for AARCH64
2+
3+
on:
4+
5+
workflow_call:
6+
inputs:
7+
arch:
8+
required: true
9+
type: string
10+
config-file:
11+
required: true
12+
type: string
13+
make-args:
14+
required: false
15+
type: string
16+
17+
jobs:
18+
19+
build:
20+
runs-on: ubuntu-24.04
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
with:
25+
submodules: true
26+
27+
- name: Workaround for sources.list
28+
run: sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu/|http://mirror.arizona.edu/ubuntu/|g' /etc/apt/sources.list
29+
30+
- name: Update repository
31+
run: sudo apt-get update
32+
33+
- name: Install dependencies
34+
run: |
35+
sudo apt-get install -y build-essential curl
36+
37+
- name: Install cross compiler
38+
run: |
39+
curl -O https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.3.rel1/binrel/arm-gnu-toolchain-14.3.rel1-x86_64-aarch64-none-elf.tar.xz
40+
tar xf arm-gnu-toolchain-14.3.rel1-x86_64-aarch64-none-elf.tar.xz -C /opt/
41+
echo "/opt/arm-gnu-toolchain-14.3.rel1-x86_64-aarch64-none-elf/bin" >> $GITHUB_PATH
42+
43+
- name: make clean
44+
run: |
45+
make distclean
46+
47+
- name: Select config
48+
run: |
49+
cp ${{inputs.config-file}} .config
50+
51+
- name: Build tools
52+
run: |
53+
make -C tools/keytools && make -C tools/bin-assemble
54+
55+
- name: Build wolfboot
56+
run: |
57+
make ${{inputs.make-args}}

‎.github/workflows/test-build-pico-sdk.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ jobs:
3232
repository: raspberrypi/pico-sdk
3333
path: pico-sdk
3434

35+
- name: pico-sdk submodules initialization
36+
run: |
37+
cd pico-sdk
38+
git submodule update --init --recursive
39+
3540
- name: Workaround for sources.list
3641
run: sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu/|http://mirror.arizona.edu/ubuntu/|g' /etc/apt/sources.list
3742

‎.github/workflows/test-configs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,10 @@ jobs:
464464
config-file: ./config/examples/x86_64_efi.config
465465

466466
zynqmp_test:
467-
uses: ./.github/workflows/test-build.yml
467+
uses: ./.github/workflows/test-build-aarch64.yml
468468
with:
469469
arch: aarch64
470470
config-file: ./config/examples/zynqmp.config
471-
make-args: CROSS_COMPILE=aarch64-linux-gnu-
472471

473472
sim_wolfhsm_test:
474473
uses: ./.github/workflows/test-build.yml

‎IDE/pico-sdk/rp2350/test-app/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 3.13)
2-
set(WOLFBOOT_PATH ../../../../)
2+
set(WOLFBOOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
3+
get_filename_component(WOLFBOOT_PATH "${WOLFBOOT_PATH}" ABSOLUTE)
34
set(CMAKE_CXX_COMPILER arm-none-eabi-gcc)
45
set(LIB_PICO_RUNTIME_INIT=0)
56

@@ -27,7 +28,7 @@ target_compile_options(blink PRIVATE
2728
)
2829
target_compile_definitions(blink PRIVATE PICO_NO_RUNTIME=1)
2930

30-
pico_set_linker_script(blink ../../../../../hal/rp2350-app.ld)
31+
pico_set_linker_script(blink ${WOLFBOOT_PATH}/hal/rp2350-app.ld)
3132
target_link_libraries(blink pico_stdlib)
3233

3334
# create map/bin/hex/uf2 file etc.

‎IDE/pico-sdk/rp2350/wolfboot/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 3.13)
2-
set(WOLFBOOT_PATH ../../../..)
2+
set(WOLFBOOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
3+
get_filename_component(WOLFBOOT_PATH "${WOLFBOOT_PATH}" ABSOLUTE)
34
set(CMAKE_CXX_COMPILER arm-none-eabi-gcc)
45

56
include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
@@ -65,7 +66,7 @@ target_include_directories(wolfboot PRIVATE
6566
)
6667

6768
target_link_libraries(wolfboot pico_stdlib hardware_flash)
68-
pico_set_linker_script(wolfboot ../../../../../hal/rp2350.ld)
69+
pico_set_linker_script(wolfboot ${WOLFBOOT_PATH}/hal/rp2350.ld)
6970

7071
pico_enable_stdio_usb(wolfboot 1)
7172
pico_enable_stdio_uart(wolfboot 0)

‎lib/wolfHSM‎

Submodule wolfHSM updated 50 files

‎lib/wolfPKCS11‎

Submodule wolfPKCS11 updated 57 files

‎lib/wolfTPM‎

Submodule wolfTPM updated 145 files

‎lib/wolfssl‎

Submodule wolfssl updated 1132 files

‎options.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ ifeq ($(WOLFTPM),1)
712712
SIM_TPM=1
713713
endif
714714
ifeq ($(SIM_TPM),1)
715-
CFLAGS+=-DWOLFTPM_SWTPM -DTPM_TIMEOUT_TRIES=0 -DHAVE_NETDB_H
715+
CFLAGS+=-DWOLFTPM_SWTPM -DTPM_TIMEOUT_TRIES=0 -DHAVE_NETDB_H -DHAVE_UNISTD_H
716716
OBJS+=./lib/wolfTPM/src/tpm2_swtpm.o
717717
else
718718
# Use memory-mapped WOLFTPM on x86-64

0 commit comments

Comments
 (0)