[board] fix build error

YuzukiHD · Dec 13, 2024 · df0f437 · df0f437
1 parent 2377326
commit df0f437
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 35 deletions.
diff --git a/board/avaota-cam/cdk/avaota_cam.cdkproj b/board/avaota-cam/cdk/avaota_cam.cdkproj
@@ -177,17 +177,17 @@
         <FileOption/>
       </File>
       <VirtualDirectory Name="chips">
-        <VirtualDirectory Name="sun20iw5">
-          <File Name="../../../include/drivers/chips/sun20iw5/reg-ccu.h">
+        <VirtualDirectory Name="sun300iw1">
+          <File Name="../../../include/drivers/chips/sun300iw1/reg-ccu.h">
             <FileOption/>
           </File>
-          <File Name="../../../include/drivers/chips/sun20iw5/reg-dram.h">
+          <File Name="../../../include/drivers/chips/sun300iw1/reg-dram.h">
             <FileOption/>
           </File>
-          <File Name="../../../include/drivers/chips/sun20iw5/reg-ncat.h">
+          <File Name="../../../include/drivers/chips/sun300iw1/reg-ncat.h">
             <FileOption/>
           </File>
-          <File Name="../../../include/drivers/chips/sun20iw5/reg-rproc.h">
+          <File Name="../../../include/drivers/chips/sun300iw1/reg-rproc.h">
             <FileOption/>
           </File>
         </VirtualDirectory>
@@ -407,22 +407,22 @@
         <FileOption/>
       </File>
       <VirtualDirectory Name="chips">
-        <File Name="../../../src/drivers/chips/sun20iw5/sys-clk.c">
+        <File Name="../../../src/drivers/chips/sun300iw1/sys-clk.c">
           <FileOption/>
         </File>
-        <File Name="../../../src/drivers/chips/sun20iw5/sys-dram.c" ExcludeProjConfig="">
+        <File Name="../../../src/drivers/chips/sun300iw1/sys-dram.c" ExcludeProjConfig="">
           <FileOption/>
         </File>
-        <File Name="../../../src/drivers/chips/sun20iw5/sys-rproc.c">
+        <File Name="../../../src/drivers/chips/sun300iw1/sys-rproc.c">
           <FileOption/>
         </File>
-        <File Name="../../../src/drivers/chips/sun20iw5/sys-sid.c">
+        <File Name="../../../src/drivers/chips/sun300iw1/sys-sid.c">
           <FileOption/>
         </File>
-        <File Name="../../../src/drivers/chips/sun20iw5/sys-wdt.c">
+        <File Name="../../../src/drivers/chips/sun300iw1/sys-wdt.c">
           <FileOption/>
         </File>
-        <File Name="../../../src/drivers/chips/sun20iw5/sys-sdhci.c">
+        <File Name="../../../src/drivers/chips/sun300iw1/sys-sdhci.c">
           <FileOption/>
         </File>
       </VirtualDirectory>
@@ -627,11 +627,11 @@
         <Tools/>
       </User>
       <Compiler>
-        <Define>CONFIG_CHIP_SUN20IW5;DEBUG_MODE</Define>
+        <Define>CONFIG_CHIP_SUN300IW1;DEBUG_MODE</Define>
         <Undefine/>
         <Optim>None (-O0)</Optim>
         <DebugLevel>Maximum (-g3)</DebugLevel>
-        <IncludePath>$(ProjectPath);../../../include/;../../../include/arch/riscv/;../../../include/cli/;../../../include/drivers/chips/sun20iw5/;../../../include/drivers/mmc/;../../../include/drivers/pmu/reg/;../../../include/drivers/pmu/;../../../include/drivers/reg/;../../../include/drivers/usb/;../../../include/image/;../../../include/lib/elf/;../../../include/lib/fatfs/;../../../include/lib/fdt/;../../../include/drivers/;../../../include/drivers/chips/;../../../include/drivers/mtd</IncludePath>
+        <IncludePath>$(ProjectPath);../../../include/;../../../include/arch/riscv/;../../../include/cli/;../../../include/drivers/chips/sun300iw1/;../../../include/drivers/mmc/;../../../include/drivers/pmu/reg/;../../../include/drivers/pmu/;../../../include/drivers/reg/;../../../include/drivers/usb/;../../../include/image/;../../../include/lib/elf/;../../../include/lib/fatfs/;../../../include/lib/fdt/;../../../include/drivers/;../../../include/drivers/chips/;../../../include/drivers/mtd</IncludePath>
         <OtherFlags>-nostdlib -nostdinc -march=rv32imafcxthead -mabi=ilp32f -Wno-int-to-pointer-cast -Wno-int-to-pointer-cast -Wno-shift-count-overflow -Wno-builtin-declaration-mismatch -Wno-pointer-to-int-cast -Wno-implicit-function-declaration -Wno-discarded-qualifiers -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-parentheses</OtherFlags>
         <Verbose>no</Verbose>
         <Ansi>no</Ansi>
@@ -648,7 +648,7 @@
       <Asm>
         <Define/>
         <Undefine/>
