feature(hal): rename VADDR_KERNEL_INIT to VADDR_KERNEL

JIRA: RTOS-908
phoenix-rtos · Sep 9, 2024 · 5961bfb · 5961bfb
1 parent 9db2e1c
commit 5961bfb
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -17,6 +17,9 @@ include ../phoenix-rtos-build/Makefile.common
 LDGEN ?= $(CC)
 
 CFLAGS += -I.
+ifeq ($(HAVE_MMU),y)
+CPPFLAGS += -DVADDR_KERNEL=$(VADDR_KERNEL)
+endif
 CPPFLAGS += -DVERSION=\"$(VERSION)\"
 
 OBJS :=

diff --git a/hal/armv7a/imx6ull/Makefile b/hal/armv7a/imx6ull/Makefile
@@ -16,8 +16,6 @@ LDFLAGS+=-Wl,--defsym,_plo_bss=__bss_start
 CFLAGS:=$(filter-out -mfloat-abi% , $(CFLAGS))
 CFLAGS:=$(filter-out -mfpu% , $(CFLAGS))
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 PLO_COMMANDS ?= alias app blob call console copy dump echo erase go help jffs2 kernel map mem phfs script \
   stop test-dev test-ddr wait
 

diff --git a/hal/armv7a/imx6ull/hal.c b/hal/armv7a/imx6ull/hal.c
@@ -148,8 +148,8 @@ addr_t hal_kernelGetAddress(addr_t addr)
 {
 	addr_t offs;
 
-	if ((addr_t)VADDR_KERNEL_INIT != (addr_t)ADDR_DDR) {
-		offs = addr - VADDR_KERNEL_INIT;
+	if ((addr_t)VADDR_KERNEL != (addr_t)ADDR_DDR) {
+		offs = addr - VADDR_KERNEL;
 		addr = ADDR_DDR + offs;
 	}
 

diff --git a/hal/armv7a/zynq7000/Makefile b/hal/armv7a/zynq7000/Makefile
@@ -12,8 +12,6 @@ LDFLAGS := $(filter-out -Tdata% , $(LDFLAGS))
 CFLAGS := $(filter-out -mfloat-abi% , $(CFLAGS))
 CFLAGS := $(filter-out -mfpu% , $(CFLAGS))
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 PLO_COMMANDS ?= alias app blob bitstream call console copy dump echo erase go help jffs2 kernel map mem \
   phfs reboot script stop test-ddr test-dev wait
 

diff --git a/hal/armv7a/zynq7000/hal.c b/hal/armv7a/zynq7000/hal.c
@@ -128,8 +128,8 @@ addr_t hal_kernelGetAddress(addr_t addr)
 {
 	addr_t offs;
 
-	if ((addr_t)VADDR_KERNEL_INIT != (addr_t)ADDR_DDR) {
-		offs = addr - VADDR_KERNEL_INIT;
+	if ((addr_t)VADDR_KERNEL != (addr_t)ADDR_DDR) {
+		offs = addr - VADDR_KERNEL;
 		addr = ADDR_DDR + offs;
 	}
 

diff --git a/hal/ia32/Makefile b/hal/ia32/Makefile
@@ -6,7 +6,6 @@
 # %LICENSE%
 #
 
-CFLAGS += -DVADDR_KERNEL_BASE=$(VADDR_KERNEL_BASE)
 CFLAGS += -Ihal/ia32
 
 PLO_COMMANDS ?= alias app blob call console copy dump echo go help kernel lspci map mem phfs script reboot stop syspage wait

diff --git a/hal/ia32/hal.c b/hal/ia32/hal.c
@@ -36,7 +36,7 @@ extern void hal_timerInit(void);
 
 addr_t hal_kernelGetAddress(addr_t addr)
 {
-	return addr - VADDR_KERNEL_BASE;
+	return addr - VADDR_KERNEL;
 }
 
 

diff --git a/hal/riscv64/generic/Makefile b/hal/riscv64/generic/Makefile
@@ -6,8 +6,6 @@
 # %LICENSE%
 #
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 GCCLIB := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 PLO_COMMANDS ?= alias app blob call console copy dump echo go help kernel map mem phfs reboot script stop wait

diff --git a/hal/riscv64/generic/hal.c b/hal/riscv64/generic/hal.c
@@ -71,7 +71,7 @@ const char *hal_cpuInfo(void)
 
 addr_t hal_kernelGetAddress(addr_t addr)
 {
-	return addr - VADDR_KERNEL_INIT + ADDR_DDR + SIZE_PLO;
+	return addr - VADDR_KERNEL + ADDR_DDR + SIZE_PLO;
 }
 
 

diff --git a/hal/riscv64/noelv/Makefile b/hal/riscv64/noelv/Makefile
@@ -6,8 +6,6 @@
 # %LICENSE%
 #
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 GCCLIB := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 PLO_COMMANDS ?= alias app call console copy dump echo go help kernel map mem phfs reboot script wait

diff --git a/hal/riscv64/noelv/hal.c b/hal/riscv64/noelv/hal.c
@@ -73,7 +73,7 @@ const char *hal_cpuInfo(void)
 
 addr_t hal_kernelGetAddress(addr_t addr)
 {
-	return addr - VADDR_KERNEL_INIT + ADDR_DDR + SIZE_PLO;
+	return addr - VADDR_KERNEL + ADDR_DDR + SIZE_PLO;
 }
 
 

diff --git a/hal/sparcv8leon3/gaisler/generic/Makefile b/hal/sparcv8leon3/gaisler/generic/Makefile
@@ -6,8 +6,6 @@
 # %LICENSE%
 #
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 PLO_COMMANDS ?= alias app blob call console copy dump echo go help jffs2 kernel map mem phfs reboot script stop wait test-dev
 
 PLO_ALLDEVICES := uart-grlib ram-storage

diff --git a/hal/sparcv8leon3/gaisler/generic/hal.c b/hal/sparcv8leon3/gaisler/generic/hal.c
@@ -79,7 +79,7 @@ const char *hal_cpuInfo(void)
 
 addr_t hal_kernelGetAddress(addr_t addr)
 {
-	return addr - VADDR_KERNEL_INIT + ADDR_SRAM;
+	return addr - VADDR_KERNEL + ADDR_SRAM;
 }
 
 

diff --git a/hal/sparcv8leon3/gaisler/gr712rc/Makefile b/hal/sparcv8leon3/gaisler/gr712rc/Makefile
@@ -6,8 +6,6 @@
 # %LICENSE%
 #
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 PLO_COMMANDS ?= alias app blob call console copy dump echo go help jffs2 kernel map mem phfs reboot script stop wait test-dev
 
 PLO_ALLDEVICES := uart-grlib flash-gr712rc

diff --git a/hal/sparcv8leon3/gaisler/gr712rc/hal.c b/hal/sparcv8leon3/gaisler/gr712rc/hal.c
@@ -80,7 +80,7 @@ const char *hal_cpuInfo(void)
 
 addr_t hal_kernelGetAddress(addr_t addr)
 {
-	return addr - VADDR_KERNEL_INIT + ADDR_SRAM;
+	return addr - VADDR_KERNEL + ADDR_SRAM;
 }
 
 

diff --git a/hal/sparcv8leon3/gaisler/gr716/Makefile b/hal/sparcv8leon3/gaisler/gr716/Makefile
@@ -12,8 +12,6 @@ LDFLAGS:=$(filter-out -Tbss% , $(LDFLAGS))
 LDFLAGS:=$(filter-out -Tdata% , $(LDFLAGS))
 LDFLAGS:=$(filter-out -Wl$(comma)--section-start% , $(LDFLAGS))
 
-CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)
-
 PLO_COMMANDS ?= alias app blob call console copy dump echo go help kernel map mem phfs reboot script stop wait
 
 PLO_ALLDEVICES := gpio-gr716 uart-grlib flash-gr716