rename rk3500 to nanopi_r5s

Author: zhengchenxiao

models/Kconfig

@@ -6,7 +6,7 @@ config TARGET_FILE
 mainmenu "Chip and Board Configuration"
 
 #
-# 厂商选择
+# 芯片厂商选择
 #
 choice
     prompt "Select Vendor"
@@ -60,7 +60,7 @@ if VENDOR_NXP
     endchoice
 
     #
-    # 根据选择的芯片配置开发板
+    # 根据选择的芯片配置开发板厂商
     #
     if CHIP_MODEL_IMX
         choice
@@ -133,19 +133,41 @@ endif
 # 如果选择了 Rockchip，配置相应芯片和开发板
 #
 if VENDOR_ROCKCHIP
-    choice
-        prompt "Select Chip Model for Rockchip"
-        default CHIP_MODEL_RK3500
-
-    config CHIP_MODEL_RK3500
-        bool "RK3500 Chip"
+    menu "RKxx soc"
+    config CHIP_MODEL_RK3568
+        bool "RK3568 Chip"
+        default y
         help
-          Select RK3500 chip.
+          Select RK3568 series chips.
+    endmenu
+    #
+    # 根据 RK3568 芯片选择开发板
+    #
+    if CHIP_MODEL_RK3568
+        menu "FriendlyARM Company"
 
-    endchoice
-    
+            config COMPANY_FRIENDLY
+                bool "FriendlyARM Company"
+                default y
+                help
+                  Select FriendlyARM Company for RK3568.
+
+            if COMPANY_FRIENDLY
+                menu "NanoPi Series"
+
+                    config BOARD_NANOPI_R5S
+                        bool "NanoPi R5S Board"
+                        help
+                          Select NanoPi R5S board for RK3568.
+
+                endmenu
+            endif
+
+        endmenu
+    endif
 endif
 
+
 #
 # 如果选择了 QEMU，配置相应的开发板
 #

…packages/r/rt-thread/bsp/rk3500/rkxx_fdt …es/r/rt-thread/bsp/rk3500/nanopi_r5s.fdtrepo/packages/r/rt-thread/bsp/rk3500/rkxx_fdt renamed to repo/packages/r/rt-thread/bsp/rk3500/nanopi_r5s.fdt repo/packages/r/rt-thread/bsp/rk3500/rkxx_fdt renamed to repo/packages/r/rt-thread/bsp/rk3500/nanopi_r5s.fdt

@@ -44,25 +44,23 @@ do
         end
 
         -- 获取配置项的值
-        local function get_config_values(config_file, vendor_key, model_key, board_key,kernel_key)
+        local function get_config_values(config_file,configkey)
             local content = read_config_file(config_file)
-            local vendor_pattern = vendor_key .. "([^%s=]*)=y"
-            local model_pattern = model_key .. "([^%s=]*)=y"
-            local board_pattern = board_key .. "([^%s=]*)=y"
-            local kernel_pattern = kernel_key .. "([^%s=]*)=y"
+            local key = configkey .. "([^%s=]*)=y"
 
-            local vendor = content:match(vendor_pattern)
-            local model = content:match(model_pattern)
-            local board = content:match(board_pattern)
-            local kernel_source = content:match(kernel_pattern)
-            if kernel_source == "LOCAL" then
+            local config_key = content:match(key)
+            if config_key == "LOCAL" then
             local kernel_config = 'CONFIG_KERNEL_LOCAL_DIR="(.-)"'
-            kernel_source = content:match(kernel_config)
+            config_key = content:match(kernel_config)
         end
-            return vendor, model, board, kernel_source
+            return config_key
         end
 
-        local vendor, model, board, kernel_source= get_config_values(config_file, "CONFIG_VENDOR_", "CONFIG_CHIP_MODEL_", "CONFIG_BOARD_", "CONFIG_KERNEL_SOURCE_")
+        local vendor = get_config_values(config_file, "CONFIG_VENDOR_", "CONFIG_CHIP_MODEL_", "CONFIG_BOARD_", "CONFIG_KERNEL_SOURCE_")
+        local model = get_config_values(config_file, "CONFIG_CHIP_MODEL_")
+        local board = get_config_values(config_file, "CONFIG_BOARD_")
+        local company = get_config_values(config_file, "CONFIG_COMPANY_")
+        local kernel_source = get_config_values(config_file, "CONFIG_KERNEL_SOURCE_")
 
         -- 获取 package 的安装目录
         local rt_install_dir = package:installdir()
@@ -93,13 +91,15 @@ do
             print("RT-Thread repository already exists in package directory. Skipping clone.")
     end
 
-        if vendor or model or board then
+        if vendor or model or board or company then
             local parts = {}
             if vendor then table.insert(parts, vendor:lower()) end
             if model then table.insert(parts, model:lower()) end
+            if company then table.insert(parts, company:lower()) end
             if board then table.insert(parts, board:lower()) end
             local bsp_dir = table.concat(parts, "_")
             local bsp_dir = bsp_dir:lower()  -- BSP小写
+            print("bsp_dir:",bsp_dir)
             bsp_dir = bsp_dir .. ".build"
             local bsp_file = bsp_dir .. ".lua"
             local bsp_packages = path.join(os.scriptdir(), "bsp")

…/rt-thread/bsp/rk3500/rkxx_idbloader.img …read/bsp/rk3500/nanopi_r5s_idbloader.imgrepo/packages/r/rt-thread/bsp/rk3500/rkxx_idbloader.img renamed to repo/packages/r/rt-thread/bsp/rk3500/nanopi_r5s_idbloader.img repo/packages/r/rt-thread/bsp/rk3500/rkxx_idbloader.img renamed to repo/packages/r/rt-thread/bsp/rk3500/nanopi_r5s_idbloader.img

@@ -91,9 +91,9 @@ local function get_other_files_from_curdir()
     print("Base directory: ", file_dir)
 
     local files = {
-        uboot = path.join(file_dir, "rkxx_u-boot.itb"),
-        fdt = path.join(file_dir, "rkxx_fdt"),
-        idbloader = path.join(file_dir, "rkxx_idbloader.img"),
+        uboot = path.join(file_dir, "nanopi_r5s_u-boot.itb"),
+        fdt = path.join(file_dir, "nanopi_r5s.fdt"),
+        idbloader = path.join(file_dir, "nanopi_r5s_idbloader.img"),
     }
 
     for name, path in pairs(files) do