-        <IncludePath>$(ProjectPath);../../../include/;../../../include/arch/riscv/;../../../include/cli/;../../../include/drivers/chips/sun20iw5/;../../../include/drivers/mmc/;../../../include/drivers/pmu/reg/;../../../include/drivers/pmu/;../../../include/drivers/reg/;../../../include/drivers/usb/;../../../include/image/;../../../include/lib/elf/;../../../include/lib/fatfs/;../../../include/lib/fdt/;../../../include/drivers/;../../../include/drivers/chips/</IncludePath>
+        <IncludePath>$(ProjectPath);../../../include/;../../../include/arch/riscv/;../../../include/cli/;../../../include/drivers/chips/sun300iw1/;../../../include/drivers/mmc/;../../../include/drivers/pmu/reg/;../../../include/drivers/pmu/;../../../include/drivers/reg/;../../../include/drivers/usb/;../../../include/image/;../../../include/lib/elf/;../../../include/lib/fatfs/;../../../include/lib/fdt/;../../../include/drivers/;../../../include/drivers/chips/</IncludePath>
         <OtherFlags/>
         <DebugLevel>none</DebugLevel>
       </Asm>

diff --git a/cmake/board/avaota-cam.cmake b/cmake/board/avaota-cam.cmake
@@ -2,11 +2,11 @@
 
 set(CONFIG_ARCH_RISCV32 True)
 set(CONFIG_ARCH_RISCV32_CORE_E907 True)
-set(CONFIG_CHIP_SUN20IW5 True)
+set(CONFIG_CHIP_SUN300IW1 True)
 set(CONFIG_CHIP_MMC_V2 True)
 set(CONFIG_BOARD_AVAOTA-CAM True)
 
-add_definitions(-DCONFIG_CHIP_SUN20IW5)
+add_definitions(-DCONFIG_CHIP_SUN300IW1)
 add_definitions(-DCONFIG_CHIP_MMC_V2)
 add_definitions(-DCONFIG_FATFS_CACHE_SIZE=0xFFFFFFF)
 add_definitions(-DCONFIG_FATFS_CACHE_ADDR=0x82000000)

diff --git a/include/drivers/chips/sun20iw5/reg-ccu.h → include/drivers/chips/sun300iw1/reg-ccu.h b/include/drivers/chips/sun20iw5/reg-ccu.h → include/drivers/chips/sun300iw1/reg-ccu.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 
-#ifndef __SUN20IW5_REG_CCU_H__
-#define __SUN20IW5_REG_CCU_H__
+#ifndef __SUN300IW1_REG_CCU_H__
+#define __SUN300IW1_REG_CCU_H__
 
 #include <reg-ncat.h>
 
@@ -1885,4 +1885,4 @@
      << PLL_CPU_CTRL_REG_LOCK_ENABLE_OFFSET)
 #define PLL_LOCK_MASK (PLL_CPU_CTRL_REG_LOCK_CLEAR_MASK)
 
-#endif// __SUN20IW5_REG_CCU_H__
+#endif// __SUN300IW1_REG_CCU_H__
diff --git a/include/drivers/chips/sun20iw5/reg-dram.h → include/drivers/chips/sun300iw1/reg-dram.h b/include/drivers/chips/sun20iw5/reg-dram.h → include/drivers/chips/sun300iw1/reg-dram.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 
-#ifndef __SUN20IW5_REG_DRAM_H__
-#define __SUN20IW5_REG_DRAM_H__
+#ifndef __SUN300IW1_REG_DRAM_H__
+#define __SUN300IW1_REG_DRAM_H__
 
 #define SDRAM_BASE (0x80000000)
 
@@ -106,4 +106,4 @@
 #define ZQ_RES_CTRL_REG (SUNXI_SYSCTRL_BASE + 0x168)
 #define ZQ_RES_STATUS_REG (SUNXI_SYSCTRL_BASE + 0x16C)
 
-#endif /* __SUN20IW5_REG_DRAM_H__ */
+#endif /* __SUN300IW1_REG_DRAM_H__ */
diff --git a/include/drivers/chips/sun20iw5/reg-ncat.h → include/drivers/chips/sun300iw1/reg-ncat.h b/include/drivers/chips/sun20iw5/reg-ncat.h → include/drivers/chips/sun300iw1/reg-ncat.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 
-#ifndef __SUN20IW5_REG_NCAT_H__
-#define __SUN20IW5_REG_NCAT_H__
+#ifndef __SUN300IW1_REG_NCAT_H__
+#define __SUN300IW1_REG_NCAT_H__
 
 #define SUNXI_BROM_BASE 0x00000000
 #define SUNXI_SRAM_C_BASE 0x02000000
@@ -101,4 +101,4 @@
 #define POR_RESET_CTRL_REG (0X24)
 #define VCC33_DET_RSTN_ENABLE (1 << 4)
 
