aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtish Patra <atish.patra@wdc.com>2019-06-18 14:54:03 -0700
committerAnup Patel <anup.patel@wdc.com>2019-06-19 09:48:56 +0530
commit793e5e1184f04012804914bd922e68536f3b68dd (patch)
treecb2ec2a81ed5e832de5c9c8a79dca17fce599af8
parent98aaf8317b74414afa78078bc056670f46c45f41 (diff)
platform: Move platform common to lib/utils.
Currently, platform/common contains platform/non-platform specific common minimal drivers and libraries. This is helpful is all platforms are built within opensbi framework. Move them to lib/utils so that any external platform code also can reuse the minimalistic drivers or other common libraries. This patch doesn't introduce any functional changes. Signed-off-by: Atish Patra <atish.patra@wdc.com> Acked-by: Anup Patel <anup.patel@wdc.com>
Diffstat
-rw-r--r--Makefile29
-rw-r--r--include/sbi_utils/irqchip/plic.h (renamed from platform/common/include/plat/irqchip/plic.h)0
-rw-r--r--include/sbi_utils/serial/sifive-uart.h (renamed from platform/common/include/plat/serial/sifive-uart.h)0
-rw-r--r--include/sbi_utils/serial/uart8250.h (renamed from platform/common/include/plat/serial/uart8250.h)0
-rw-r--r--include/sbi_utils/sys/clint.h (renamed from platform/common/include/plat/sys/clint.h)0
-rw-r--r--include/sbi_utils/tinyfdt.h (renamed from platform/common/include/plat/tinyfdt.h)0
-rw-r--r--lib/utils/irqchip/objects.mk (renamed from platform/common/irqchip/objects.mk)2
-rw-r--r--lib/utils/irqchip/plic.c (renamed from platform/common/irqchip/plic.c)4
-rw-r--r--lib/utils/libfdt/.clang-format (renamed from platform/common/libfdt/.clang-format)0
-rw-r--r--lib/utils/libfdt/Makefile.libfdt (renamed from platform/common/libfdt/Makefile.libfdt)0
-rw-r--r--lib/utils/libfdt/TODO (renamed from platform/common/libfdt/TODO)0
-rw-r--r--lib/utils/libfdt/fdt.c (renamed from platform/common/libfdt/fdt.c)0
-rw-r--r--lib/utils/libfdt/fdt.h (renamed from platform/common/libfdt/fdt.h)0
-rw-r--r--lib/utils/libfdt/fdt_addresses.c (renamed from platform/common/libfdt/fdt_addresses.c)0
-rw-r--r--lib/utils/libfdt/fdt_empty_tree.c (renamed from platform/common/libfdt/fdt_empty_tree.c)0
-rw-r--r--lib/utils/libfdt/fdt_overlay.c (renamed from platform/common/libfdt/fdt_overlay.c)0
-rw-r--r--lib/utils/libfdt/fdt_ro.c (renamed from platform/common/libfdt/fdt_ro.c)0
-rw-r--r--lib/utils/libfdt/fdt_rw.c (renamed from platform/common/libfdt/fdt_rw.c)0
-rw-r--r--lib/utils/libfdt/fdt_strerror.c (renamed from platform/common/libfdt/fdt_strerror.c)0
-rw-r--r--lib/utils/libfdt/fdt_sw.c (renamed from platform/common/libfdt/fdt_sw.c)0
-rw-r--r--lib/utils/libfdt/fdt_wip.c (renamed from platform/common/libfdt/fdt_wip.c)0
-rw-r--r--lib/utils/libfdt/libfdt.h (renamed from platform/common/libfdt/libfdt.h)0
-rw-r--r--lib/utils/libfdt/libfdt_env.h (renamed from platform/common/libfdt/libfdt_env.h)2
-rw-r--r--lib/utils/libfdt/libfdt_internal.h (renamed from platform/common/libfdt/libfdt_internal.h)0
-rw-r--r--lib/utils/libfdt/objects.mk (renamed from platform/common/libfdt/objects.mk)6
-rw-r--r--lib/utils/libfdt/version.lds (renamed from platform/common/libfdt/version.lds)0
-rw-r--r--lib/utils/objects.mk (renamed from platform/common/objects.mk)2
-rw-r--r--lib/utils/serial/objects.mk (renamed from platform/common/serial/objects.mk)4
-rw-r--r--lib/utils/serial/sifive-uart.c (renamed from platform/common/serial/sifive-uart.c)2
-rw-r--r--lib/utils/serial/uart8250.c (renamed from platform/common/serial/uart8250.c)2
-rw-r--r--lib/utils/sys/clint.c (renamed from platform/common/sys/clint.c)2
-rw-r--r--lib/utils/sys/objects.mk (renamed from platform/common/sys/objects.mk)2
-rw-r--r--lib/utils/tinyfdt.c (renamed from platform/common/tinyfdt.c)2
-rw-r--r--platform/kendryte/k210/platform.c4
-rw-r--r--platform/qemu/sifive_u/platform.c6
-rw-r--r--platform/qemu/virt/platform.c6
-rw-r--r--platform/sifive/fu540/platform.c6
-rwxr-xr-xscripts/create-binary-archive.sh5
38 files changed, 48 insertions, 38 deletions
diff --git a/Makefile b/Makefile
index 38f18d8..3c3b046 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,9 @@ endif
export platform_subdir=$(PLATFORM)
export platform_src_dir=$(platform_parent_dir)/$(platform_subdir)
export platform_build_dir=$(build_dir)/platform/$(platform_subdir)
-export platform_common_src_dir=$(src_dir)/platform/common
export include_dir=$(CURDIR)/include
export libsbi_dir=$(CURDIR)/lib/sbi
+export libsbiutils_dir=$(CURDIR)/lib/utils
export firmware_dir=$(CURDIR)/firmware
# Find library version
@@ -98,9 +98,9 @@ endif
# Setup list of objects.mk files
ifdef PLATFORM
platform-object-mks=$(shell if [ -d $(platform_src_dir)/ ]; then find $(platform_src_dir) -iname "objects.mk" | sort -r; fi)
-platform-common-object-mks=$(shell if [ -d $(platform_common_src_dir) ]; then find $(platform_common_src_dir) -iname "objects.mk" | sort -r; fi)
endif
libsbi-object-mks=$(shell if [ -d $(libsbi_dir) ]; then find $(libsbi_dir) -iname "objects.mk" | sort -r; fi)
+libsbiutils-object-mks=$(shell if [ -d $(libsbiutils_dir) ]; then find $(libsbiutils_dir) -iname "objects.mk" | sort -r; fi)
firmware-object-mks=$(shell if [ -d $(firmware_dir) ]; then find $(firmware_dir) -iname "objects.mk" | sort -r; fi)
# Include platform specifig config.mk
@@ -111,17 +111,17 @@ endif
# Include all object.mk files
ifdef PLATFORM
include $(platform-object-mks)
-include $(platform-common-object-mks)
endif
include $(libsbi-object-mks)
+include $(libsbiutils-object-mks)
include $(firmware-object-mks)
# Setup list of objects
libsbi-objs-path-y=$(foreach obj,$(libsbi-objs-y),$(build_dir)/lib/sbi/$(obj))
+libsbiutils-objs-path-y=$(foreach obj,$(libsbiutils-objs-y),$(build_dir)/lib/utils/$(obj))
ifdef PLATFORM
platform-objs-path-y=$(foreach obj,$(platform-objs-y),$(platform_build_dir)/$(obj))
platform-dtb-path-y=$(foreach obj,$(platform-dtb-y),$(platform_build_dir)/$(obj))
-platform-common-objs-path-y=$(foreach obj,$(platform-common-objs-y),$(build_dir)/platform/common/$(obj))
firmware-bins-path-y=$(foreach bin,$(firmware-bins-y),$(platform_build_dir)/firmware/$(bin))
endif
firmware-elfs-path-y=$(firmware-bins-path-y:.bin=.elf)
@@ -129,8 +129,8 @@ firmware-objs-path-y=$(firmware-bins-path-y:.bin=.o)
# Setup list of deps files for objects
deps-y=$(platform-objs-path-y:.o=.dep)
-deps-y+=$(platform-common-objs-path-y:.o=.dep)
deps-y+=$(libsbi-objs-path-y:.o=.dep)
+deps-y+=$(libsbiutils-objs-path-y:.o=.dep)
deps-y+=$(firmware-objs-path-y:.o=.dep)
# Setup platform ABI, ISA and Code Model
@@ -150,9 +150,8 @@ endif
# Setup compilation commands flags
GENFLAGS = -I$(platform_src_dir)/include
-GENFLAGS += -I$(platform_common_src_dir)/include
GENFLAGS += -I$(include_dir)
-GENFLAGS += $(platform-common-genflags-y)
+GENFLAGS += $(libsbiutils-genflags-y)
GENFLAGS += $(platform-genflags-y)
GENFLAGS += $(firmware-genflags-y)
@@ -254,6 +253,7 @@ compile_dts = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
$(DTC) $(DTCFLAGS) -o $(1) $(2)
targets-y = $(build_dir)/lib/libsbi.a
+targets-y += $(build_dir)/lib/libsbiutils.a
ifdef PLATFORM
targets-y += $(platform_build_dir)/lib/libplatsbi.a
targets-y += $(platform-dtb-path-y)
@@ -279,7 +279,10 @@ $(platform_build_dir)/%.ld: $(src_dir)/%.ldS
$(build_dir)/lib/libsbi.a: $(libsbi-objs-path-y)
$(call compile_ar,$@,$^)
-$(platform_build_dir)/lib/libplatsbi.a: $(libsbi-objs-path-y) $(platform-common-objs-path-y) $(platform-objs-path-y)
+$(build_dir)/lib/libsbiutils.a: $(libsbi-objs-path-y) $(libsbiutils-objs-path-y)
+ $(call compile_ar,$@,$^)
+
+$(platform_build_dir)/lib/libplatsbi.a: $(libsbi-objs-path-y) $(libsbiutils-objs-path-y) $(platform-objs-path-y)
$(call compile_ar,$@,$^)
$(build_dir)/%.dep: $(src_dir)/%.c
@@ -359,6 +362,7 @@ endif
endif
install_targets-y = install_libsbi
+install_targets-y += install_libsbiutils
ifdef PLATFORM
install_targets-y += install_libplatsbi
install_targets-y += install_firmwares
@@ -373,12 +377,17 @@ install_libsbi: $(build_dir)/lib/libsbi.a
$(call inst_header_dir,$(install_dir)/include,$(include_dir)/sbi)
$(call inst_file,$(install_dir)/lib/libsbi.a,$(build_dir)/lib/libsbi.a)
+.PHONY: install_libsbiutils
+install_libsbiutils: $(build_dir)/lib/libsbiutils.a
+ $(call inst_header_dir,$(install_dir)/include,$(include_dir)/sbi_utils)
+ $(call inst_file,$(install_dir)/lib/libsbiutils.a,$(build_dir)/lib/libsbiutils.a)
+
.PHONY: install_libplatsbi
-install_libplatsbi: $(platform_build_dir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a
+install_libplatsbi: $(platform_build_dir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a $(build_dir)/lib/libsbiutils.a
$(call inst_file,$(install_dir)/platform/$(platform_subdir)/lib/libplatsbi.a,$(platform_build_dir)/lib/libplatsbi.a)
.PHONY: install_firmwares
-install_firmwares: $(platform_build_dir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a $(firmware-bins-path-y)
+install_firmwares: $(platform_build_dir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a $(build_dir)/lib/libsbiutils.a $(firmware-bins-path-y)
$(call inst_file_list,$(install_dir),$(build_dir),platform/$(platform_subdir)/firmware,$(firmware-elfs-path-y))
$(call inst_file_list,$(install_dir),$(build_dir),platform/$(platform_subdir)/firmware,$(firmware-bins-path-y))
diff --git a/platform/common/include/plat/irqchip/plic.h b/include/sbi_utils/irqchip/plic.h
index eb97123..eb97123 100644
--- a/platform/common/include/plat/irqchip/plic.h
+++ b/include/sbi_utils/irqchip/plic.h
diff --git a/platform/common/include/plat/serial/sifive-uart.h b/include/sbi_utils/serial/sifive-uart.h
index f323392..f323392 100644
--- a/platform/common/include/plat/serial/sifive-uart.h
+++ b/include/sbi_utils/serial/sifive-uart.h
diff --git a/platform/common/include/plat/serial/uart8250.h b/include/sbi_utils/serial/uart8250.h
index 0a1b5d3..0a1b5d3 100644
--- a/platform/common/include/plat/serial/uart8250.h
+++ b/include/sbi_utils/serial/uart8250.h
diff --git a/platform/common/include/plat/sys/clint.h b/include/sbi_utils/sys/clint.h
index 78e1209..78e1209 100644
--- a/platform/common/include/plat/sys/clint.h
+++ b/include/sbi_utils/sys/clint.h
diff --git a/platform/common/include/plat/tinyfdt.h b/include/sbi_utils/tinyfdt.h
index 3a681d9..3a681d9 100644
--- a/platform/common/include/plat/tinyfdt.h
+++ b/include/sbi_utils/tinyfdt.h
diff --git a/platform/common/irqchip/objects.mk b/lib/utils/irqchip/objects.mk
index 041834d..fa7c937 100644
--- a/platform/common/irqchip/objects.mk
+++ b/lib/utils/irqchip/objects.mk
@@ -7,4 +7,4 @@
# Anup Patel <anup.patel@wdc.com>
#
-platform-common-objs-$(PLATFORM_IRQCHIP_PLIC) += irqchip/plic.o
+libsbiutils-objs-$(PLATFORM_IRQCHIP_PLIC) += irqchip/plic.o
diff --git a/platform/common/irqchip/plic.c b/lib/utils/irqchip/plic.c
index e3cdb17..2131707 100644
--- a/platform/common/irqchip/plic.c
+++ b/lib/utils/irqchip/plic.c
@@ -11,8 +11,8 @@
#include <sbi/riscv_encoding.h>
#include <sbi/sbi_console.h>
#include <sbi/string.h>
-#include <plat/tinyfdt.h>
-#include <plat/irqchip/plic.h>
+#include <sbi_utils/tinyfdt.h>
+#include <sbi_utils/irqchip/plic.h>
#define PLIC_PRIORITY_BASE 0x0
#define PLIC_PENDING_BASE 0x1000
diff --git a/platform/common/libfdt/.clang-format b/lib/utils/libfdt/.clang-format
index e384528..e384528 100644
--- a/platform/common/libfdt/.clang-format
+++ b/lib/utils/libfdt/.clang-format
diff --git a/platform/common/libfdt/Makefile.libfdt b/lib/utils/libfdt/Makefile.libfdt
index 3af3656..3af3656 100644
--- a/platform/common/libfdt/Makefile.libfdt
+++ b/lib/utils/libfdt/Makefile.libfdt
diff --git a/platform/common/libfdt/TODO b/lib/utils/libfdt/TODO
index 288437e..288437e 100644
--- a/platform/common/libfdt/TODO
+++ b/lib/utils/libfdt/TODO
diff --git a/platform/common/libfdt/fdt.c b/lib/utils/libfdt/fdt.c
index ae03b11..ae03b11 100644
--- a/platform/common/libfdt/fdt.c
+++ b/lib/utils/libfdt/fdt.c
diff --git a/platform/common/libfdt/fdt.h b/lib/utils/libfdt/fdt.h
index 74961f9..74961f9 100644
--- a/platform/common/libfdt/fdt.h
+++ b/lib/utils/libfdt/fdt.h
diff --git a/platform/common/libfdt/fdt_addresses.c b/lib/utils/libfdt/fdt_addresses.c
index f13a87d..f13a87d 100644
--- a/platform/common/libfdt/fdt_addresses.c
+++ b/lib/utils/libfdt/fdt_addresses.c
diff --git a/platform/common/libfdt/fdt_empty_tree.c b/lib/utils/libfdt/fdt_empty_tree.c
index f2ae9b7..f2ae9b7 100644
--- a/platform/common/libfdt/fdt_empty_tree.c
+++ b/lib/utils/libfdt/fdt_empty_tree.c
diff --git a/platform/common/libfdt/fdt_overlay.c b/lib/utils/libfdt/fdt_overlay.c
index 5fdab6c..5fdab6c 100644
--- a/platform/common/libfdt/fdt_overlay.c
+++ b/lib/utils/libfdt/fdt_overlay.c
diff --git a/platform/common/libfdt/fdt_ro.c b/lib/utils/libfdt/fdt_ro.c
index eafc142..eafc142 100644
--- a/platform/common/libfdt/fdt_ro.c
+++ b/lib/utils/libfdt/fdt_ro.c
diff --git a/platform/common/libfdt/fdt_rw.c b/lib/utils/libfdt/fdt_rw.c
index 2e49855..2e49855 100644
--- a/platform/common/libfdt/fdt_rw.c
+++ b/lib/utils/libfdt/fdt_rw.c
diff --git a/platform/common/libfdt/fdt_strerror.c b/lib/utils/libfdt/fdt_strerror.c
index 9677a18..9677a18 100644
--- a/platform/common/libfdt/fdt_strerror.c
+++ b/lib/utils/libfdt/fdt_strerror.c
diff --git a/platform/common/libfdt/fdt_sw.c b/lib/utils/libfdt/fdt_sw.c
index 9fa4a94..9fa4a94 100644
--- a/platform/common/libfdt/fdt_sw.c
+++ b/lib/utils/libfdt/fdt_sw.c
diff --git a/platform/common/libfdt/fdt_wip.c b/lib/utils/libfdt/fdt_wip.c
index 534c1cb..534c1cb 100644
--- a/platform/common/libfdt/fdt_wip.c
+++ b/lib/utils/libfdt/fdt_wip.c
diff --git a/platform/common/libfdt/libfdt.h b/lib/utils/libfdt/libfdt.h
index a470d1d..a470d1d 100644
--- a/platform/common/libfdt/libfdt.h
+++ b/lib/utils/libfdt/libfdt.h
diff --git a/platform/common/libfdt/libfdt_env.h b/lib/utils/libfdt/libfdt_env.h
index adcd315..c2b0c34 100644
--- a/platform/common/libfdt/libfdt_env.h
+++ b/lib/utils/libfdt/libfdt_env.h
@@ -58,8 +58,6 @@
#define INT_MAX ((int)(~0U >> 1))
#define UINT_MAX ((unsigned int)~0U)
-#include <stddef.h>
-
#ifdef __CHECKER__
#define FDT_FORCE __attribute__((force))
#define FDT_BITWISE __attribute__((bitwise))
diff --git a/platform/common/libfdt/libfdt_internal.h b/lib/utils/libfdt/libfdt_internal.h
index 4109f89..4109f89 100644
--- a/platform/common/libfdt/libfdt_internal.h
+++ b/lib/utils/libfdt/libfdt_internal.h
diff --git a/platform/common/libfdt/objects.mk b/lib/utils/libfdt/objects.mk
index 1adee2b..205ea2c 100644
--- a/platform/common/libfdt/objects.mk
+++ b/lib/utils/libfdt/objects.mk
@@ -10,7 +10,7 @@
libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
fdt_empty_tree.o
$(foreach file, $(libfdt_files), \
- $(eval CFLAGS_$(file) = -I$(src)/../../common/libfdt))
+ $(eval CFLAGS_$(file) = -I$(src)/../../utils/libfdt))
-platform-common-objs-$(PLATFORM_INCLUDE_LIBFDT) += $(addprefix libfdt/,$(libfdt_files))
-platform-common-genflags-$(PLATFORM_INCLUDE_LIBFDT) += -I$(platform_common_src_dir)/libfdt/
+libsbiutils-objs-$(PLATFORM_INCLUDE_LIBFDT) += $(addprefix libfdt/,$(libfdt_files))
+libsbiutils-genflags-$(PLATFORM_INCLUDE_LIBFDT) += -I$(libsbiutils_dir)/libfdt/
diff --git a/platform/common/libfdt/version.lds b/lib/utils/libfdt/version.lds
index 9f5d708..9f5d708 100644
--- a/platform/common/libfdt/version.lds
+++ b/lib/utils/libfdt/version.lds
diff --git a/platform/common/objects.mk b/lib/utils/objects.mk
index 49e9631..95ecd42 100644
--- a/platform/common/objects.mk
+++ b/lib/utils/objects.mk
@@ -7,4 +7,4 @@
# Anup Patel <anup.patel@wdc.com>
#
-platform-common-objs-y += tinyfdt.o
+libsbiutils-objs-y += tinyfdt.o
diff --git a/platform/common/serial/objects.mk b/lib/utils/serial/objects.mk
index 67f85b4..fba056b 100644
--- a/platform/common/serial/objects.mk
+++ b/lib/utils/serial/objects.mk
@@ -7,5 +7,5 @@
# Anup Patel <anup.patel@wdc.com>
#
-platform-common-objs-$(PLATFORM_SERIAL_UART8250) += serial/uart8250.o
-platform-common-objs-$(PLATFORM_SERIAL_SIFIVE_UART) += serial/sifive-uart.o
+libsbiutils-objs-$(PLATFORM_SERIAL_UART8250) += serial/uart8250.o
+libsbiutils-objs-$(PLATFORM_SERIAL_SIFIVE_UART) += serial/sifive-uart.o
diff --git a/platform/common/serial/sifive-uart.c b/lib/utils/serial/sifive-uart.c
index de00272..fd6f28d 100644
--- a/platform/common/serial/sifive-uart.c
+++ b/lib/utils/serial/sifive-uart.c
@@ -9,7 +9,7 @@
#include <sbi/riscv_io.h>
#include <sbi/sbi_console.h>
-#include <plat/serial/sifive-uart.h>
+#include <sbi_utils/serial/sifive-uart.h>
/* clang-format off */
diff --git a/platform/common/serial/uart8250.c b/lib/utils/serial/uart8250.c
index ceefb53..eace061 100644
--- a/platform/common/serial/uart8250.c
+++ b/lib/utils/serial/uart8250.c
@@ -8,7 +8,7 @@
*/
#include <sbi/riscv_io.h>
-#include <plat/serial/uart8250.h>
+#include <sbi_utils/serial/uart8250.h>
/* clang-format off */
diff --git a/platform/common/sys/clint.c b/lib/utils/sys/clint.c
index eba056f..055a513 100644
--- a/platform/common/sys/clint.c
+++ b/lib/utils/sys/clint.c
@@ -10,7 +10,7 @@
#include <sbi/riscv_io.h>
#include <sbi/riscv_atomic.h>
#include <sbi/sbi_hart.h>
-#include <plat/sys/clint.h>
+#include <sbi_utils/sys/clint.h>
static u32 clint_ipi_hart_count;
static volatile void *clint_ipi_base;
diff --git a/platform/common/sys/objects.mk b/lib/utils/sys/objects.mk
index 5cb9886..3c13b9b 100644
--- a/platform/common/sys/objects.mk
+++ b/lib/utils/sys/objects.mk
@@ -7,4 +7,4 @@
# Anup Patel <anup.patel@wdc.com>
#
-platform-common-objs-$(PLATFORM_SYS_CLINT) += sys/clint.o
+libsbiutils-objs-$(PLATFORM_SYS_CLINT) += sys/clint.o
diff --git a/platform/common/tinyfdt.c b/lib/utils/tinyfdt.c
index 73dd131..da5c0f7 100644
--- a/platform/common/tinyfdt.c
+++ b/lib/utils/tinyfdt.c
@@ -8,7 +8,7 @@
*/
#include <sbi/string.h>
-#include <plat/tinyfdt.h>
+#include <sbi_utils/tinyfdt.h>
#define FDT_MAGIC 0xd00dfeed
#define FDT_VERSION 17
diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c
index 136e58e..299b343 100644
--- a/platform/kendryte/k210/platform.c
+++ b/platform/kendryte/k210/platform.c
@@ -12,8 +12,8 @@
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h>
#include <sbi/sbi_console.h>
-#include <plat/irqchip/plic.h>
-#include <plat/sys/clint.h>
+#include <sbi_utils/irqchip/plic.h>
+#include <sbi_utils/sys/clint.h>
#include "platform.h"
#include "uarths.h"
diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c
index 470da35..e20d89d 100644
--- a/platform/qemu/sifive_u/platform.c
+++ b/platform/qemu/sifive_u/platform.c
@@ -11,9 +11,9 @@
#include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h>
-#include <plat/irqchip/plic.h>
-#include <plat/serial/sifive-uart.h>
-#include <plat/sys/clint.h>
+#include <sbi_utils/irqchip/plic.h>
+#include <sbi_utils/serial/sifive-uart.h>
+#include <sbi_utils/sys/clint.h>
/* clang-format off */
diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c
index 96e375d..697549f 100644
--- a/platform/qemu/virt/platform.c
+++ b/platform/qemu/virt/platform.c
@@ -13,9 +13,9 @@
#include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h>
-#include <plat/irqchip/plic.h>
-#include <plat/serial/uart8250.h>
-#include <plat/sys/clint.h>
+#include <sbi_utils/irqchip/plic.h>
+#include <sbi_utils/serial/uart8250.h>
+#include <sbi_utils/sys/clint.h>
/* clang-format off */
diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c
index ee2e5a4..9e16562 100644
--- a/platform/sifive/fu540/platform.c
+++ b/platform/sifive/fu540/platform.c
@@ -15,9 +15,9 @@
#include <sbi/sbi_console.h>
#include <sbi/sbi_platform.h>
#include <sbi/riscv_io.h>
-#include <plat/irqchip/plic.h>
-#include <plat/serial/sifive-uart.h>
-#include <plat/sys/clint.h>
+#include <sbi_utils/irqchip/plic.h>
+#include <sbi_utils/serial/sifive-uart.h>
+#include <sbi_utils/sys/clint.h>
/* clang-format off */
diff --git a/scripts/create-binary-archive.sh b/scripts/create-binary-archive.sh
index be8cfe1..d5890fc 100755
--- a/scripts/create-binary-archive.sh
+++ b/scripts/create-binary-archive.sh
@@ -103,10 +103,13 @@ esac
# Ensure output directory is present
mkdir -p "${BUILD_OUTPUT_PATH}"
+# Do a clean build first
+make distclean
+
# Build and install generic library
echo "Build and install generic library XLEN=${BUILD_RISCV_XLEN}"
echo ""
-make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" PLATFORM_RISCV_XLEN="${BUILD_RISCV_XLEN}" install_libsbi -j "${BUILD_NUM_THREADS}"
+make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" PLATFORM_RISCV_XLEN="${BUILD_RISCV_XLEN}" install_libsbi install_libsbiutils -j "${BUILD_NUM_THREADS}"
echo ""
# Build and install relevant platforms
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-08 23:38:32 +0000