Skip to content

Commit 148c27d

Browse files
committed
Enable MPFS250 build test
1 parent 04a342c commit 148c27d

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

.github/workflows/test-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Install cross compilers
7777
run: |
78-
sudo apt-get install -y gcc-arm-none-eabi gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gnu-efi
78+
sudo apt-get install -y gcc-arm-none-eabi gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gnu-efi gcc-riscv64-unknown-elf
7979
8080
- name: make clean
8181
run: |

.github/workflows/test-configs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ jobs:
207207
arch: arm
208208
config-file: ./config/examples/mcxw-tz.config
209209

210-
# TODO: polarfire_mpfs250.config requires PolarFire SoC SDK
211-
#polarfire_mpfs250_test:
212-
# uses: ./.github/workflows/test-build-mcux-sdk.yml
213-
# with:
214-
# arch: riscv64
215-
# config-file: ./config/examples/polarfire_mpfs250.config
210+
microchip_mpfs250_test:
211+
uses: ./.github/workflows/test-build.yml
212+
with:
213+
arch: riscv64
214+
config-file: ./config/examples/polarfire_mpfs250.config
215+
216216
raspi3_test:
217217
uses: ./.github/workflows/test-build.yml
218218
with:

hal/x86_fsp_qemu_loader.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
#ifdef __WOLFBOOT
2828
#include <printf.h>
2929

30-
31-
static void panic(void);
32-
3330
void hal_init(void)
3431
{
3532
}
@@ -88,7 +85,7 @@ void *hal_get_dts_update_address(void)
8885
return 0;
8986
}
9087

91-
static void panic(void)
88+
void panic(void)
9289
{
9390
while(1) {}
9491
}

src/string.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#endif
2828

2929
#include <stddef.h>
30-
#ifndef TARGET_library
30+
#if !defined(TARGET_library) && !defined(ARCH_RISCV64)
3131
#include <string.h>
3232
#else
3333
size_t strlen(const char *s); /* forward declaration */

src/update_disk.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
#include "printf.h"
4444
#include "wolfboot/wolfboot.h"
4545
#include "disk.h"
46+
#ifdef WOLFBOOT_ELF
47+
#include "elf.h"
48+
#endif
4649

4750
#include <stdint.h>
4851
#include <string.h>
@@ -53,10 +56,7 @@
5356
#include "x86/ahci.h"
5457
#include "x86/ata.h"
5558
#include "pci.h"
56-
57-
#ifdef WOLFBOOT_TGL
5859
#include "x86/tgl_fsp.h"
59-
#endif
6060

6161
#ifdef TARGET_kontron_vx3060_s2
6262
#define BOOT_PART_A 5
@@ -117,7 +117,6 @@ void RAMFUNCTION wolfBoot_start(void)
117117
#ifdef WOLFBOOT_FSP
118118
struct stage2_parameter *stage2_params;
119119
uint32_t sata_bar;
120-
121120
ret = x86_fsp_tgl_init_sata(&sata_bar);
122121
if (ret != 0)
123122
wolfBoot_panic();

0 commit comments

Comments
 (0)