-#endif// __SUN20IW5_REG_NCAT_H__
+#endif// __SUN300IW1_REG_NCAT_H__
diff --git a/include/drivers/chips/sun20iw5/reg-rproc.h → include/drivers/chips/sun300iw1/reg-rproc.h b/include/drivers/chips/sun20iw5/reg-rproc.h → include/drivers/chips/sun300iw1/reg-rproc.h
diff --git a/include/drivers/reg/reg-ccu.h b/include/drivers/reg/reg-ccu.h
@@ -17,8 +17,8 @@ extern "C" {
     #include <sun55iw3/reg-ccu.h>
 #elif defined(CONFIG_CHIP_SUN50IW10)
     #include <sun50iw10/reg-ccu.h>
-#elif defined(CONFIG_CHIP_SUN20IW5)
-    #include <sun20iw5/reg-ccu.h>
+#elif defined(CONFIG_CHIP_SUN300IW1)
+    #include <sun300iw1/reg-ccu.h>
 #elif defined(CONFIG_CHIP_SUN60IW2)
     #include <sun60iw2/reg-ccu.h>
 #else

diff --git a/include/drivers/reg/reg-dram.h b/include/drivers/reg/reg-dram.h
@@ -13,8 +13,8 @@ extern "C" {
 #include <sun8iw20/reg-dram.h>
 #elif defined(CONFIG_CHIP_SUN20IW1)
 #include <sun20iw1/reg-dram.h>
-#elif defined(CONFIG_CHIP_SUN20IW5)
-#include <sun20iw5/reg-dram.h>
+#elif defined(CONFIG_CHIP_SUN300IW1)
+#include <sun300iw1/reg-dram.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/include/drivers/reg/reg-ncat.h b/include/drivers/reg/reg-ncat.h
@@ -19,8 +19,8 @@ extern "C" {
     #include <sun55iw3/reg-ncat.h>
 #elif defined(CONFIG_CHIP_SUN50IW10)
     #include <sun50iw10/reg-ncat.h>
-#elif defined(CONFIG_CHIP_SUN20IW5)
-    #include <sun20iw5/reg-ncat.h>
+#elif defined(CONFIG_CHIP_SUN300IW1)
+    #include <sun300iw1/reg-ncat.h>
 #elif defined(CONFIG_CHIP_SUN60IW2)
     #include <sun60iw2/reg-ncat.h>
 #else

diff --git a/include/drivers/reg/reg-rproc.h b/include/drivers/reg/reg-rproc.h
@@ -13,8 +13,8 @@ extern "C" {
 #include <sun20iw1/reg-rproc.h>
 #elif defined(CONFIG_CHIP_SUN55IW3)
 #include <sun55iw3/reg-rproc.h>
-#elif defined(CONFIG_CHIP_SUN20IW5)
-#include <sun20iw5/reg-rproc.h>
+#elif defined(CONFIG_CHIP_SUN300IW1)
+#include <sun300iw1/reg-rproc.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/src/drivers/chips/CMakeLists.txt b/src/drivers/chips/CMakeLists.txt
@@ -10,8 +10,8 @@ elseif(CONFIG_CHIP_SUN55IW3)
     add_subdirectory(sun55iw3)
 elseif(CONFIG_CHIP_SUN50IW10)
     add_subdirectory(sun50iw10)
-elseif(CONFIG_CHIP_SUN20IW5)
-    add_subdirectory(sun20iw5)
+elseif(CONFIG_CHIP_SUN300IW1)
+    add_subdirectory(sun300iw1)
 elseif(CONFIG_CHIP_SUN60IW2)
     add_subdirectory(sun60iw2)
 endif()
diff --git a/src/drivers/chips/sun20iw5/CMakeLists.txt → src/drivers/chips/sun300iw1/CMakeLists.txt b/src/drivers/chips/sun20iw5/CMakeLists.txt → src/drivers/chips/sun300iw1/CMakeLists.txt
diff --git a/src/drivers/chips/sun20iw5/sys-clk.c → src/drivers/chips/sun300iw1/sys-clk.c b/src/drivers/chips/sun20iw5/sys-clk.c → src/drivers/chips/sun300iw1/sys-clk.c
diff --git a/src/drivers/chips/sun20iw5/sys-dram.c → src/drivers/chips/sun300iw1/sys-dram.c b/src/drivers/chips/sun20iw5/sys-dram.c → src/drivers/chips/sun300iw1/sys-dram.c
diff --git a/src/drivers/chips/sun20iw5/sys-rproc.c → src/drivers/chips/sun300iw1/sys-rproc.c b/src/drivers/chips/sun20iw5/sys-rproc.c → src/drivers/chips/sun300iw1/sys-rproc.c
diff --git a/src/drivers/chips/sun20iw5/sys-sdhci.c → src/drivers/chips/sun300iw1/sys-sdhci.c b/src/drivers/chips/sun20iw5/sys-sdhci.c → src/drivers/chips/sun300iw1/sys-sdhci.c
diff --git a/src/drivers/chips/sun20iw5/sys-sid.c → src/drivers/chips/sun300iw1/sys-sid.c b/src/drivers/chips/sun20iw5/sys-sid.c → src/drivers/chips/sun300iw1/sys-sid.c
diff --git a/src/drivers/chips/sun20iw5/sys-wdt.c → src/drivers/chips/sun300iw1/sys-wdt.c b/src/drivers/chips/sun20iw5/sys-wdt.c → src/drivers/chips/sun300iw1/sys-wdt.c