diff --git a/README.md b/README.md index 3e00a28c8..ff782cc97 100755 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ kernelconfig -config kernel and save defconfig" [5] RV1106_Luckfox_Pico_Ultra [6] RV1106_Luckfox_Pico_Ultra_W [7] custom - Which would you like? [0~7]: + Which would you like? [0~7][default:0]: ``` + Output the supported storage media for the corresponding Luckfox-pico hardware model. Enter the corresponding number to proceed to the root filesystem options (press Enter to select option [0] directly).For example, Luckfox Pico Plus. ```shell @@ -116,7 +116,7 @@ kernelconfig -config kernel and save defconfig" [0] SD_CARD [1] SPI_NAND - Which would you like? [0~1]: + Which would you like? [0~1][default:0]: ``` + Output the supported root filesystem types for the corresponding Luckfox-pico hardware model. Enter the corresponding number to complete the configuration (press Enter to select option [0] directly). ```shell @@ -125,7 +125,7 @@ kernelconfig -config kernel and save defconfig" [0] Buildroot(Support Rockchip official features) [1] Ubuntu(Support for the apt package management tool) - Which would you like? [0~1]: + Which would you like? [0~1][default:0]: ``` + If you need to use the old configuration method or a custom board support file, select the "[7]custom" option when configuring the Luckfox-pico hardware model. ```shell @@ -140,10 +140,10 @@ kernelconfig -config kernel and save defconfig" [5] RV1106_Luckfox_Pico_Ultra [6] RV1106_Luckfox_Pico_Ultra_W [7] custom - Which would you like? [0~7]: 7 + Which would you like? [0~7][default:0]: 7 ---------------------------------------------------------------- 0. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk - boot medium(启动介质): EMMC + boot medium(启动介质): EMMC system version(系统版本): Buildroot hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra applicaton(应用场景): IPC @@ -151,7 +151,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- 1. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk - boot medium(启动介质): EMMC + boot medium(启动介质): EMMC system version(系统版本): Buildroot hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra_W applicaton(应用场景): IPC @@ -159,7 +159,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- 2. BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk - boot medium(启动介质): EMMC + boot medium(启动介质): EMMC system version(系统版本): Ubuntu hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra applicaton(应用场景): IPC @@ -167,7 +167,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- 3. BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk - boot medium(启动介质): EMMC + boot medium(启动介质): EMMC system version(系统版本): Ubuntu hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra_W applicaton(应用场景): IPC @@ -175,7 +175,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- 4. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico-IPC.mk - boot medium(启动介质): SD_CARD + boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico applicaton(应用场景): IPC @@ -183,85 +183,101 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- 5. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk - boot medium(启动介质): SD_CARD + boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A applicaton(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 6. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Plus - applicaton(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 7. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Max - applicaton(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 8. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1103_Luckfox_Pico - applicaton(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 9. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A - applicaton(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 10. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1103_Luckfox_Pico_Plus - applicaton(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 11. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max - applicaton(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 12. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk - boot medium(启动介质): SPI_NAND + 6. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk + boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B applicaton(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 13. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk - boot medium(启动介质): SPI_NAND + 7. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_Plus applicaton(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk - boot medium(启动介质): SPI_NAND + 8. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk + boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max applicaton(应用场景): IPC ---------------------------------------------------------------- - Which would you like? [0]: + ---------------------------------------------------------------- + 9. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 10. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 11. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_B-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 12. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico_Plus + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 13. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk + boot medium(启动介质): SPI_NAND + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 15. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + boot medium(启动介质): SPI_NAND + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Plus + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 16. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk + boot medium(启动介质): SPI_NAND + system version(系统版本): Buildroot + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + Which would you like? [default:0]: ``` Enter the corresponding board support file number to complete the configuration. #### Set Buildroot System Default WIFI Configuration diff --git a/README_CN.md b/README_CN.md index adae529e0..9d1e3f06d 100755 --- a/README_CN.md +++ b/README_CN.md @@ -89,177 +89,193 @@ kernelconfig -config kernel and save defconfig" ```shell ./build.sh lunch ``` -输出对应的Luckfox-pico硬件型号,输入对应编号后进入存储介质选项（直接回车选择序号[0]选项） -```shell -You're building on Linux - Lunch menu...pick the Luckfox Pico hardware version: - 选择 Luckfox Pico 硬件版本: - [0] RV1103_Luckfox_Pico - [1] RV1103_Luckfox_Pico_Mini_A - [2] RV1103_Luckfox_Pico_Mini_B - [3] RV1103_Luckfox_Pico_Plus - [4] RV1106_Luckfox_Pico_Pro_Max - [5] RV1106_Luckfox_Pico_Ultra - [6] RV1106_Luckfox_Pico_Ultra_W - [7] custom -Which would you like? [0~7]: -``` -输出对应的Luckfox-pico硬件型号支持的存储介质,输入对应编号后进入根文件系统选项（直接回车选择序号[0]选项） ++ 输出对应的Luckfox-pico硬件型号,输入对应编号后进入存储介质选项（直接回车选择序号[0]选项） + ```shell + You're building on Linux + Lunch menu...pick the Luckfox Pico hardware version: + 选择 Luckfox Pico 硬件版本: + [0] RV1103_Luckfox_Pico + [1] RV1103_Luckfox_Pico_Mini_A + [2] RV1103_Luckfox_Pico_Mini_B + [3] RV1103_Luckfox_Pico_Plus + [4] RV1106_Luckfox_Pico_Pro_Max + [5] RV1106_Luckfox_Pico_Ultra + [6] RV1106_Luckfox_Pico_Ultra_W + [7] custom + Which would you like? [0~7][default:0]: + ``` ++ 输出对应的Luckfox-pico硬件型号支持的存储介质,输入对应编号后进入根文件系统选项（直接回车选择序号[0]选项） 以Luckfox Pico Plus为例 -```shell - Lunch menu...pick the boot medium: - 选择启动媒介: - [0] SD_CARD - [1] SPI_NAND + ```shell + Lunch menu...pick the boot medium: + 选择启动媒介: + [0] SD_CARD + [1] SPI_NAND -Which would you like? [0~1]: -``` -输出对应的Luckfox-pico硬件型号支持的根文件系统类型,输入对应编号后完成配置(直接回车选择序号[0]选项) -```shell - Lunch menu...pick the system version: - 选择系统版本: - [0] Buildroot(Support Rockchip official features) - [1] Ubuntu(Support for the apt package management tool) + Which would you like? [0~1][default:0]: + ``` ++ 输出对应的Luckfox-pico硬件型号支持的根文件系统类型,输入对应编号后完成配置(直接回车选择序号[0]选项) + ```shell + Lunch menu...pick the system version: + 选择系统版本: + [0] Buildroot(Support Rockchip official features) + [1] Ubuntu(Support for the apt package management tool) -Which would you like? [0~1]: -``` -如果需要使用旧的配置方式或者使用自定义的板级支持文件，在配置Luckfox-pico硬件型号时，选择“[7]custom”选项 -```shell -You're building on Linux - Lunch menu...pick the Luckfox Pico hardware version: - 选择 Luckfox Pico 硬件版本: - [0] RV1103_Luckfox_Pico - [1] RV1103_Luckfox_Pico_Mini_A - [2] RV1103_Luckfox_Pico_Mini_B - [3] RV1103_Luckfox_Pico_Plus - [4] RV1106_Luckfox_Pico_Pro_Max - [5] RV1106_Luckfox_Pico_Ultra - [6] RV1106_Luckfox_Pico_Ultra_W - [7] custom -Which would you like? [0~7]: 7 ----------------------------------------------------------------- -0. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk - boot medium(启动介质): EMMC - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra - applicaton(应用场景): IPC ----------------------------------------------------------------- + Which would you like? [0~1][default:0]: + ``` ++ 如果需要使用旧的配置方式或者使用自定义的板级支持文件，在配置Luckfox-pico硬件型号时，选择“[7]custom”选项 + ```shell + You're building on Linux + Lunch menu...pick the Luckfox Pico hardware version: + 选择 Luckfox Pico 硬件版本: + [0] RV1103_Luckfox_Pico + [1] RV1103_Luckfox_Pico_Mini_A + [2] RV1103_Luckfox_Pico_Mini_B + [3] RV1103_Luckfox_Pico_Plus + [4] RV1106_Luckfox_Pico_Pro_Max + [5] RV1106_Luckfox_Pico_Ultra + [6] RV1106_Luckfox_Pico_Ultra_W + [7] custom + Which would you like? [0~7][default:0]: 7 + ---------------------------------------------------------------- + 0. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk + boot medium(启动介质): EMMC + system version(系统版本): Buildroot + hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -1. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk - boot medium(启动介质): EMMC - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra_W - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 1. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk + boot medium(启动介质): EMMC + system version(系统版本): Buildroot + hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra_W + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -2. BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk - boot medium(启动介质): EMMC - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 2. BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk + boot medium(启动介质): EMMC + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -3. BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk - boot medium(启动介质): EMMC - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra_W - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 3. BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk + boot medium(启动介质): EMMC + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1106_Luckfox_Pico_Ultra_W + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -4. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 4. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -5. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 5. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -6. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Plus - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 6. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -7. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Max - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 7. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Plus + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -8. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1103_Luckfox_Pico - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 8. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Buildroot + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -9. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 9. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -10. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1103_Luckfox_Pico_Plus - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 10. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -11. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Ubuntu - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 11. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_B-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -12. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk - boot medium(启动介质): SPI_NAND - system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 12. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1103_Luckfox_Pico_Plus + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -13. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk - boot medium(启动介质): SPI_NAND - system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Plus - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 13. BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk + boot medium(启动介质): SD_CARD + system version(系统版本): Ubuntu + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max + applicaton(应用场景): IPC + ---------------------------------------------------------------- ----------------------------------------------------------------- -14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk - boot medium(启动介质): SPI_NAND - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max - applicaton(应用场景): IPC ----------------------------------------------------------------- + ---------------------------------------------------------------- + 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk + boot medium(启动介质): SPI_NAND + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + applicaton(应用场景): IPC + ---------------------------------------------------------------- -Which would you like? [0]: -``` -输入对应的板级支持文件序号完成配置 + ---------------------------------------------------------------- + 15. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + boot medium(启动介质): SPI_NAND + system version(系统版本): Buildroot + hardware version(硬件版本): RV1103_Luckfox_Pico_Plus + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + ---------------------------------------------------------------- + 16. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk + boot medium(启动介质): SPI_NAND + system version(系统版本): Buildroot + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max + applicaton(应用场景): IPC + ---------------------------------------------------------------- + + Which would you like? [default:0]: + ``` + 输入对应的板级支持文件序号完成配置 #### 设置 Buildroot 系统默认 WIFI 配置 * 进入板级配置存放目录 ```shell diff --git a/project/build.sh b/project/build.sh index f72432317..84efae612 100755 --- a/project/build.sh +++ b/project/build.sh @@ -159,9 +159,9 @@ function choose_target_board() { echo "${space8}${space8}[5] RV1106_Luckfox_Pico_Ultra" echo "${space8}${space8}[6] RV1106_Luckfox_Pico_Ultra_W" echo "${space8}${space8}[7] custom" - read -p "Which would you like? [0~7]: " HW_INDEX + read -p "Which would you like? [0~7][default:0]: " HW_INDEX - if [ -z "$HW_INDEX" ] ;then + if [ -z "$HW_INDEX" ]; then HW_INDEX=0 fi @@ -199,7 +199,7 @@ function choose_target_board() { done local INDEX - read -p "Which would you like? [0]: " INDEX + read -p "Which would you like? [default:0]: " INDEX INDEX=$((${INDEX:-0})) if echo $INDEX | grep -vq [^0-9]; then @@ -219,20 +219,20 @@ function choose_target_board() { echo -e "${C_GREEN} "${space8}选择启动媒介:"${C_NORMAL}" if (("$HW_INDEX" >= 0 && "$HW_INDEX" < 2)); then echo "${space8}${space8}[0] SD_CARD" - read -p "Which would you like? [0]: " BM_INDEX + read -p "Which would you like? [0][default:0]: " BM_INDEX MAX_BM_INDEX=0 elif (("$HW_INDEX" >= 2 && "$HW_INDEX" < 5)); then echo "${space8}${space8}[0] SD_CARD" echo "${space8}${space8}[1] SPI_NAND" - read -p "Which would you like? [0~1]: " BM_INDEX + read -p "Which would you like? [0~1][default:0]: " BM_INDEX MAX_BM_INDEX=1 elif (("$HW_INDEX" >= 5 && "$HW_INDEX" < 8)); then echo "${space8}${space8}[0] EMMC" - read -p "Which would you like? [0]: " BM_INDEX + read -p "Which would you like? [0][default:0]: " BM_INDEX MAX_BM_INDEX=0 fi - if [ -z "$BM_INDEX" ] ;then + if [ -z "$BM_INDEX" ]; then BM_INDEX=0 fi @@ -244,25 +244,25 @@ function choose_target_board() { msg_error "Error: BM_INDEX is not in the range ." exit 1 fi - - if (("$HW_INDEX" >= 5 && "$HW_INDEX" < 8)); then - BM_INDEX=$BM_INDEX+2 - fi fi # Get System Version - local SYS_INDEX + local SYS_INDEX MAX_SYS_INDEX echo -e "${C_GREEN} "${space8}Lunch menu...pick the system version:"${C_NORMAL}" echo -e "${C_GREEN} "${space8}选择系统版本:"${C_NORMAL}" - echo "${space8}${space8}[0] Buildroot(Support Rockchip official features) " - echo "${space8}${space8}[1] Ubuntu(Support for the apt package management tool)" - #echo "${space8}${space8}[2] Alpine(Supports the APK package management tool and is relatively streamlined)" - echo "" + if (("$BM_INDEX" == 1)); then + echo "${space8}${space8}[0] Buildroot(Support Rockchip official features) " + read -p "Which would you like? [0~1][default:0]: " SYS_INDEX + MAX_SYS_INDEX=0 + elif (("$BM_INDEX" == 0)); then + echo "${space8}${space8}[0] Buildroot(Support Rockchip official features) " + echo "${space8}${space8}[1] Ubuntu(Support for the apt package management tool)" + read -p "Which would you like? [0~1][default:0]: " SYS_INDEX + MAX_SYS_INDEX=1 + fi - read -p "Which would you like? [0~1]: " SYS_INDEX - - if [ -z "$SYS_INDEX" ] ;then + if [ -z "$SYS_INDEX" ]; then SYS_INDEX=0 fi @@ -270,17 +270,25 @@ function choose_target_board() { msg_error "Error: SYS_INDEX is not a number." exit 1 else - if (($SYS_INDEX < 0 || $SYS_INDEX > 2)); then + if (($SYS_INDEX < 0 || $SYS_INDEX > $MAX_SYS_INDEX)); then msg_error "Error: SYS_INDEX is not in the range 0-1." exit 1 fi fi + # EMMC + if (("$HW_INDEX" >= 5 && "$HW_INDEX" < 8)); then + BM_INDEX=$BM_INDEX+2 + fi + RK_BUILD_TARGET_BOARD="BoardConfig_IPC/BoardConfig-${LF_BOOT_MEDIA[$BM_INDEX]}-${LF_SYSTEM[$SYS_INDEX]}-${LF_HARDWARE[$HW_INDEX]}-IPC.mk" } function build_select_board() { - RK_TARGET_BOARD_ARRAY=( $(cd ${TARGET_PRODUCT_DIR}/; ls BoardConfig_*/BoardConfig*.mk | sort) ) + RK_TARGET_BOARD_ARRAY=($( + cd ${TARGET_PRODUCT_DIR}/ + ls BoardConfig_*/BoardConfig*.mk | sort + )) RK_TARGET_BOARD_ARRAY_LEN=${#RK_TARGET_BOARD_ARRAY[@]} if [ $RK_TARGET_BOARD_ARRAY_LEN -eq 0 ]; then @@ -395,7 +403,7 @@ function usage() { echo "check -check the environment of building" echo "info -see the current board building information" echo "" - echo "buildrootconfig -config buildroot and save defconfig" + echo "buildrootconfig -config b # EMMCuildroot and save defconfig" echo "kernelconfig -config kernel and save defconfig" echo "" echo "Default option is 'allsave'." @@ -2332,4 +2340,5 @@ while [ $# -ne 0 ]; do fi done -eval "${option:-build_allsave}" \ No newline at end of file +eval "${option:-build_allsave}" + diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk index e744f3bc4..cfe7bda74 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk @@ -62,7 +62,7 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ export LF_TARGET_ROOTFS=ubuntu # SUBMODULES ： github/gitee -export LF_SUBMODULES_BY=gitee +export LF_SUBMODULES_BY=github # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk index 2f10ff16e..08f9a3587 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk @@ -62,7 +62,7 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ export LF_TARGET_ROOTFS=ubuntu # SUBMODULES ： github/gitee -export LF_SUBMODULES_BY=gitee +export LF_SUBMODULES_BY=github # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_w_defconfig diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk new file mode 100755 index 000000000..cec57e79c --- /dev/null +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk @@ -0,0 +1,104 @@ +#!/bin/bash + +################################################# +# Board Config +################################################# + +# Target CHIP +export RK_CHIP=rv1106 + +# app config +export RK_APP_TYPE=RKIPC_RV1103 + +# Config CMA size in environment +export RK_BOOTARGS_CMA_SIZE="24M" + +# Kernel dts +export RK_KERNEL_DTS=rv1103g-luckfox-pico-mini-b.dts + +################################################# +# BOOT_MEDIUM +################################################# + +# Target boot medium: sd_card/spi_nor/spi_nand +export RK_BOOT_MEDIUM=sd_card + +# Uboot defconfig fragment +export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-emmc.config + +# specify post.sh for delete/overlay files +# export RK_PRE_BUILD_OEM_SCRIPT=rv1103-spi_nor-post.sh + +# config partition in environment +# RK_PARTITION_CMD_IN_ENV format: +# [,] +# := [@](part-name) +# Note: +# If the first partition offset is not 0x0, it must be added. Otherwise, it needn't adding. +export RK_PARTITION_CMD_IN_ENV="32K(env),512K@32K(idblock),256K(uboot),32M(boot),512M(oem),256M(userdata),6G(rootfs),-(media)" + +# config partition's filesystem type (squashfs is readonly) +# emmc: squashfs/ext4 +# nand: squashfs/ubifs +# spi nor: squashfs/jffs2 +# RK_PARTITION_FS_TYPE_CFG format: +# AAAA:/BBBB/CCCC@ext4 +# AAAA ----------> partition name +# /BBBB/CCCC ----> partition mount point +# ext4 ----------> partition filesystem type +export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/oem@ext4 + +# config filesystem compress (Just for squashfs or ubifs) +# squashfs: lz4/lzo/lzma/xz/gzip, default xz +# ubifs: lzo/zlib, default lzo +# export RK_SQUASHFS_COMP=xz +# export RK_UBIFS_COMP=lzo + +################################################# +# TARGET_ROOTFS +################################################# + +# Target rootfs : ubuntu(only sd_card)/buildroot/busybox +export LF_TARGET_ROOTFS=buildroot + +# Buildroot defconfig +export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig + +################################################# +# Defconfig +################################################# + +# Target arch +export RK_ARCH=arm + +# Target Toolchain Cross Compile +export RK_TOOLCHAIN_CROSS=arm-rockchip830-linux-uclibcgnueabihf + +#misc image +export RK_MISC=wipe_all-misc.img + +# Uboot defconfig +export RK_UBOOT_DEFCONFIG=luckfox_rv1106_uboot_defconfig + +# Kernel defconfig +export RK_KERNEL_DEFCONFIG=luckfox_rv1106_linux_defconfig + +# Config sensor IQ files +# RK_CAMERA_SENSOR_IQFILES format: +# "iqfile1 iqfile2 iqfile3 ..." +# ./build.sh media and copy /output/out/media_out/isp_iqfiles/$RK_CAMERA_SENSOR_IQFILES +export RK_CAMERA_SENSOR_IQFILES="sc4336_OT01_40IRC_F16.json sc3336_CMK-OT2119-PC1_30IRC-F16.json" +#export RK_CAMERA_SENSOR_IQFILES="sc4336_OT01_40IRC_F16.json sc3336_CMK-OT2119-PC1_30IRC-F16.json sc530ai_CMK-OT2115-PC1_30IRC-F16.json" + +# Config sensor lens CAC calibrattion bin files +export RK_CAMERA_SENSOR_CAC_BIN="CAC_sc4336_OT01_40IRC_F16" +#export RK_CAMERA_SENSOR_CAC_BIN="CAC_sc4336_OT01_40IRC_F16 CAC_sc530ai_CMK-OT2115-PC1_30IRC-F16" + +# build ipc web backend +# export RK_APP_IPCWEB_BACKEND=y + +# enable install app to oem partition +export RK_BUILD_APP_TO_OEM_PARTITION=y + +# enable rockchip test +export RK_ENABLE_ROCKCHIP_TEST=y diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk similarity index 100% rename from project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk rename to project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_B-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_B-IPC.mk new file mode 100755 index 000000000..a5c8a44a7 --- /dev/null +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_B-IPC.mk @@ -0,0 +1,107 @@ +#!/bin/bash + +################################################# +# Board Config +################################################# + +# Target CHIP +export RK_CHIP=rv1106 + +# app config +export RK_APP_TYPE=RKIPC_RV1103 + +# Config CMA size in environment +export RK_BOOTARGS_CMA_SIZE="24M" + +# Kernel dts +export RK_KERNEL_DTS=rv1103g-luckfox-pico-mini-b.dts + +################################################# +# BOOT_MEDIUM +################################################# + +# Target boot medium: sd_card/spi_nor/spi_nand +export RK_BOOT_MEDIUM=sd_card + +# Uboot defconfig fragment +export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-emmc.config + +# specify post.sh for delete/overlay files +# export RK_PRE_BUILD_OEM_SCRIPT=rv1103-spi_nor-post.sh + +# config partition in environment +# RK_PARTITION_CMD_IN_ENV format: +# [,] +# := [@](part-name) +# Note: +# If the first partition offset is not 0x0, it must be added. Otherwise, it needn't adding. +export RK_PARTITION_CMD_IN_ENV="32K(env),512K@32K(idblock),256K(uboot),32M(boot),512M(oem),256M(userdata),6G(rootfs),-(media)" + +# config partition's filesystem type (squashfs is readonly) +# emmc: squashfs/ext4 +# nand: squashfs/ubifs +# spi nor: squashfs/jffs2 +# RK_PARTITION_FS_TYPE_CFG format: +# AAAA:/BBBB/CCCC@ext4 +# AAAA ----------> partition name +# /BBBB/CCCC ----> partition mount point +# ext4 ----------> partition filesystem type +export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/oem@ext4 + +# config filesystem compress (Just for squashfs or ubifs) +# squashfs: lz4/lzo/lzma/xz/gzip, default xz +# ubifs: lzo/zlib, default lzo +# export RK_SQUASHFS_COMP=xz +# export RK_UBIFS_COMP=lzo + +################################################# +# TARGET_ROOTFS +################################################# + +# Target rootfs : ubuntu(only sd_card)/buildroot/busybox +export LF_TARGET_ROOTFS=ubuntu + +# SUBMODULES : github/gitee +export LF_SUBMODULES_BY=github + +# Buildroot defconfig +export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig + +################################################# +# Defconfig +################################################# + +# Target arch +export RK_ARCH=arm + +# Target Toolchain Cross Compile +export RK_TOOLCHAIN_CROSS=arm-rockchip830-linux-uclibcgnueabihf + +#misc image +export RK_MISC=wipe_all-misc.img + +# Uboot defconfig +export RK_UBOOT_DEFCONFIG=luckfox_rv1106_uboot_defconfig + +# Kernel defconfig +export RK_KERNEL_DEFCONFIG=luckfox_rv1106_linux_defconfig + +# Config sensor IQ files +# RK_CAMERA_SENSOR_IQFILES format: +# "iqfile1 iqfile2 iqfile3 ..." +# ./build.sh media and copy /output/out/media_out/isp_iqfiles/$RK_CAMERA_SENSOR_IQFILES +export RK_CAMERA_SENSOR_IQFILES="sc4336_OT01_40IRC_F16.json sc3336_CMK-OT2119-PC1_30IRC-F16.json" +#export RK_CAMERA_SENSOR_IQFILES="sc4336_OT01_40IRC_F16.json sc3336_CMK-OT2119-PC1_30IRC-F16.json sc530ai_CMK-OT2115-PC1_30IRC-F16.json" + +# Config sensor lens CAC calibrattion bin files +export RK_CAMERA_SENSOR_CAC_BIN="CAC_sc4336_OT01_40IRC_F16" +#export RK_CAMERA_SENSOR_CAC_BIN="CAC_sc4336_OT01_40IRC_F16 CAC_sc530ai_CMK-OT2115-PC1_30IRC-F16" + +# build ipc web backend +# export RK_APP_IPCWEB_BACKEND=y + +# enable install app to oem partition +export RK_BUILD_APP_TO_OEM_PARTITION=y + +# enable rockchip test +export RK_ENABLE_ROCKCHIP_TEST=y diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk index 74098a194..bfd14dc86 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk @@ -62,7 +62,7 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ export LF_TARGET_ROOTFS=ubuntu # SUBMODULES : github/gitee -export LF_SUBMODULES_BY=gitee +export LF_SUBMODULES_BY=github # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-ipc.dtsi b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-ipc.dtsi index d056debfc..e1df51440 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-ipc.dtsi +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-ipc.dtsi @@ -312,7 +312,14 @@ /***************************** PINCTRL ********************************/ // SPI &spi0 { - pinctrl-0 = <&spi0m0_clk &spi0m0_miso &spi0m0_mosi &spi0m0_cs0>; + pinctrl-0 = <&spi0m0_clk &spi0m0_miso &spi0m0_mosi &spi0m0_cs0>; + #address-cells = <1>; + #size-cells = <0>; + spidev@0 { + compatible = "rockchip,spidev"; + spi-max-frequency = <50000000>; + reg = <0>; + }; }; // I2C &i2c3 { diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-a.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-a.dts index 7d8382c49..a0fecacaa 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-a.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-a.dts @@ -42,13 +42,9 @@ /**********SPI**********/ /* SPI0_M0 */ &spi0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + status = "disabled"; spidev@0 { - compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; - reg = <0>; }; }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-b.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-b.dts index c3da1b304..7567b3846 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-b.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini-b.dts @@ -7,7 +7,7 @@ #include "rv1103.dtsi" #include "rv1106-evb.dtsi" -#include "rv1103-luckfox-pico-mini-ipc.dtsi" +#include "rv1103-luckfox-pico-ipc.dtsi" / { model = "Luckfox Pico Mini B"; @@ -54,13 +54,9 @@ /**********SPI**********/ /* SPI0_M0 */ &spi0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + status = "disabled"; spidev@0 { - compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; - reg = <0>; }; }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-plus.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-plus.dts index 15ad1034f..9f941899d 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-plus.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-plus.dts @@ -54,13 +54,9 @@ /**********SPI**********/ /* SPI0_M0 */ &spi0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + status = "disabled"; spidev@0 { - compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; - reg = <0>; }; }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico.dts index a03566667..97beeb37a 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico.dts @@ -42,13 +42,9 @@ /**********SPI**********/ /* SPI0_M0 */ &spi0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + status = "disabled"; spidev@0 { - compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; - reg = <0>; }; }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-pro-max-ipc.dtsi b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-pro-max-ipc.dtsi index 7963f3423..baee179d0 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-pro-max-ipc.dtsi +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-pro-max-ipc.dtsi @@ -295,7 +295,14 @@ /*****************************PINCTRL********************************/ // SPI &spi0 { - pinctrl-0 = <&spi0m0_clk &spi0m0_miso &spi0m0_mosi &spi0m0_cs0>; + pinctrl-0 = <&spi0m0_clk &spi0m0_miso &spi0m0_mosi &spi0m0_cs0>; + #address-cells = <1>; + #size-cells = <0>; + spidev@0 { + compatible = "rockchip,spidev"; + spi-max-frequency = <50000000>; + reg = <0>; + }; }; // I2C &i2c0 { @@ -310,9 +317,9 @@ pinctrl-0 = <&i2c3m1_xfer &i2c3m0_xfer>; }; -&i2c4 { - pinctrl-0 = <&i2c4m0_xfer>; -}; +// &i2c4 { +// pinctrl-0 = <&i2c4m0_xfer>; +// }; // UART &uart0 { diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-ultra-ipc.dtsi b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-ultra-ipc.dtsi index 27d64c367..fd3b9cd15 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-ultra-ipc.dtsi +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-ultra-ipc.dtsi @@ -56,21 +56,26 @@ panel: panel { compatible = "simple-panel"; backlight = <&backlight>; - //reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>; - //reset-delay-ms = <200>; - enable-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - enable-delay-ms = <20>; status = "okay"; - bus-format = ; width-mm = <85>; height-mm = <85>; + reset { + reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>; + reset-delay-ms = <200>; + status = "okay"; + }; + enable { + enable-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + enable-delay-ms = <20>; + status = "okay"; + }; display-timings { native-mode = <&timing0>; timing0: timing0 { - clock-frequency = <16500000>; + clock-frequency = <0>; hactive = <0>; vactive = <0>; hback-porch = <0>; @@ -82,7 +87,7 @@ hsync-active = <0>; vsync-active = <0>; de-active = <0>; - pixelclk-active = <0>; + pixelclk-active = <1>; }; }; @@ -487,9 +492,9 @@ &i2c2 { pinctrl-0 = <&i2c2m0_xfer>; }; -&i2c3 { - pinctrl-0 = <&i2c3m0_xfer &i2c3m1_xfer &i2c3m2_xfer>; -}; +// &i2c3 { +// pinctrl-0 = <&i2c3m0_xfer &i2c3m1_xfer &i2c3m2_xfer>; +// }; // &i2c4 { // pinctrl-0 = <&i2c4m0_xfer &i2c4m1_xfer &i2c4m2_xfer>; // }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts index 5f01eec4f..c41d56746 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts @@ -54,13 +54,9 @@ /**********SPI**********/ &spi0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + status = "disabled"; spidev@0 { - compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; - reg = <0>; }; }; @@ -89,12 +85,6 @@ status = "disabled"; }; -/**********PWM**********/ -/* PWM5_M1 */ -&pwm1 { - status = "okay"; -}; - /**********RTC**********/ &rtc { status = "okay"; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra-w.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra-w.dts index 871734074..56da04264 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra-w.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra-w.dts @@ -102,10 +102,6 @@ }; }; -/**********TP**********/ -&i2c3 { - status = "disabled"; -}; /**********SPI**********/ &spi0 { @@ -114,3 +110,4 @@ spi-max-frequency = <50000000>; }; }; + diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra.dts index 7ad05a56e..f9f06be76 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra.dts @@ -53,11 +53,6 @@ status = "okay"; }; -/**********TP**********/ -&i2c3 { - status = "disabled"; -}; - /**********SPI**********/ &spi0 { status = "disabled"; diff --git a/sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig b/sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig index a872cc4a0..5fe0ba8f0 100755 --- a/sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig +++ b/sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig @@ -144,7 +144,7 @@ CONFIG_KEYBOARD_ADC=y CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_GOODIX=y +CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_EDT_FT5X06=y # CONFIG_SERIO is not set # CONFIG_VT is not set diff --git a/sysdrv/source/kernel/drivers/input/touchscreen/goodix.c b/sysdrv/source/kernel/drivers/input/touchscreen/goodix.c index b7c3d17cd..a083380aa 100644 --- a/sysdrv/source/kernel/drivers/input/touchscreen/goodix.c +++ b/sysdrv/source/kernel/drivers/input/touchscreen/goodix.c @@ -963,8 +963,6 @@ static int goodix_read_version(struct goodix_ts_data *ts) { int error; u8 buf[6]; - //u8 reg_data[6]; - //int i = 0; char id_str[GOODIX_ID_MAX_LEN + 1]; error = goodix_i2c_read(ts->client, GOODIX_REG_ID, buf, sizeof(buf)); @@ -981,6 +979,7 @@ static int goodix_read_version(struct goodix_ts_data *ts) dev_info(&ts->client->dev, "ID %s, version: %04x\n", ts->id, ts->version); + return 0; } @@ -1060,15 +1059,11 @@ static int goodix_configure_dev(struct goodix_ts_data *ts) input_set_abs_params(ts->input_dev, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0); input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0); - - - dev_dbg(&ts->client->dev, "(%d, %d, %d)", ts->prop.max_x, ts->prop.max_y, ts->max_touch_num); /* Read configuration and apply touchscreen parameters */ goodix_read_config(ts); - dev_dbg(&ts->client->dev, "(%d, %d, %d)", ts->prop.max_x, ts->prop.max_y, ts->max_touch_num); + /* Try overriding touchscreen parameters via device properties */ touchscreen_parse_properties(ts->input_dev, true, &ts->prop); - dev_dbg(&ts->client->dev, "(%d, %d, %d)", ts->prop.max_x, ts->prop.max_y, ts->max_touch_num); if (!ts->prop.max_x || !ts->prop.max_y || !ts->max_touch_num) { dev_err(&ts->client->dev, @@ -1133,17 +1128,9 @@ static void goodix_config_cb(const struct firmware *cfg, void *ctx) { struct goodix_ts_data *ts = ctx; int error; - int i; if (cfg) { /* send device configuration to the firmware */ - - while(i < cfg->size) - { - dev_dbg(&ts->client->dev, "reg %d: %#x\n", i, cfg->data[i]); - i ++; - } - error = goodix_send_cfg(ts, cfg->data, cfg->size); if (error) goto err_release_cfg; @@ -1243,11 +1230,8 @@ reset: ts->chip = goodix_get_chip_data(ts->id); - ts->load_cfg_from_disk = 0; if (ts->load_cfg_from_disk) { /* update device config */ - - dev_dbg(&client->dev, "Configure from Disk\n"); ts->cfg_name = devm_kasprintf(&client->dev, GFP_KERNEL, "goodix_%s_cfg.bin", ts->id); if (!ts->cfg_name) @@ -1265,7 +1249,6 @@ reset: return 0; } else { - dev_dbg(&client->dev, "Configure from Device\n"); error = goodix_configure_dev(ts); if (error) return error; diff --git a/sysdrv/tools/board/luckfox_config/luckfox-config b/sysdrv/tools/board/luckfox_config/luckfox-config index 6c8ae2236..cbc1c5fae 100755 --- a/sysdrv/tools/board/luckfox_config/luckfox-config +++ b/sysdrv/tools/board/luckfox_config/luckfox-config @@ -263,8 +263,8 @@ function luckfox_pico_pro_max_pin_diagram_file() { - - GND | | GND - - PWM4_M2 - SPI0_M0_CLK - GPIO1_C1 | | GPIO2_A3 - - PWM5_M2 - SPI0_M0_MOSI - GPIO1_C2 | | GPIO2_A2 - - - PWM6_M2 - SPI0_M0_MISO - GPIO1_C3 | | GPIO2_A1 - I2C4_M0_SCL - - PWM5_M1 - I2C1_M1_SCL - GPIO2_B0 | | GPIO2_A0 - I2C4_M0_SDA - + PWM6_M2 - SPI0_M0_MISO - GPIO1_C3 | | GPIO2_A1 - - + PWM5_M1 - I2C1_M1_SCL - GPIO2_B0 | | GPIO2_A0 - - - - GND | | GND - - PWM3_M2 - UART3_M1_TX - GPIO1_D0 | | GPIO2_A5 - UART1_M1_RX - PWM10_M2 - UART3_M1_RX - GPIO1_D1 | | GPIO2_A4 - UART1_M1_TX - @@ -691,18 +691,18 @@ function luckfox_fdt_overlay() { function luckfox_fdt_clear() { # delete temp file local files=( - "$LUCKFOX_FDT_DUMP_TXT" - "$LUCKFOX_FDT_DTB" - "$LUCKFOX_FDT_OVERLAY_DTS" - "$LUCKFOX_FDT_OVERLAY_DTBO" - "$LUCKFOX_FDT_HDR_DTB" - "$LUCKFOX_FDT_HDR_OVERLAY_DTS" - "$LUCKFOX_FDT_HDR_OVERLAY_DTBO" + "$LUCKFOX_FDT_DUMP_TXT" + "$LUCKFOX_FDT_DTB" + "$LUCKFOX_FDT_OVERLAY_DTS" + "$LUCKFOX_FDT_OVERLAY_DTBO" + "$LUCKFOX_FDT_HDR_DTB" + "$LUCKFOX_FDT_HDR_OVERLAY_DTS" + "$LUCKFOX_FDT_HDR_OVERLAY_DTBO" ) for file in "${files[@]}"; do if [ -e "$file" ]; then - rm "$file" + rm "$file" fi done } @@ -1300,20 +1300,20 @@ function luckfox_csi_app() { #endregion } -function luckfox_rgb_check_params(){ - local params=("$@") +function luckfox_rgb_check_params() { + local params=("$@") - for param in "${params[@]}"; do - if [[ -z "$param" ]]; then - echo "Error: Parameter is empty." - return 1 - fi + for param in "${params[@]}"; do + if [[ -z "$param" ]]; then + echo "Error: Parameter is empty." + return 1 + fi - if ! [[ "$param" =~ ^[0-9]+$ ]]; then - echo "Error: Parameter '$param' is not a number." - return 1 - fi - done + if ! [[ "$param" =~ ^[0-9]+$ ]]; then + echo "Error: Parameter '$param' is not a number." + return 1 + fi + done } function luckfox_rgb_app() { @@ -1334,17 +1334,19 @@ function luckfox_rgb_app() { local rgb_de_active="${14}" local rgb_pclk_active="${15}" - local rgb_mode_active gpio0_phandle + local gpio0_phandle reset_gpio_action enable_gpio_action local pre_action pre_action=$(luckfox_get_pin_mode "$(luckfox_get_pinctrl_addr "lcd-pins")") # create fdt overlay content if [ "$action" == 1 ]; then - if [ "$rgb_mode" == "enable" ] ;then - rgb_mode_active=0x1 - elif [ "$rgb_mode" == "reset" ] ;then - rgb_mode_active=0x0 + if [ "$rgb_mode" == "enable" ]; then + reset_gpio_action=okay + enable_gpio_action=disabled + elif [ "$rgb_mode" == "reset" ]; then + reset_gpio_action=disabled + enable_gpio_action=okay else luckfox_result_handle $LF_ERR "Wrong rgb_mode!" return 1 @@ -1354,6 +1356,22 @@ function luckfox_rgb_app() { if [[ $? -ne 0 ]]; then luckfox_result_handle $LF_ERR "Wrong rgb_params!" return 1 + else + # decimal to hex + rgb_clk_hex=$(printf '0x%x\n' $rgb_clk) + rgb_h_hex=$(printf '0x%x\n' $rgb_h) + rgb_v_hex=$(printf '0x%x\n' $rgb_v) + rgb_hb_hex=$(printf '0x%x\n' $rgb_hb) + rgb_hf_hex=$(printf '0x%x\n' $rgb_hf) + rgb_vb_hex=$(printf '0x%x\n' $rgb_vb) + rgb_vf_hex=$(printf '0x%x\n' $rgb_vf) + rgb_h_len_hex=$(printf '0x%x\n' $rgb_h_len) + rgb_v_len_hex=$(printf '0x%x\n' $rgb_v_len) + rgb_h_active_hex=$(printf '0x%x\n' $rgb_h_active) + rgb_v_active_hex=$(printf '0x%x\n' $rgb_v_active) + rgb_de_active_hex=$(printf '0x%x\n' $rgb_de_active) + rgb_pclk_active_hex=$(printf '0x%x\n' $rgb_pclk_active) + fi luckfox_check_pin_diagram "GPIO1_D0" "GPIO1_D1" "GPIO1_C2" "GPIO1_C3" "GPIO1_C1" \ @@ -1421,37 +1439,41 @@ function luckfox_rgb_app() { }; " # Get GPIO0 phandle - gpio0_phandle=$(luckfox_get_pinctrl_addr "gpio@ff380000" 11) + #gpio0_phandle=$(luckfox_get_pinctrl_addr "gpio@ff380000" 11) local lcd_time_content=" /dts-v1/; /plugin/; -&{/panel}{ - ${rgb_mode}-gpios = <$gpio0_phandle 0x1 $rgb_mode_active>; - ${rgb_mode}-delay-ms = <100>; +&{/panel/reset}{ + status=\"$reset_gpio_action\"; }; -&{/panel/display-timings/timging0}{ - clock-frequency = <$rgb_clk>; - hactive = <$rgb_h>; - vactive = <$rgb_v>; - hback-porch = <$rgb_hb>; - hfront-porch = <$rgb_hf>; - vback-porch = <$rgb_vb>; - vfront-porch = <$rgb_vf>; - hsync-len = <$rgb_h_len>; - vsync-len = <$rgb_v_len>; - hsync-active = <$rgb_h_active>; - vsync-active = <$rgb_v_active>; - de-active = <$rgb_de_active>; - pixelclk-active = <$rgb_pclk_active>; +&{/panel/enable}{ + status=\"$enable_gpio_action\"; +}; + + +&{/panel/display-timings/timing0}{ + clock-frequency = <$rgb_clk_hex>; + hactive = <$rgb_h_hex>; + vactive = <$rgb_v_hex>; + hback-porch = <$rgb_hb_hex>; + hfront-porch = <$rgb_hf_hex>; + vback-porch = <$rgb_vb_hex>; + vfront-porch = <$rgb_vf_hex>; + hsync-len = <$rgb_h_len_hex>; + vsync-len = <$rgb_v_len_hex>; + hsync-active = <$rgb_h_active_hex>; + vsync-active = <$rgb_v_active_hex>; + de-active = <$rgb_de_active_hex>; + pixelclk-active = <$rgb_pclk_active_hex>; }; " # fdt overlay luckfox_fdt_overlay "$fdt_content" - if [ "$action" == 1 ] ;then + if [ "$action" == 1 ]; then luckfox_fdt_overlay "$lcd_time_content" elif [ "$action" == 0 ] && [ "$pre_action" == 1 ]; then luckfox_set_pin_mode "$(luckfox_get_pinctrl_addr "lcd-pins")" 1 @@ -1459,7 +1481,7 @@ function luckfox_rgb_app() { # update cfg luckfox_set_pin_cfg "RGB_ENABLE" "$action" - if [ "$action" == 1 ] ;then + if [ "$action" == 1 ]; then luckfox_set_pin_cfg "RGB_MODE" "$rgb_mode" luckfox_set_pin_cfg "RGB_CLK" "$rgb_clk" luckfox_set_pin_cfg "RGB_HACTIVE" "$rgb_h" @@ -2005,65 +2027,65 @@ function luckfox_RGB() { 2>&1 >/dev/tty) if [ -z "$rgb_enable" ]; then luckfox_advanced_options - elif [ "$rgb_mode" == 0 ] ;then + elif [ "$rgb_mode" == 0 ]; then rgb_mode_str="reset" - elif [ "$rgb_mode" == 1 ] ;then + elif [ "$rgb_mode" == 1 ]; then rgb_mode_str="enable" fi - if [ -f "$LUCKFOX_RGB_PARAMS" ] ;then + if [ -f "$LUCKFOX_RGB_PARAMS" ]; then touch "$LUCKFOX_RGB_PARAMS" fi # init params init_rgb_clk=$(luckfox_get_pin_cfg "RGB_CLK") - init_rgb_h=$(luckfox_get_pin_cfg "RGB_HACTIVE" ) - init_rgb_v=$(luckfox_get_pin_cfg "RGB_VACTIVE" ) - init_rgb_hb=$(luckfox_get_pin_cfg "RGB_HBACKPORCH" ) - init_rgb_hf=$(luckfox_get_pin_cfg "RGB_HFRONTPORCH" ) - init_rgb_vb=$(luckfox_get_pin_cfg "RGB_VBACKPORCH" ) - init_rgb_vf=$(luckfox_get_pin_cfg "RGB_VFRONTPORCH" ) - init_rgb_h_len=$(luckfox_get_pin_cfg "RGB_HSYNC_LEN" ) - init_rgb_v_len=$(luckfox_get_pin_cfg "RGB_VSYNC_LEN" ) + init_rgb_h=$(luckfox_get_pin_cfg "RGB_HACTIVE") + init_rgb_v=$(luckfox_get_pin_cfg "RGB_VACTIVE") + init_rgb_hb=$(luckfox_get_pin_cfg "RGB_HBACKPORCH") + init_rgb_hf=$(luckfox_get_pin_cfg "RGB_HFRONTPORCH") + init_rgb_vb=$(luckfox_get_pin_cfg "RGB_VBACKPORCH") + init_rgb_vf=$(luckfox_get_pin_cfg "RGB_VFRONTPORCH") + init_rgb_h_len=$(luckfox_get_pin_cfg "RGB_HSYNC_LEN") + init_rgb_v_len=$(luckfox_get_pin_cfg "RGB_VSYNC_LEN") init_rgb_h_active=$(luckfox_get_pin_cfg "RGB_HSYNC_ACTIVE") init_rgb_v_active=$(luckfox_get_pin_cfg "RGB_VSYNC_ACTIVE") - init_rgb_de_active=$(luckfox_get_pin_cfg "RGB_DE_ACTIVE" ) - init_rgb_pclk_active=$(luckfox_get_pin_cfg "RGB_PCLK_ACTIVE" ) + init_rgb_de_active=$(luckfox_get_pin_cfg "RGB_DE_ACTIVE") + init_rgb_pclk_active=$(luckfox_get_pin_cfg "RGB_PCLK_ACTIVE") LUCKFOX_RGB_PARAMS=$(mktemp) dialog --no-cancel --form "Enter RGB Parameters" 15 50 0 \ - "Clock :" 1 1 "$init_rgb_clk" 1 15 10 0 \ - "Hsync-Active:" 2 1 "$init_rgb_h_active" 2 15 10 0 \ - "Vsync-Active:" 3 1 "$init_rgb_v_active" 3 15 10 0 \ - "DE-Active :" 4 1 "$init_rgb_de_active" 4 15 10 0 \ - "PCLK-Active :" 5 1 "$init_rgb_pclk_active" 5 15 10 0 \ - 2> "$LUCKFOX_RGB_PARAMS" - IFS=$'\n' read -d '' -r rgb_clk rgb_h_active rgb_v_active rgb_de_active rgb_pclk_active < "$LUCKFOX_RGB_PARAMS" + "Clock :" 1 1 "$init_rgb_clk" 1 15 10 0 \ + "Hsync-Active:" 2 1 "$init_rgb_h_active" 2 15 10 0 \ + "Vsync-Active:" 3 1 "$init_rgb_v_active" 3 15 10 0 \ + "DE-Active :" 4 1 "$init_rgb_de_active" 4 15 10 0 \ + "PCLK-Active :" 5 1 "$init_rgb_pclk_active" 5 15 10 0 \ + 2>"$LUCKFOX_RGB_PARAMS" + IFS=$'\n' read -d '' -r rgb_clk rgb_h_active rgb_v_active rgb_de_active rgb_pclk_active <"$LUCKFOX_RGB_PARAMS" rm -f "$LUCKFOX_RGB_PARAMS" LUCKFOX_RGB_PARAMS=$(mktemp) dialog --no-cancel --form "Enter RGB Parameters" 15 50 0 \ - "Hactive :" 1 1 "$init_rgb_h" 1 15 10 0 \ - "Vactive :" 2 1 "$init_rgb_v" 2 15 10 0 \ - "HBack-Porch :" 3 1 "$init_rgb_hb" 3 15 10 0 \ - "HFont-Porch :" 4 1 "$init_rgb_hf" 4 15 10 0 \ - "VBack-Porch :" 5 1 "$init_rgb_vb" 5 15 10 0 \ - "VFont-Porch :" 6 1 "$init_rgb_vf" 6 15 10 0 \ - "Hsync-Len :" 7 1 "$init_rgb_h_len" 7 15 10 0 \ - "Vsync-Len :" 8 1 "$init_rgb_v_len" 8 15 10 0 \ - 2> "$LUCKFOX_RGB_PARAMS" - IFS=$'\n' read -d '' -r rgb_h rgb_v rgb_hb rgb_hf rgb_vb rgb_vf rgb_h_len rgb_v_len < "$LUCKFOX_RGB_PARAMS" + "Hactive :" 1 1 "$init_rgb_h" 1 15 10 0 \ + "Vactive :" 2 1 "$init_rgb_v" 2 15 10 0 \ + "HBack-Porch :" 3 1 "$init_rgb_hb" 3 15 10 0 \ + "HFont-Porch :" 4 1 "$init_rgb_hf" 4 15 10 0 \ + "VBack-Porch :" 5 1 "$init_rgb_vb" 5 15 10 0 \ + "VFont-Porch :" 6 1 "$init_rgb_vf" 6 15 10 0 \ + "Hsync-Len :" 7 1 "$init_rgb_h_len" 7 15 10 0 \ + "Vsync-Len :" 8 1 "$init_rgb_v_len" 8 15 10 0 \ + 2>"$LUCKFOX_RGB_PARAMS" + IFS=$'\n' read -d '' -r rgb_h rgb_v rgb_hb rgb_hf rgb_vb rgb_vf rgb_h_len rgb_v_len <"$LUCKFOX_RGB_PARAMS" rm -f "$LUCKFOX_RGB_PARAMS" dialog --msgbox "All parameters are valid." 15 50 - luckfox_rgb_app 1 "$rgb_mode_str" "$rgb_clk"\ - "$rgb_h" "$rgb_v" \ - "$rgb_hb" "$rgb_hf"\ - "$rgb_vb" "$rgb_vf"\ - "$rgb_h_len" "$rgb_v_len"\ - "$rgb_h_active" "$rgb_v_active"\ - "$rgb_de_active" "$rgb_pclk_active" + luckfox_rgb_app 1 "$rgb_mode_str" "$rgb_clk" \ + "$rgb_h" "$rgb_v" \ + "$rgb_hb" "$rgb_hf" \ + "$rgb_vb" "$rgb_vf" \ + "$rgb_h_len" "$rgb_v_len" \ + "$rgb_h_active" "$rgb_v_active" \ + "$rgb_de_active" "$rgb_pclk_active" dialog --msgbox "RGB Effective after restart" 10 30 else luckfox_result_handle "$RK_ERR" "Only Luckfox Pico Ultra /Luckfox Pico Ultra W is supported" diff --git a/sysdrv/tools/board/ubuntu b/sysdrv/tools/board/ubuntu new file mode 160000 index 000000000..cc972b164 --- /dev/null +++ b/sysdrv/tools/board/ubuntu @@ -0,0 +1 @@ +Subproject commit cc972b16488ce0f8f289ca413647d65c49b87db6