diff --git a/Ubiquitous/XiZi_AIoT/Makefile b/Ubiquitous/XiZi_AIoT/Makefile index 4bc6e3b00..f335a2608 100755 --- a/Ubiquitous/XiZi_AIoT/Makefile +++ b/Ubiquitous/XiZi_AIoT/Makefile @@ -4,7 +4,7 @@ MAKEFLAGS += --no-print-directory .PHONY:COMPILE_APP COMPILE_KERNEL riscv_support := -arm_support += imx6q-sabrelite zynq7000-zc702 3568 +arm_support += imx6q-sabrelite zynq7000-zc702 3588 emulator_support += support := $(riscv_support) $(arm_support) $(emulator_support) SRC_DIR := @@ -34,7 +34,7 @@ export UBIQUITOUS_ROOT ?= .. ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) include $(KERNEL_ROOT)/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_$(BOARD)/config.mk endif -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) include $(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_$(BOARD)/config.mk endif export BSP_BUILD_DIR := $(KERNEL_ROOT) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile index 8f7703c39..fcae83294 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile @@ -1,5 +1,6 @@ # The following three platforms support compatiable instructions. -ifneq ($(findstring $(BOARD), 3568), ) + +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := armv8-a endif ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile index f1319354d..a2a9a1b16 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile @@ -1,5 +1,6 @@ # The following three platforms support compatiable instructions. -ifneq ($(findstring $(BOARD), 3568), ) + +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := cortex-a55 endif diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/3568.lds b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/3588.lds similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/3568.lds rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/3588.lds diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/Makefile similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/Makefile rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/Makefile diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/boot.S similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/boot.S rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/boot.S diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/config.mk b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/config.mk similarity index 86% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/config.mk rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/config.mk index 33b1f65a0..5a711c597 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/config.mk +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/config.mk @@ -1,7 +1,7 @@ export CROSS_COMPILE ?= aarch64-none-elf- export DEVICE = -mtune=cortex-a55 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie export CFLAGS := $(DEVICE) -Wall -Werror -O2 -g -fno-omit-frame-pointer -fPIC -export LFLAGS := $(DEVICE) -Wl,-T -Wl,$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/3568.lds -Wl,--start-group,-lgcc,-lc,--end-group +export LFLAGS := $(DEVICE) -Wl,-T -Wl,$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/3588.lds -Wl,--start-group,-lgcc,-lc,--end-group export CXXFLAGS := export DEFINES := -DHAVE_CCONFIG_H -DCHIP_LS1028 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/cortexA55.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/cortexA55.S similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/cortexA55.S rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/cortexA55.S diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/include/cortex_a55.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/include/cortex_a55.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/include/cortex_a55.h rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/include/cortex_a55.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/include/registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/include/registers.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/include/registers.h rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/include/registers.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/smp.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/smp.c similarity index 97% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/smp.c rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/smp.c index 395b3e32e..cae03d4cd 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/smp.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/smp.c @@ -75,7 +75,7 @@ static struct xizi_smccc_res __invoke_sip_fn_smc(unsigned long function_id, void cpu_start_secondary(uint8_t cpu_id) { - __invoke_sip_fn_smc(PSCI_CPUON, cpu_id, (uintptr_t)0xa00000, 0); + __invoke_sip_fn_smc(PSCI_CPUON, cpu_id, (uintptr_t)0x200000, 0); } void start_smp_cache_broadcast(int cpu_id) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/xizi_smp.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/xizi_smp.S similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/xizi_smp.S rename to Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3588/xizi_smp.S diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile index c87f4ca4a..e180ed42c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile @@ -1,7 +1,10 @@ ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) SRC_DIR := cortex-a9 endif -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) +SRC_DIR := cortex-a55 +endif +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := cortex-a55 endif diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile index dec44c751..6795f16c2 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile @@ -1,4 +1,7 @@ -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) +SRC_DIR := armv8-a +endif +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := armv8-a endif ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile index 37af2eae1..cda7f0c16 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile @@ -1,4 +1,4 @@ -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := cortex-a55 endif diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3568/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3588/Makefile similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3568/Makefile rename to Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3588/Makefile diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3568/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3588/clock.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3568/clock.c rename to Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3588/clock.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3568/include/generic_timer.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3588/include/generic_timer.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3568/include/generic_timer.h rename to Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a55/3588/include/generic_timer.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile index dec44c751..b498a0a52 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile @@ -1,4 +1,4 @@ -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := armv8-a endif ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/exception_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/exception_registers.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/exception_registers.h rename to Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/exception_registers.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/irq_numbers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/irq_numbers.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/irq_numbers.h rename to Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/irq_numbers.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/trap.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/trap.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/trap.c rename to Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/trap.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/trap_common.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3568/trap_common.c rename to Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/3588/trap_common.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/Makefile index ca24fcc00..6e2066034 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/Makefile @@ -1,6 +1,6 @@ SRC_FILES := trampoline.S $(BOARD)/trap_common.c $(BOARD)/trap.c error_debug.c hard_spinlock.S -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) SRC_DIR := gicv3 SRC_FILES += $(BOARD)/ endif diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/gicv3/gicv3_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/gicv3/gicv3_registers.h index 389d6a5b1..99d06ff1c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/gicv3/gicv3_registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/gicv3/gicv3_registers.h @@ -30,8 +30,8 @@ Modification: // clang-format off // interrupt controller GICv3 -#define GICV3 MMIO_P2V_WO(0xFD400000ULL) -#define GICV3_REDIST MMIO_P2V_WO(0xFD460000ULL) +#define GICV3 MMIO_P2V_WO(0xfe600000ULL) +#define GICV3_REDIST MMIO_P2V_WO(0xfe680000ULL) #define D_CTLR 0x0 #define D_TYPER 0x4 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile index ea7da0fa1..a121ae4ed 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile @@ -1,4 +1,4 @@ -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := armv8-a endif ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a55/3568/memlayout.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a55/3588/memlayout.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a55/3568/memlayout.h rename to Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a55/3588/memlayout.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile index 8f7703c39..fe0439a6c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile @@ -1,5 +1,5 @@ # The following three platforms support compatiable instructions. -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) SRC_DIR := armv8-a endif ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/Makefile similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/Makefile rename to Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/Makefile diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/include/ns16550.h b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/include/ns16550.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/include/ns16550.h rename to Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/include/ns16550.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/include/uart.h b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/include/uart.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/include/uart.h rename to Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/include/uart.h diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/ns16550.c b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/ns16550.c similarity index 98% rename from Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/ns16550.c rename to Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/ns16550.c index 9631fbf50..7be7e1dad 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/ns16550.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/ns16550.c @@ -9,7 +9,7 @@ #include "mmio_access.h" #include "ns16550.h" -#define UART_ADDR MMIO_P2V_WO(0xFE660000) +#define UART_ADDR MMIO_P2V_WO(0xfeb50000) // #define UART_ADDR (0xFE660000) #define UART_LCRVAL UART_LCR_8N1 /* 8 data, 1 stop, no parity */ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/uart.c b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/uart.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3568/uart.c rename to Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a55/uart_io_for_3588/uart.c diff --git a/Ubiquitous/XiZi_AIoT/path_kernel.mk b/Ubiquitous/XiZi_AIoT/path_kernel.mk index 2a8bca965..62459ff7e 100755 --- a/Ubiquitous/XiZi_AIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_AIoT/path_kernel.mk @@ -38,7 +38,7 @@ KERNELPATHS += \ -I$(KERNEL_ROOT)/hardkernel/cache/L2/pl310/ endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) KERNELPATHS += \ -I$(KERNEL_ROOT)/hardkernel/clock/arm/armv8-a/cortex-a55/$(BOARD)/include \ -I$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_$(BOARD)/include \ diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile index 2b5808fe6..500aeb010 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile @@ -10,7 +10,7 @@ cflags = -std=c11 -O2 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs - board_specs = stub.o #cflags = -Wall -g -std=c11 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O2 -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/boards/3568/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/3588/Makefile similarity index 98% rename from Ubiquitous/XiZi_AIoT/services/boards/3568/Makefile rename to Ubiquitous/XiZi_AIoT/services/boards/3588/Makefile index f7c02d433..0b8f27862 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/3568/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/3588/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- user_ldflags = -N -Ttext 0 cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/boards/3568/arch_usyscall.c b/Ubiquitous/XiZi_AIoT/services/boards/3588/arch_usyscall.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/boards/3568/arch_usyscall.c rename to Ubiquitous/XiZi_AIoT/services/boards/3588/arch_usyscall.c diff --git a/Ubiquitous/XiZi_AIoT/services/boards/3568/libserial.c b/Ubiquitous/XiZi_AIoT/services/boards/3588/libserial.c similarity index 99% rename from Ubiquitous/XiZi_AIoT/services/boards/3568/libserial.c rename to Ubiquitous/XiZi_AIoT/services/boards/3588/libserial.c index 15c5dbd2a..6f2beb5e4 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/3568/libserial.c +++ b/Ubiquitous/XiZi_AIoT/services/boards/3588/libserial.c @@ -181,7 +181,7 @@ typedef struct NS16550* NS16550_t; /* useful defaults for LCR */ #define UART_LCR_8N1 0x03 -#define UART_ADDR (0xFE660000) +#define UART_ADDR (0xfeb50000) #define UART_LCRVAL UART_LCR_8N1 /* 8 data, 1 stop, no parity */ #define UART_MCRVAL (UART_MCR_DTR | UART_MCR_RTS) /* RTS/DTR */ diff --git a/Ubiquitous/XiZi_AIoT/services/boards/3568/stub.c b/Ubiquitous/XiZi_AIoT/services/boards/3588/stub.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/boards/3568/stub.c rename to Ubiquitous/XiZi_AIoT/services/boards/3588/stub.c diff --git a/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile index 9a4022521..de59aaf77 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- user_ldflags = -N -Ttext 0 cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile index 699cb7e32..f3aa5758b 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile @@ -9,7 +9,7 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/3588/Makefile similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/Makefile rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/Makefile diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/Makefile similarity index 96% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/Makefile rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/Makefile index 17eb018d0..c5969d0da 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/Makefile @@ -19,7 +19,7 @@ cflags = -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -stati board_specs = stub.o endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie @@ -35,7 +35,7 @@ c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ -I$(KERNEL_ROOT)/services/boards/$(BOARD) \ -I$(KERNEL_ROOT)/services/lib/serial \ - -I$(KERNEL_ROOT)/services/drivers/3568/include \ + -I$(KERNEL_ROOT)/services/drivers/3588/include \ -I$(KERNEL_ROOT)/services/lib/usyscall \ -I$(KERNEL_ROOT)/services/lib/ipc \ -I$(KERNEL_ROOT)/services/lib/memory diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_base.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_base.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_base.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_base.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_bsp.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_bsp.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_bsp.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_bsp.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_cru.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_cru.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_cru.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_cru.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_cru_rk3568.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_cru_rk3568.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_cru_rk3568.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_cru_rk3568.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_debug.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_debug.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_debug.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_debug.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_gmac.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_gmac.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_gmac.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_gmac.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_gmac_3568.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_gmac_3568.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_gmac_3568.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_gmac_3568.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_gpio.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_gpio.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_gpio.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_gpio.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_pinctrl_v2.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_pinctrl_v2.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_pinctrl_v2.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_pinctrl_v2.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_timer.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_timer.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/hal_timer.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/hal_timer.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/system_rk3568.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/system_rk3568.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/system_rk3568.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/system_rk3568.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/test_gmac.c b/Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/test_gmac.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/hal/test_gmac.c rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/hal/test_gmac.c diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_base.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_base.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_base.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_base.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_bsp.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_bsp.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_bsp.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_bsp.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_conf.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_conf.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_conf.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_conf.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_cru.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_cru.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_cru.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_cru.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_debug.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_debug.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_debug.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_debug.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_def.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_def.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_def.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_def.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_driver.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_driver.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_driver.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_driver.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_gmac.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_gmac.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_gmac.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_gmac.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_gpio.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_gpio.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_gpio.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_gpio.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_list.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_list.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_list.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_list.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_pinctrl.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_pinctrl.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_pinctrl.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_pinctrl.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_pm.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_pm.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_pm.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_pm.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_timer.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_timer.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/hal_timer.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/hal_timer.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/rk3568.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/rk3568.h similarity index 99% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/rk3568.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/rk3568.h index 09e399c20..3a714cc79 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/rk3568.h +++ b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/rk3568.h @@ -1209,7 +1209,7 @@ struct INTMUX_REG { #define SPI2_BASE 0xFE630000U /* SPI2 base address */ #define SPI3_BASE 0xFE640000U /* SPI3 base address */ #define UART1_BASE 0xFE650000U /* UART1 base address */ -#define UART2_BASE 0xFE660000U /* UART2 base address */ +#define UART2_BASE 0xfeb50000 /* UART2 base address */ #define UART3_BASE 0xFE670000U /* UART3 base address */ #define UART4_BASE 0xFE680000U /* UART4 base address */ #define UART5_BASE 0xFE690000U /* UART5 base address */ diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/soc.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/soc.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/soc.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/soc.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/3568/include/system_rk3568.h b/Ubiquitous/XiZi_AIoT/services/drivers/3588/include/system_rk3568.h similarity index 100% rename from Ubiquitous/XiZi_AIoT/services/drivers/3568/include/system_rk3568.h rename to Ubiquitous/XiZi_AIoT/services/drivers/3588/include/system_rk3568.h diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile index cf73c47ca..573e10e27 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile index 9e260c4b4..7e6b6c96a 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile index 6dfe8d3e5..8339ff83f 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile index 9267ae0a5..8f594775f 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile @@ -9,7 +9,7 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile index dbbeb93e9..18175904b 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile index f8e1072cd..2e9b1d264 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile @@ -9,7 +9,7 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile index a9516161f..78bad72e6 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile index ac290a6eb..f202aed87 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile index 9cedf87e8..8a6401bc5 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile b/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile index 980f671c9..4743c05de 100644 --- a/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile @@ -17,7 +17,7 @@ cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic - board_specs = stub.o endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk index a40f0af62..1713dcddf 100644 --- a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk +++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk @@ -18,7 +18,7 @@ cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic - board_specs = $(KERNEL_ROOT)/services/app/stub.o endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile b/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile index 66082c1f5..9dbade746 100644 --- a/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile @@ -9,7 +9,7 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile index 4c22e10af..af011ddac 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile @@ -8,7 +8,7 @@ toolchain ?= arm-xilinx-eabi- cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 endif -ifeq ($(BOARD), 3568) +ifeq ($(BOARD), 3588) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 cflags = -Wall -O0 -g -std=c11 -mtune=cortex-a55 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie diff --git a/Ubiquitous/XiZi_AIoT/softkernel/main.c b/Ubiquitous/XiZi_AIoT/softkernel/main.c index d19f63d67..ccbd96dbd 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/main.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/main.c @@ -67,7 +67,7 @@ int main(void) ERROR("Failed to create hardkernel owner and softkernel owner.\n"); return -1; } - /* init hardkernel */ + /* init hardkernel (print need after init hardkernel)*/ if (!hardkernel_init(&hardkernel_tag)) { return -1; } @@ -78,7 +78,7 @@ int main(void) secondary_cpu_hardkernel_init(cpu_id, &hardkernel_tag); spinlock_unlock(&whole_kernel_lock); } - + LOG_PRINTF("CPU %d coming \n", cpu_id); spinlock_lock(&whole_kernel_lock); if (cpu_id == 0) { /* init softkernel */ diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile b/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile index 67cd1ed69..9eab5e6ff 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile @@ -2,7 +2,7 @@ #include $(KERNEL_ROOT)/compiler.mk -ifneq ($(findstring $(BOARD), 3568), ) +ifneq ($(findstring $(BOARD), 3588), ) SRC_FILES := kalloc.c pagetable.c pagetable_level3.c buddy.c object_allocator.c share_page.c endif ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), )