diff options
| -rw-r--r-- | Makefile | 80 | ||||
| -rw-r--r-- | README.md | 16 | ||||
| -rw-r--r-- | platform/common/fdt.c (renamed from plat/common/fdt.c) | 0 | ||||
| -rw-r--r-- | platform/common/include/plat/fdt.h (renamed from plat/common/include/plat/fdt.h) | 0 | ||||
| -rw-r--r-- | platform/common/include/plat/irqchip/plic.h (renamed from plat/common/include/plat/irqchip/plic.h) | 0 | ||||
| -rw-r--r-- | platform/common/include/plat/serial/sifive-uart.h (renamed from plat/common/include/plat/serial/sifive-uart.h) | 0 | ||||
| -rw-r--r-- | platform/common/include/plat/serial/uart8250.h (renamed from plat/common/include/plat/serial/uart8250.h) | 0 | ||||
| -rw-r--r-- | platform/common/include/plat/sys/clint.h (renamed from plat/common/include/plat/sys/clint.h) | 0 | ||||
| -rw-r--r-- | platform/common/irqchip/objects.mk (renamed from plat/common/sys/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/common/irqchip/plic.c (renamed from plat/common/irqchip/plic.c) | 0 | ||||
| -rw-r--r-- | platform/common/objects.mk (renamed from plat/qemu/virt/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/common/serial/objects.mk (renamed from plat/common/serial/objects.mk) | 4 | ||||
| -rw-r--r-- | platform/common/serial/sifive-uart.c (renamed from plat/common/serial/sifive-uart.c) | 0 | ||||
| -rw-r--r-- | platform/common/serial/uart8250.c (renamed from plat/common/serial/uart8250.c) | 0 | ||||
| -rw-r--r-- | platform/common/sys/clint.c (renamed from plat/common/sys/clint.c) | 0 | ||||
| -rw-r--r-- | platform/common/sys/objects.mk (renamed from plat/common/irqchip/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/kendryte/k210/config.mk (renamed from plat/kendryte/k210/config.mk) | 16 | ||||
| -rw-r--r-- | platform/kendryte/k210/objects.mk (renamed from plat/kendryte/k210/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/kendryte/k210/platform.c (renamed from plat/kendryte/k210/platform.c) | 0 | ||||
| -rw-r--r-- | platform/kendryte/k210/platform.h (renamed from plat/kendryte/k210/platform.h) | 0 | ||||
| -rw-r--r-- | platform/kendryte/k210/sysctl.c (renamed from plat/kendryte/k210/sysctl.c) | 0 | ||||
| -rw-r--r-- | platform/kendryte/k210/sysctl.h (renamed from plat/kendryte/k210/sysctl.h) | 0 | ||||
| -rw-r--r-- | platform/kendryte/k210/uarths.c (renamed from plat/kendryte/k210/uarths.c) | 0 | ||||
| -rw-r--r-- | platform/kendryte/k210/uarths.h (renamed from plat/kendryte/k210/uarths.h) | 0 | ||||
| -rw-r--r-- | platform/qemu/sifive_u/config.mk (renamed from plat/sifive/hifive_u540/config.mk) | 18 | ||||
| -rw-r--r-- | platform/qemu/sifive_u/objects.mk (renamed from plat/qemu/sifive_u/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/qemu/sifive_u/platform.c (renamed from plat/qemu/sifive_u/platform.c) | 0 | ||||
| -rw-r--r-- | platform/qemu/virt/config.mk (renamed from plat/qemu/sifive_u/config.mk) | 18 | ||||
| -rw-r--r-- | platform/qemu/virt/objects.mk (renamed from plat/common/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/qemu/virt/platform.c (renamed from plat/qemu/virt/platform.c) | 0 | ||||
| -rw-r--r-- | platform/sifive/hifive_u540/config.mk (renamed from plat/qemu/virt/config.mk) | 18 | ||||
| -rw-r--r-- | platform/sifive/hifive_u540/objects.mk (renamed from plat/sifive/hifive_u540/objects.mk) | 2 | ||||
| -rw-r--r-- | platform/sifive/hifive_u540/platform.c (renamed from plat/sifive/hifive_u540/platform.c) | 0 |
33 files changed, 92 insertions, 92 deletions
@@ -57,47 +57,47 @@ else endif # Setup path of directories -export plat_subdir=plat/$(PLAT) -export plat_dir=$(CURDIR)/$(plat_subdir) -export plat_common_dir=$(CURDIR)/plat/common +export platform_subdir=platform/$(PLATFORM) +export platform_dir=$(CURDIR)/$(platform_subdir) +export platform_common_dir=$(CURDIR)/platform/common export include_dir=$(CURDIR)/include export lib_dir=$(CURDIR)/lib export firmware_dir=$(CURDIR)/firmware # Setup list of objects.mk files -ifdef PLAT -plat-object-mks=$(shell if [ -d $(plat_dir) ]; then find $(plat_dir) -iname "objects.mk" | sort -r; fi) -plat-common-object-mks=$(shell if [ -d $(plat_common_dir) ]; then find $(plat_common_dir) -iname "objects.mk" | sort -r; fi) +ifdef PLATFORM +platform-object-mks=$(shell if [ -d $(platform_dir) ]; then find $(platform_dir) -iname "objects.mk" | sort -r; fi) +platform-common-object-mks=$(shell if [ -d $(platform_common_dir) ]; then find $(platform_common_dir) -iname "objects.mk" | sort -r; fi) endif lib-object-mks=$(shell if [ -d $(lib_dir) ]; then find $(lib_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 -ifdef PLAT -include $(plat_dir)/config.mk +ifdef PLATFORM +include $(platform_dir)/config.mk endif # Include all object.mk files -ifdef PLAT -include $(plat-object-mks) -include $(plat-common-object-mks) +ifdef PLATFORM +include $(platform-object-mks) +include $(platform-common-object-mks) endif include $(lib-object-mks) include $(firmware-object-mks) # Setup list of objects lib-objs-path-y=$(foreach obj,$(lib-objs-y),$(build_dir)/lib/$(obj)) -ifdef PLAT -plat-objs-path-y=$(foreach obj,$(plat-objs-y),$(build_dir)/$(plat_subdir)/$(obj)) -plat-common-objs-path-y=$(foreach obj,$(plat-common-objs-y),$(build_dir)/plat/common/$(obj)) -firmware-bins-path-y=$(foreach bin,$(firmware-bins-y),$(build_dir)/$(plat_subdir)/firmware/$(bin)) +ifdef PLATFORM +platform-objs-path-y=$(foreach obj,$(platform-objs-y),$(build_dir)/$(platform_subdir)/$(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),$(build_dir)/$(platform_subdir)/firmware/$(bin)) endif firmware-elfs-path-y=$(firmware-bins-path-y:.bin=.elf) firmware-objs-path-y=$(firmware-bins-path-y:.bin=.o) # Setup list of deps files for objects -deps-y=$(plat-objs-path-y:.o=.dep) -deps-y+=$(plat-common-objs-path-y:.o=.dep) +deps-y=$(platform-objs-path-y:.o=.dep) +deps-y+=$(platform-common-objs-path-y:.o=.dep) deps-y+=$(lib-objs-path-y:.o=.dep) deps-y+=$(firmware-objs-path-y:.o=.dep) @@ -105,17 +105,17 @@ deps-y+=$(firmware-objs-path-y:.o=.dep) cpp=$(CROSS_COMPILE)cpp cppflags+=-DOPENSBI_MAJOR=$(MAJOR) cppflags+=-DOPENSBI_MINOR=$(MINOR) -cppflags+=-I$(plat_dir)/include -cppflags+=-I$(plat_common_dir)/include +cppflags+=-I$(platform_dir)/include +cppflags+=-I$(platform_common_dir)/include cppflags+=-I$(include_dir) -cppflags+=$(plat-cppflags-y) +cppflags+=$(platform-cppflags-y) cppflags+=$(firmware-cppflags-y) cc=$(CROSS_COMPILE)gcc cflags=-g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 cflags+=-fno-omit-frame-pointer -fno-optimize-sibling-calls cflags+=-mno-save-restore -mstrict-align cflags+=$(cppflags) -cflags+=$(plat-cflags-y) +cflags+=$(platform-cflags-y) cflags+=$(firmware-cflags-y) cflags+=$(EXTRA_CFLAGS) as=$(CROSS_COMPILE)gcc @@ -123,14 +123,14 @@ asflags=-g -Wall -nostdlib -D__ASSEMBLY__ asflags+=-fno-omit-frame-pointer -fno-optimize-sibling-calls asflags+=-mno-save-restore -mstrict-align asflags+=$(cppflags) -asflags+=$(plat-asflags-y) +asflags+=$(platform-asflags-y) asflags+=$(firmware-asflags-y) asflags+=$(EXTRA_ASFLAGS) ar=$(CROSS_COMPILE)ar arflags=rcs ld=$(CROSS_COMPILE)gcc ldflags=-g -Wall -nostdlib -Wl,--build-id=none -ldflags+=$(plat-ldflags-y) +ldflags+=$(platform-ldflags-y) ldflags+=$(firmware-ldflags-y) merge=$(CROSS_COMPILE)ld mergeflags=-r @@ -192,8 +192,8 @@ compile_objcopy = $(V)mkdir -p `dirname $(1)`; \ $(objcopy) -S -O binary $(2) $(1) targets-y = $(build_dir)/lib/libsbi.a -ifdef PLAT -targets-y += $(build_dir)/$(plat_subdir)/lib/libplatsbi.a +ifdef PLATFORM +targets-y += $(build_dir)/$(platform_subdir)/lib/libplatsbi.a endif targets-y += $(firmware-bins-path-y) @@ -207,16 +207,16 @@ all: $(targets-y) $(build_dir)/%.bin: $(build_dir)/%.elf $(call compile_objcopy,$@,$<) -$(build_dir)/%.elf: $(build_dir)/%.o $(build_dir)/%.elf.ld $(build_dir)/$(plat_subdir)/lib/libplatsbi.a - $(call compile_ld,$@,$@.ld,$< $(build_dir)/$(plat_subdir)/lib/libplatsbi.a) +$(build_dir)/%.elf: $(build_dir)/%.o $(build_dir)/%.elf.ld $(build_dir)/$(platform_subdir)/lib/libplatsbi.a + $(call compile_ld,$@,$@.ld,$< $(build_dir)/$(platform_subdir)/lib/libplatsbi.a) -$(build_dir)/$(plat_subdir)/%.ld: $(src_dir)/%.ldS +$(build_dir)/$(platform_subdir)/%.ld: $(src_dir)/%.ldS $(call compile_cpp,$@,$<) $(build_dir)/lib/libsbi.a: $(lib-objs-path-y) $(call compile_ar,$@,$^) -$(build_dir)/$(plat_subdir)/lib/libplatsbi.a: $(lib-objs-path-y) $(plat-common-objs-path-y) $(plat-objs-path-y) +$(build_dir)/$(platform_subdir)/lib/libplatsbi.a: $(lib-objs-path-y) $(platform-common-objs-path-y) $(platform-objs-path-y) $(call compile_ar,$@,$^) $(build_dir)/%.dep: $(src_dir)/%.c @@ -231,16 +231,16 @@ $(build_dir)/%.dep: $(src_dir)/%.S $(build_dir)/%.o: $(src_dir)/%.S $(call compile_as,$@,$<) -$(build_dir)/$(plat_subdir)/%.dep: $(src_dir)/%.c +$(build_dir)/$(platform_subdir)/%.dep: $(src_dir)/%.c $(call compile_cc_dep,$@,$<) -$(build_dir)/$(plat_subdir)/%.o: $(src_dir)/%.c +$(build_dir)/$(platform_subdir)/%.o: $(src_dir)/%.c $(call compile_cc,$@,$<) -$(build_dir)/$(plat_subdir)/%.dep: $(src_dir)/%.S +$(build_dir)/$(platform_subdir)/%.dep: $(src_dir)/%.S $(call compile_as_dep,$@,$<) -$(build_dir)/$(plat_subdir)/%.o: $(src_dir)/%.S +$(build_dir)/$(platform_subdir)/%.o: $(src_dir)/%.S $(call compile_as,$@,$<) # Dependency files should only be included after default Makefile rule @@ -250,7 +250,7 @@ all-deps-2 = $(if $(findstring clean,$(MAKECMDGOALS)),,$(all-deps-1)) -include $(all-deps-2) install_targets-y = install_libsbi -ifdef PLAT +ifdef PLATFORM install_targets-y += install_libplatsbi install_targets-y += install_firmwares endif @@ -265,14 +265,14 @@ install_libsbi: $(build_dir)/lib/libsbi.a $(call inst_file,$(install_dir)/lib/libsbi.a,$(build_dir)/lib/libsbi.a) .PHONY: install_libplatsbi -install_libplatsbi: $(build_dir)/$(plat_subdir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a - $(call inst_header_dir,$(install_dir)/$(plat_subdir)/include,$(include_dir)/sbi) - $(call inst_file,$(install_dir)/$(plat_subdir)/lib/libplatsbi.a,$(build_dir)/$(plat_subdir)/lib/libplatsbi.a) +install_libplatsbi: $(build_dir)/$(platform_subdir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a + $(call inst_header_dir,$(install_dir)/$(platform_subdir)/include,$(include_dir)/sbi) + $(call inst_file,$(install_dir)/$(platform_subdir)/lib/libplatsbi.a,$(build_dir)/$(platform_subdir)/lib/libplatsbi.a) .PHONY: install_firmwares -install_firmwares: $(build_dir)/$(plat_subdir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a $(firmware-bins-path-y) - $(call inst_file_list,$(install_dir)/$(plat_subdir)/firmware,$(plat_subdir)/firmware,$(firmware-elfs-path-y)) - $(call inst_file_list,$(install_dir)/$(plat_subdir)/firmware,$(plat_subdir)/firmware,$(firmware-bins-path-y)) +install_firmwares: $(build_dir)/$(platform_subdir)/lib/libplatsbi.a $(build_dir)/lib/libsbi.a $(firmware-bins-path-y) + $(call inst_file_list,$(install_dir)/$(platform_subdir)/firmware,$(platform_subdir)/firmware,$(firmware-elfs-path-y)) + $(call inst_file_list,$(install_dir)/$(platform_subdir)/firmware,$(platform_subdir)/firmware,$(firmware-bins-path-y)) # Rule for "make clean" .PHONY: clean @@ -32,8 +32,8 @@ For cross-compiling, please ensure that CROSS_COMPILE environment variable is set before starting build system. The libplatsbi.a and firmwares are optional and only built when -`PLAT=<platform_subdir>` parameter is specified to top-level make. -(**NOTE**: `<platform_subdir>` is sub-directory under plat/ directory) +`PLATFORM=<platform_subdir>` parameter is specified to top-level make. +(**NOTE**: `<platform_subdir>` is sub-directory under platform/ directory) To build and install Generic OpenSBI library do the following: @@ -50,17 +50,17 @@ To build and install platform specific OpenSBI library and firmwares do the following: 1. Build **libsbi, libplatsbi, and firmwares**: -`make PLAT=<platform_subdir>` +`make PLATFORM=<platform_subdir>` OR -`make PLAT=<platform_subdir> O=<build_directory>` +`make PLATFORM=<platform_subdir> O=<build_directory>` 2. Install **libsbi, headers, libplatsbi, and firmwares**: -`make PLAT=<platform_subdir> install` +`make PLATFORM=<platform_subdir> install` OR -`make PLAT=<platform_subdir> I=<install_directory> install` +`make PLATFORM=<platform_subdir> I=<install_directory> install` In addition, we can also specify platform specific command-line options to top-level make (such as `PLAT_<xyz>` or `FW_<abc>`) -which are described under `docs/plat/<platform_name>.md` OR +which are described under `docs/platform/<platform_name>.md` OR `docs/firmware/<firmware_name>.md`. Documentation @@ -71,7 +71,7 @@ manner: * `docs/platform_guide.md` - Guidelines for adding new platform support * `docs/library_usage.md` - Guidelines for using static library -* `docs/plat/<platform_name>.md` - Documentation for `<platform_name>` platform +* `docs/platform/<platform_name>.md` - Documentation for `<platform_name>` platform * `docs/firmware/<firmware_name>.md` - Documentation for firmware `<firmware_name>` We also prefer source level documentation, so wherever possible we describe diff --git a/plat/common/fdt.c b/platform/common/fdt.c index 4f6017c..4f6017c 100644 --- a/plat/common/fdt.c +++ b/platform/common/fdt.c diff --git a/plat/common/include/plat/fdt.h b/platform/common/include/plat/fdt.h index 246243f..246243f 100644 --- a/plat/common/include/plat/fdt.h +++ b/platform/common/include/plat/fdt.h diff --git a/plat/common/include/plat/irqchip/plic.h b/platform/common/include/plat/irqchip/plic.h index 7c062aa..7c062aa 100644 --- a/plat/common/include/plat/irqchip/plic.h +++ b/platform/common/include/plat/irqchip/plic.h diff --git a/plat/common/include/plat/serial/sifive-uart.h b/platform/common/include/plat/serial/sifive-uart.h index b932b16..b932b16 100644 --- a/plat/common/include/plat/serial/sifive-uart.h +++ b/platform/common/include/plat/serial/sifive-uart.h diff --git a/plat/common/include/plat/serial/uart8250.h b/platform/common/include/plat/serial/uart8250.h index ca19a9f..ca19a9f 100644 --- a/plat/common/include/plat/serial/uart8250.h +++ b/platform/common/include/plat/serial/uart8250.h diff --git a/plat/common/include/plat/sys/clint.h b/platform/common/include/plat/sys/clint.h index 642d83a..642d83a 100644 --- a/plat/common/include/plat/sys/clint.h +++ b/platform/common/include/plat/sys/clint.h diff --git a/plat/common/sys/objects.mk b/platform/common/irqchip/objects.mk index 451adbb..84fffa6 100644 --- a/plat/common/sys/objects.mk +++ b/platform/common/irqchip/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-common-objs-$(PLAT_SYS_CLINT) += sys/clint.o +platform-common-objs-$(PLATFORM_IRQCHIP_PLIC) += irqchip/plic.o diff --git a/plat/common/irqchip/plic.c b/platform/common/irqchip/plic.c index 404d1b7..404d1b7 100644 --- a/plat/common/irqchip/plic.c +++ b/platform/common/irqchip/plic.c diff --git a/plat/qemu/virt/objects.mk b/platform/common/objects.mk index 03ee2fe..712e950 100644 --- a/plat/qemu/virt/objects.mk +++ b/platform/common/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-objs-y += platform.o +platform-common-objs-y += fdt.o diff --git a/plat/common/serial/objects.mk b/platform/common/serial/objects.mk index 61d5d37..cb6062d 100644 --- a/plat/common/serial/objects.mk +++ b/platform/common/serial/objects.mk @@ -7,5 +7,5 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-common-objs-$(PLAT_SERIAL_UART8250) += serial/uart8250.o -plat-common-objs-$(PLAT_SERIAL_SIFIVE_UART) += serial/sifive-uart.o +platform-common-objs-$(PLATFORM_SERIAL_UART8250) += serial/uart8250.o +platform-common-objs-$(PLATFORM_SERIAL_SIFIVE_UART) += serial/sifive-uart.o diff --git a/plat/common/serial/sifive-uart.c b/platform/common/serial/sifive-uart.c index 60eade3..60eade3 100644 --- a/plat/common/serial/sifive-uart.c +++ b/platform/common/serial/sifive-uart.c diff --git a/plat/common/serial/uart8250.c b/platform/common/serial/uart8250.c index 7a99045..7a99045 100644 --- a/plat/common/serial/uart8250.c +++ b/platform/common/serial/uart8250.c diff --git a/plat/common/sys/clint.c b/platform/common/sys/clint.c index e84c382..e84c382 100644 --- a/plat/common/sys/clint.c +++ b/platform/common/sys/clint.c diff --git a/plat/common/irqchip/objects.mk b/platform/common/sys/objects.mk index 3950734..183d8db 100644 --- a/plat/common/irqchip/objects.mk +++ b/platform/common/sys/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-common-objs-$(PLAT_IRQCHIP_PLIC) += irqchip/plic.o +platform-common-objs-$(PLATFORM_SYS_CLINT) += sys/clint.o diff --git a/plat/kendryte/k210/config.mk b/platform/kendryte/k210/config.mk index 07cbf84..e0e0247 100644 --- a/plat/kendryte/k210/config.mk +++ b/platform/kendryte/k210/config.mk @@ -8,18 +8,18 @@ # # Essential defines required by SBI platform -plat-cppflags-y = -DPLAT_NAME="Kendryte K210" -plat-cppflags-y+= -DPLAT_HART_COUNT=2 -plat-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 +platform-cppflags-y = -DPLAT_NAME="Kendryte K210" +platform-cppflags-y+= -DPLAT_HART_COUNT=2 +platform-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 # Compiler flags -plat-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-ldflags-y = +platform-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-ldflags-y = # Common drivers to enable -PLAT_IRQCHIP_PLIC=y -PLAT_SYS_CLINT=y +PLATFORM_IRQCHIP_PLIC=y +PLATFORM_SYS_CLINT=y # Blobs to build FW_TEXT_START=0x80000000 diff --git a/plat/kendryte/k210/objects.mk b/platform/kendryte/k210/objects.mk index c2103f0..3e16abe 100644 --- a/plat/kendryte/k210/objects.mk +++ b/platform/kendryte/k210/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-objs-y += uarths.o sysctl.o platform.o +platform-objs-y += uarths.o sysctl.o platform.o diff --git a/plat/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c index 6f9297e..6f9297e 100644 --- a/plat/kendryte/k210/platform.c +++ b/platform/kendryte/k210/platform.c diff --git a/plat/kendryte/k210/platform.h b/platform/kendryte/k210/platform.h index 4aa15d7..4aa15d7 100644 --- a/plat/kendryte/k210/platform.h +++ b/platform/kendryte/k210/platform.h diff --git a/plat/kendryte/k210/sysctl.c b/platform/kendryte/k210/sysctl.c index c19859d..c19859d 100644 --- a/plat/kendryte/k210/sysctl.c +++ b/platform/kendryte/k210/sysctl.c diff --git a/plat/kendryte/k210/sysctl.h b/platform/kendryte/k210/sysctl.h index 1fba1c5..1fba1c5 100644 --- a/plat/kendryte/k210/sysctl.h +++ b/platform/kendryte/k210/sysctl.h diff --git a/plat/kendryte/k210/uarths.c b/platform/kendryte/k210/uarths.c index 1d07ad0..1d07ad0 100644 --- a/plat/kendryte/k210/uarths.c +++ b/platform/kendryte/k210/uarths.c diff --git a/plat/kendryte/k210/uarths.h b/platform/kendryte/k210/uarths.h index ab539cd..ab539cd 100644 --- a/plat/kendryte/k210/uarths.h +++ b/platform/kendryte/k210/uarths.h diff --git a/plat/sifive/hifive_u540/config.mk b/platform/qemu/sifive_u/config.mk index 165c80a..d4470cd 100644 --- a/plat/sifive/hifive_u540/config.mk +++ b/platform/qemu/sifive_u/config.mk @@ -8,19 +8,19 @@ # # Essential defines required by SBI platform -plat-cppflags-y = -DPLAT_NAME="SiFive HiFive U540" -plat-cppflags-y+= -DPLAT_HART_COUNT=5 -plat-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 +platform-cppflags-y = -DPLAT_NAME="QEMU SiFive Unleashed" +platform-cppflags-y+= -DPLAT_HART_COUNT=1 +platform-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 # Compiler flags -plat-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-ldflags-y = +platform-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-ldflags-y = # Common drivers to enable -PLAT_IRQCHIP_PLIC=y -PLAT_SERIAL_SIFIVE_UART=y -PLAT_SYS_CLINT=y +PLATFORM_IRQCHIP_PLIC=y +PLATFORM_SERIAL_SIFIVE_UART=y +PLATFORM_SYS_CLINT=y # Blobs to build FW_TEXT_START=0x80000000 diff --git a/plat/qemu/sifive_u/objects.mk b/platform/qemu/sifive_u/objects.mk index 03ee2fe..7e96bad 100644 --- a/plat/qemu/sifive_u/objects.mk +++ b/platform/qemu/sifive_u/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-objs-y += platform.o +platform-objs-y += platform.o diff --git a/plat/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c index a4a401e..a4a401e 100644 --- a/plat/qemu/sifive_u/platform.c +++ b/platform/qemu/sifive_u/platform.c diff --git a/plat/qemu/sifive_u/config.mk b/platform/qemu/virt/config.mk index 97a08f5..8496e2d 100644 --- a/plat/qemu/sifive_u/config.mk +++ b/platform/qemu/virt/config.mk @@ -8,19 +8,19 @@ # # Essential defines required by SBI platform -plat-cppflags-y = -DPLAT_NAME="QEMU SiFive Unleashed" -plat-cppflags-y+= -DPLAT_HART_COUNT=1 -plat-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 +platform-cppflags-y = -DPLAT_NAME="QEMU Virt Machine" +platform-cppflags-y+= -DPLAT_HART_COUNT=8 +platform-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 # Compiler flags -plat-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-ldflags-y = +platform-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-ldflags-y = # Common drivers to enable -PLAT_IRQCHIP_PLIC=y -PLAT_SERIAL_SIFIVE_UART=y -PLAT_SYS_CLINT=y +PLATFORM_IRQCHIP_PLIC=y +PLATFORM_SERIAL_UART8250=y +PLATFORM_SYS_CLINT=y # Blobs to build FW_TEXT_START=0x80000000 diff --git a/plat/common/objects.mk b/platform/qemu/virt/objects.mk index 18fcd0c..7e96bad 100644 --- a/plat/common/objects.mk +++ b/platform/qemu/virt/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-common-objs-y += fdt.o +platform-objs-y += platform.o diff --git a/plat/qemu/virt/platform.c b/platform/qemu/virt/platform.c index e59cdfd..e59cdfd 100644 --- a/plat/qemu/virt/platform.c +++ b/platform/qemu/virt/platform.c diff --git a/plat/qemu/virt/config.mk b/platform/sifive/hifive_u540/config.mk index 0b10613..f411fa9 100644 --- a/plat/qemu/virt/config.mk +++ b/platform/sifive/hifive_u540/config.mk @@ -8,19 +8,19 @@ # # Essential defines required by SBI platform -plat-cppflags-y = -DPLAT_NAME="QEMU Virt Machine" -plat-cppflags-y+= -DPLAT_HART_COUNT=8 -plat-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 +platform-cppflags-y = -DPLAT_NAME="SiFive HiFive U540" +platform-cppflags-y+= -DPLAT_HART_COUNT=5 +platform-cppflags-y+= -DPLAT_HART_STACK_SIZE=8192 # Compiler flags -plat-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany -plat-ldflags-y = +platform-cflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-asflags-y =-mabi=lp64 -march=rv64imafdc -mcmodel=medany +platform-ldflags-y = # Common drivers to enable -PLAT_IRQCHIP_PLIC=y -PLAT_SERIAL_UART8250=y -PLAT_SYS_CLINT=y +PLATFORM_IRQCHIP_PLIC=y +PLATFORM_SERIAL_SIFIVE_UART=y +PLATFORM_SYS_CLINT=y # Blobs to build FW_TEXT_START=0x80000000 diff --git a/plat/sifive/hifive_u540/objects.mk b/platform/sifive/hifive_u540/objects.mk index 03ee2fe..7e96bad 100644 --- a/plat/sifive/hifive_u540/objects.mk +++ b/platform/sifive/hifive_u540/objects.mk @@ -7,4 +7,4 @@ # SPDX-License-Identifier: BSD-2-Clause # -plat-objs-y += platform.o +platform-objs-y += platform.o diff --git a/plat/sifive/hifive_u540/platform.c b/platform/sifive/hifive_u540/platform.c index 5b1c989..5b1c989 100644 --- a/plat/sifive/hifive_u540/platform.c +++ b/platform/sifive/hifive_u540/platform.c |