diff --git a/README.md b/README.md index 68f67ce8a..5ab3675d5 100755 --- a/README.md +++ b/README.md @@ -91,20 +91,18 @@ kernelconfig -config kernel and save defconfig" 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] RV1103_Luckfox_Pico_WebBee - [5] RV1106_Luckfox_Pico_Pro - [6] RV1106_Luckfox_Pico_Max - [7] RV1106_Luckfox_Pico_Ultra - [8] RV1106_Luckfox_Pico_Ultra_W - [9] RV1106_Luckfox_Pico_Pi - [10] RV1106_Luckfox_Pico_Pi_W - [11] RV1106_Luckfox_Pico_86Panel - [12] RV1106_Luckfox_Pico_86Panel_W - [13] custom - Which would you like? [0~13][default:0]: + [1] RV1103_Luckfox_Pico_Mini + [2] RV1103_Luckfox_Pico_Plus + [3] RV1103_Luckfox_Pico_WebBee + [4] RV1106_Luckfox_Pico_Pro_Max + [5] RV1106_Luckfox_Pico_Ultra + [6] RV1106_Luckfox_Pico_Ultra_W + [7] RV1106_Luckfox_Pico_Pi + [8] RV1106_Luckfox_Pico_Pi_W + [9] RV1106_Luckfox_Pico_86Panel + [10] RV1106_Luckfox_Pico_86Panel_W + [11] custom + Which would you like? [0~11][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 @@ -129,20 +127,18 @@ kernelconfig -config kernel and save defconfig" 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] RV1103_Luckfox_Pico_WebBee - [5] RV1106_Luckfox_Pico_Pro - [6] RV1106_Luckfox_Pico_Max - [7] RV1106_Luckfox_Pico_Ultra - [8] RV1106_Luckfox_Pico_Ultra_W - [9] RV1106_Luckfox_Pico_Pi - [10] RV1106_Luckfox_Pico_Pi_W - [11] RV1106_Luckfox_Pico_86Panel - [12] RV1106_Luckfox_Pico_86Panel_W - [13] custom - Which would you like? [0~13][default:0]: 13 + [1] RV1103_Luckfox_Pico_Mini + [2] RV1103_Luckfox_Pico_Plus + [3] RV1103_Luckfox_Pico_WebBee + [4] RV1106_Luckfox_Pico_Pro_Max + [5] RV1106_Luckfox_Pico_Ultra + [6] RV1106_Luckfox_Pico_Ultra_W + [7] RV1106_Luckfox_Pico_Pi + [8] RV1106_Luckfox_Pico_Pi_W + [9] RV1106_Luckfox_Pico_86Panel + [10] RV1106_Luckfox_Pico_86Panel_W + [11] custom + Which would you like? [0~11][default:0]: 11 ---------------------------------------------------------------- 0. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel-IPC.mk boot medium(启动介质): EMMC @@ -208,23 +204,15 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 8. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk + 8. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk boot medium(启动介质): SD_CARD system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 9. 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 - application(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 10. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + 9. 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 @@ -232,7 +220,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 11. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk + 10. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_WebBee @@ -240,31 +228,23 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 12. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk + 11. 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_Max + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 13. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro - application(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk + 12. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk boot medium(启动介质): SPI_NAND system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 15. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + 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 @@ -272,7 +252,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 16. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk + 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk boot medium(启动介质): SPI_NAND system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_WebBee @@ -280,23 +260,15 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 17. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk + 15. 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_Max + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 18. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk - boot medium(启动介质): SPI_NAND - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro - application(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 19. BoardConfig_IPC/BoardConfig-SPI_NAND-Busybox-RV1106_Luckfox_Pico_Pro_Max-IPC_FASTBOOT.mk + 16. BoardConfig_IPC/BoardConfig-SPI_NAND-Busybox-RV1106_Luckfox_Pico_Pro_Max-IPC_FASTBOOT.mk boot medium(启动介质): SPI_NAND system version(系统版本): Busybox hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max diff --git a/README_CN.md b/README_CN.md index de5567d81..6345beae2 100755 --- a/README_CN.md +++ b/README_CN.md @@ -86,20 +86,18 @@ kernelconfig -config kernel and save defconfig" 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] RV1103_Luckfox_Pico_WebBee - [5] RV1106_Luckfox_Pico_Pro - [6] RV1106_Luckfox_Pico_Max - [7] RV1106_Luckfox_Pico_Ultra - [8] RV1106_Luckfox_Pico_Ultra_W - [9] RV1106_Luckfox_Pico_Pi - [10] RV1106_Luckfox_Pico_Pi_W - [11] RV1106_Luckfox_Pico_86Panel - [12] RV1106_Luckfox_Pico_86Panel_W - [13] custom - Which would you like? [0~13][default:0]: + [1] RV1103_Luckfox_Pico_Mini + [2] RV1103_Luckfox_Pico_Plus + [3] RV1103_Luckfox_Pico_WebBee + [4] RV1106_Luckfox_Pico_Pro_Max + [5] RV1106_Luckfox_Pico_Ultra + [6] RV1106_Luckfox_Pico_Ultra_W + [7] RV1106_Luckfox_Pico_Pi + [8] RV1106_Luckfox_Pico_Pi_W + [9] RV1106_Luckfox_Pico_86Panel + [10] RV1106_Luckfox_Pico_86Panel_W + [11] custom + Which would you like? [0~11][default:0]: ``` + 输出对应的Luckfox-pico硬件型号支持的存储介质,输入对应编号后进入根文件系统选项（直接回车选择序号[0]选项） 以Luckfox Pico Plus为例 @@ -125,20 +123,18 @@ kernelconfig -config kernel and save defconfig" 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] RV1103_Luckfox_Pico_WebBee - [5] RV1106_Luckfox_Pico_Pro - [6] RV1106_Luckfox_Pico_Max - [7] RV1106_Luckfox_Pico_Ultra - [8] RV1106_Luckfox_Pico_Ultra_W - [9] RV1106_Luckfox_Pico_Pi - [10] RV1106_Luckfox_Pico_Pi_W - [11] RV1106_Luckfox_Pico_86Panel - [12] RV1106_Luckfox_Pico_86Panel_W - [13] custom - Which would you like? [0~13][default:0]: 13 + [1] RV1103_Luckfox_Pico_Mini + [2] RV1103_Luckfox_Pico_Plus + [3] RV1103_Luckfox_Pico_WebBee + [4] RV1106_Luckfox_Pico_Pro_Max + [5] RV1106_Luckfox_Pico_Ultra + [6] RV1106_Luckfox_Pico_Ultra_W + [7] RV1106_Luckfox_Pico_Pi + [8] RV1106_Luckfox_Pico_Pi_W + [9] RV1106_Luckfox_Pico_86Panel + [10] RV1106_Luckfox_Pico_86Panel_W + [11] custom + Which would you like? [0~11][default:0]: 11 ---------------------------------------------------------------- 0. BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel-IPC.mk boot medium(启动介质): EMMC @@ -204,23 +200,15 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 8. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk + 8. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk boot medium(启动介质): SD_CARD system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_A + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 9. 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 - application(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 10. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + 9. 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 @@ -228,7 +216,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 11. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk + 10. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk boot medium(启动介质): SD_CARD system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_WebBee @@ -236,31 +224,23 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 12. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk + 11. 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_Max + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 13. BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk - boot medium(启动介质): SD_CARD - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro - application(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk + 12. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk boot medium(启动介质): SPI_NAND system version(系统版本): Buildroot - hardware version(硬件版本): RV1103_Luckfox_Pico_Mini_B + hardware version(硬件版本): RV1103_Luckfox_Pico_Mini application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 15. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk + 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 @@ -268,7 +248,7 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 16. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk + 14. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk boot medium(启动介质): SPI_NAND system version(系统版本): Buildroot hardware version(硬件版本): RV1103_Luckfox_Pico_WebBee @@ -276,23 +256,15 @@ kernelconfig -config kernel and save defconfig" ---------------------------------------------------------------- ---------------------------------------------------------------- - 17. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk + 15. 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_Max + hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max application(应用场景): IPC ---------------------------------------------------------------- ---------------------------------------------------------------- - 18. BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk - boot medium(启动介质): SPI_NAND - system version(系统版本): Buildroot - hardware version(硬件版本): RV1106_Luckfox_Pico_Pro - application(应用场景): IPC - ---------------------------------------------------------------- - - ---------------------------------------------------------------- - 19. BoardConfig_IPC/BoardConfig-SPI_NAND-Busybox-RV1106_Luckfox_Pico_Pro_Max-IPC_FASTBOOT.mk + 16. BoardConfig_IPC/BoardConfig-SPI_NAND-Busybox-RV1106_Luckfox_Pico_Pro_Max-IPC_FASTBOOT.mk boot medium(启动介质): SPI_NAND system version(系统版本): Busybox hardware version(硬件版本): RV1106_Luckfox_Pico_Pro_Max diff --git a/project/app/rkipc/rkipc/common/network/network.c b/project/app/rkipc/rkipc/common/network/network.c index cad3a4e43..6863fac75 100644 --- a/project/app/rkipc/rkipc/common/network/network.c +++ b/project/app/rkipc/rkipc/common/network/network.c @@ -674,7 +674,7 @@ int rk_network_get_cable_state() { struct sockaddr_nl addr; struct nlmsghdr *nh; struct ifinfomsg *ifinfo; - char name[IFNAMSIZ], cmd1[64], cmd2[64]; + char name[IFNAMSIZ], cmd1[64], cmd2[64], cmd3[64]; // struct rtattr *attr; fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); @@ -700,8 +700,10 @@ int rk_network_get_cable_state() { memset(cmd1, 0, 32); memset(cmd2, 0, 32); + memset(cmd3, 0, 32); sprintf(cmd1, "udhcpc -i %s -T 1 -A 0 -b -q", name); sprintf(cmd2, "ifconfig %s 0.0.0.0", name); + sprintf(cmd3, "udhcpc -i eth0 -T 1 -A 0 -b -q"); if (ifinfo->ifi_flags & IFF_LOWER_UP) { status = 1; @@ -709,6 +711,7 @@ int rk_network_get_cable_state() { system("route del default gw 0.0.0.0"); system("cat /dev/null > /etc/resolv.conf"); system(cmd1); + system(cmd3); } else { status = 0; system(cmd2); diff --git a/project/build.sh b/project/build.sh index 3ba518cef..a6eecf642 100755 --- a/project/build.sh +++ b/project/build.sh @@ -149,12 +149,10 @@ function __IS_IN_ARRAY() { function choose_target_board() { local LF_HARDWARE=("RV1103_Luckfox_Pico" - "RV1103_Luckfox_Pico_Mini_A" - "RV1103_Luckfox_Pico_Mini_B" + "RV1103_Luckfox_Pico_Mini" "RV1103_Luckfox_Pico_Plus" "RV1103_Luckfox_Pico_WebBee" - "RV1106_Luckfox_Pico_Pro" - "RV1106_Luckfox_Pico_Max" + "RV1106_Luckfox_Pico_Pro_Max" "RV1106_Luckfox_Pico_Ultra" "RV1106_Luckfox_Pico_Ultra_W" "RV1106_Luckfox_Pico_Pi" @@ -174,17 +172,13 @@ function choose_target_board() { echo "${space8}${space8}[${LUNCH_NUM}] RV1103_Luckfox_Pico" LUNCH_NUM=$((LUNCH_NUM + 1)) - echo "${space8}${space8}[${LUNCH_NUM}] RV1103_Luckfox_Pico_Mini_A" - LUNCH_NUM=$((LUNCH_NUM + 1)) - echo "${space8}${space8}[${LUNCH_NUM}] RV1103_Luckfox_Pico_Mini_B" + echo "${space8}${space8}[${LUNCH_NUM}] RV1103_Luckfox_Pico_Mini" LUNCH_NUM=$((LUNCH_NUM + 1)) echo "${space8}${space8}[${LUNCH_NUM}] RV1103_Luckfox_Pico_Plus" LUNCH_NUM=$((LUNCH_NUM + 1)) echo "${space8}${space8}[${LUNCH_NUM}] RV1103_Luckfox_Pico_WebBee" LUNCH_NUM=$((LUNCH_NUM + 1)) - echo "${space8}${space8}[${LUNCH_NUM}] RV1106_Luckfox_Pico_Pro" - LUNCH_NUM=$((LUNCH_NUM + 1)) - echo "${space8}${space8}[${LUNCH_NUM}] RV1106_Luckfox_Pico_Max" + echo "${space8}${space8}[${LUNCH_NUM}] RV1106_Luckfox_Pico_Pro_Max" LUNCH_NUM=$((LUNCH_NUM + 1)) echo "${space8}${space8}[${LUNCH_NUM}] RV1106_Luckfox_Pico_Ultra" LUNCH_NUM=$((LUNCH_NUM + 1)) @@ -280,9 +274,9 @@ function choose_target_board() { # MAX_BM_INDEX=0 #fi - range_sd_card=(0 1) - range_sd_card_spi_nand=(2 3 4 5 6) - range_emmc=(7 8 9 10 11 12) + range_sd_card=(0) + range_sd_card_spi_nand=(1 2 3 4) + range_emmc=(5 6 7 8 9 10) if __IS_IN_ARRAY "$HW_INDEX" "${range_sd_card[@]}"; then echo "${space8}${space8}[0] SD_CARD" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel-IPC.mk index cccde3031..76344732d 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel-IPC.mk @@ -24,7 +24,7 @@ export RK_KERNEL_DTS=rv1106g-luckfox-pico-86panel.dts export RK_BOOT_MEDIUM=emmc # Uboot defconfig fragment -export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-emmc.config +export RK_UBOOT_DEFCONFIG_FRAGMENT="rk-emmc.config rv1106-luckfox-rgb-reset.config" # specify post.sh for delete/overlay files # export RK_PRE_BUILD_OEM_SCRIPT=rv1103-spi_nor-post.sh @@ -125,4 +125,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-86panel" +export RK_POST_OVERLAY="overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-rgb overlay-luckfox-buildroot-86panel" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel_W-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel_W-IPC.mk index 80f5ff45a..1c9c0cf1f 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel_W-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_86Panel_W-IPC.mk @@ -24,7 +24,7 @@ export RK_KERNEL_DTS=rv1106g-luckfox-pico-86panel-w.dts export RK_BOOT_MEDIUM=emmc # Uboot defconfig fragment -export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-emmc.config +export RK_UBOOT_DEFCONFIG_FRAGMENT="rk-emmc.config rv1106-luckfox-rgb-reset.config" # specify post.sh for delete/overlay files # export RK_PRE_BUILD_OEM_SCRIPT=rv1103-spi_nor-post.sh @@ -125,4 +125,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-86panel" +export RK_POST_OVERLAY="overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-rgb overlay-luckfox-buildroot-86panel" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk index 59844d5e2..220ef0750 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra-IPC.mk @@ -24,7 +24,7 @@ export RK_KERNEL_DTS=rv1106g-luckfox-pico-ultra.dts export RK_BOOT_MEDIUM=emmc # Uboot defconfig fragment -export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-emmc.config +export RK_UBOOT_DEFCONFIG_FRAGMENT="rk-emmc.config rv1106-luckfox-rgb-reset.config" # specify post.sh for delete/overlay files # export RK_PRE_BUILD_OEM_SCRIPT=rv1103-spi_nor-post.sh @@ -120,5 +120,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow\ - overlay-luckfox-buildroot-rgb" \ No newline at end of file +export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-rgb" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk index b0fa61ed9..7a8cb1aeb 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Buildroot-RV1106_Luckfox_Pico_Ultra_W-IPC.mk @@ -24,7 +24,7 @@ export RK_KERNEL_DTS=rv1106g-luckfox-pico-ultra-w.dts export RK_BOOT_MEDIUM=emmc # Uboot defconfig fragment -export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-emmc.config +export RK_UBOOT_DEFCONFIG_FRAGMENT="rk-emmc.config rv1106-luckfox-rgb-reset.config" # specify post.sh for delete/overlay files # export RK_PRE_BUILD_OEM_SCRIPT=rv1103-spi_nor-post.sh @@ -125,5 +125,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow\ - overlay-luckfox-buildroot-rgb" \ No newline at end of file +export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-rgb" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk similarity index 99% rename from project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk rename to project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk index 5dad636e1..70e9a1f15 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk @@ -3,7 +3,7 @@ ################################################# # Board Config ################################################# -export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_A-IPC.mk +export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk # Target CHIP export RK_CHIP=rv1106 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 deleted file mode 100755 index 6b021feb0..000000000 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -################################################# -# Board Config -################################################# -export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SD_CARD-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk -# 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.dts - -################################################# -# BOOT_MEDIUM -################################################# - -# Target boot medium -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)" - -# 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 -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 - -################################################# -# PRE and POST -################################################# - -# specify pre.sh for delete/overlay files -export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh - -# specify post.sh for delete/overlay files -export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh - -# declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow" \ No newline at end of file diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk deleted file mode 100755 index aede64b02..000000000 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -################################################# -# Board Config -################################################# -export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SD_CARD-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk -# Target CHIP -export RK_CHIP=rv1106 - -# app config -export RK_APP_TYPE=RKIPC_RV1106 - -# Config CMA size in environment -export RK_BOOTARGS_CMA_SIZE="66M" - -# Kernel dts -export RK_KERNEL_DTS=rv1106g-luckfox-pico-pro.dts - -################################################# -# BOOT_MEDIUM -################################################# - -# Target boot medium -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)" - -# 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 -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 mis5001_CMK-OT2115-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 - -################################################# -# PRE and POST -################################################# - -# specify pre.sh for delete/overlay files -export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh - -# specify post.sh for delete/overlay files -export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh - -# declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow" \ No newline at end of file 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 98% 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 index 831125530..b9d6e5d39 100755 --- 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 @@ -14,7 +14,7 @@ export RK_APP_TYPE=RKIPC_RV1106 export RK_BOOTARGS_CMA_SIZE="66M" # Kernel dts -export RK_KERNEL_DTS=rv1106g-luckfox-pico-max.dts +export RK_KERNEL_DTS=rv1106g-luckfox-pico-pro-max.dts ################################################# # BOOT_MEDIUM diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk similarity index 92% rename from project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk rename to project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk index 20b1b395b..00edb9c30 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk @@ -3,7 +3,7 @@ ################################################# # Board Config ################################################# -export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini_B-IPC.mk +export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Mini-IPC.mk # Target CHIP export RK_CHIP=rv1106 @@ -103,6 +103,13 @@ export RK_BUILD_APP_TO_OEM_PARTITION=y # enable rockchip test export RK_ENABLE_ROCKCHIP_TEST=y +# enable rockchip wifi +export RK_ENABLE_WIFI=y + +# config wifi ssid and passwd +export LF_WIFI_SSID="Your wifi ssid" +export LF_WIFI_PSK="Your wifi password" + ################################################# # PRE and POST ################################################# @@ -114,4 +121,5 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow" \ No newline at end of file +export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-webbee overlay-luckfox-wifibt-firmware" + diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk index 545605445..ced416925 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_Plus-IPC.mk @@ -103,6 +103,13 @@ export RK_BUILD_APP_TO_OEM_PARTITION=y # enable rockchip test export RK_ENABLE_ROCKCHIP_TEST=y +# enable rockchip wifi +export RK_ENABLE_WIFI=y + +# config wifi ssid and passwd +export LF_WIFI_SSID="Your wifi ssid" +export LF_WIFI_PSK="Your wifi password" + ################################################# # PRE and POST ################################################# @@ -114,4 +121,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow" \ No newline at end of file +export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-wifibt-firmware" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk index 46d3266c9..1a92514b5 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1103_Luckfox_Pico_WebBee-IPC.mk @@ -103,6 +103,13 @@ export RK_BUILD_APP_TO_OEM_PARTITION=y # enable rockchip test export RK_ENABLE_ROCKCHIP_TEST=y +# enable rockchip wifi +export RK_ENABLE_WIFI=y + +# config wifi ssid and passwd +export LF_WIFI_SSID="Your wifi ssid" +export LF_WIFI_PSK="Your wifi password" + ################################################# # PRE and POST ################################################# @@ -114,4 +121,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-nocsi-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-webbee" \ No newline at end of file +export RK_POST_OVERLAY="overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-buildroot-webbee overlay-luckfox-wifibt-firmware" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk deleted file mode 100755 index 4d9cd480b..000000000 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -################################################# -# Board Config -################################################# -export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro-IPC.mk -# Target CHIP -export RK_CHIP=rv1106 - -# app config -export RK_APP_TYPE=RKIPC_RV1106 - -# Config CMA size in environment -export RK_BOOTARGS_CMA_SIZE="66M" - -# Kernel dts -export RK_KERNEL_DTS=rv1106g-luckfox-pico-pro.dts - -################################################# -# BOOT_MEDIUM -################################################# - -# Target boot medium: emmc/spi_nor/spi_nand -export RK_BOOT_MEDIUM=spi_nand - -# Uboot defconfig fragment -export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-sfc.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="256K(env),256K@256K(idblock),512K(uboot),4M(boot),30M(oem),10M(userdata),210M(rootfs)" - -# 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@ubifs,oem@/oem@ubifs,userdata@/userdata@ubifs - -# 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 : 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 mis5001_CMK-OT2115-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 - -################################################# -# PRE and POST -################################################# - -# specify pre.sh for delete/overlay files -export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh - -# specify post.sh for delete/overlay files -export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh - -# declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow" \ No newline at end of file diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk similarity index 92% rename from project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk rename to project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk index a7fe20a7a..97c368f0b 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk @@ -3,7 +3,7 @@ ################################################# # Board Config ################################################# -export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Max-IPC.mk +export LF_ORIGIN_BOARD_CONFIG=BoardConfig-SPI_NAND-Buildroot-RV1106_Luckfox_Pico_Pro_Max-IPC.mk # Target CHIP export RK_CHIP=rv1106 @@ -14,7 +14,7 @@ export RK_APP_TYPE=RKIPC_RV1106 export RK_BOOTARGS_CMA_SIZE="66M" # Kernel dts -export RK_KERNEL_DTS=rv1106g-luckfox-pico-max.dts +export RK_KERNEL_DTS=rv1106g-luckfox-pico-pro-max.dts ################################################# # BOOT_MEDIUM @@ -103,6 +103,13 @@ export RK_BUILD_APP_TO_OEM_PARTITION=y # enable rockchip test export RK_ENABLE_ROCKCHIP_TEST=y +# enable rockchip wifi +export RK_ENABLE_WIFI=y + +# config wifi ssid and passwd +export LF_WIFI_SSID="Your wifi ssid" +export LF_WIFI_PSK="Your wifi password" + ################################################# # PRE and POST ################################################# @@ -114,4 +121,4 @@ export RK_PRE_BUILD_OEM_SCRIPT=luckfox-buildroot-oem-pre.sh export RK_PRE_BUILD_USERDATA_SCRIPT=luckfox-userdata-pre.sh # declare overlay directory -export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow" \ No newline at end of file +export RK_POST_OVERLAY="overlay-luckfox-config overlay-luckfox-buildroot-init overlay-luckfox-buildroot-shadow overlay-luckfox-wifibt-firmware" diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/etc/init.d/S60micinit b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-buildroot-init/etc/init.d/S60micinit similarity index 100% rename from project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/etc/init.d/S60micinit rename to project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-buildroot-init/etc/init.d/S60micinit diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-buildroot-rgb/etc/init.d/S25backlight b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-buildroot-rgb/etc/init.d/S25backlight new file mode 100755 index 000000000..a20b1c15c --- /dev/null +++ b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-buildroot-rgb/etc/init.d/S25backlight @@ -0,0 +1,17 @@ +#!/bin/sh + +start(){ + if [ -f "/oem/usr/ko/pwm_bl.ko" ]; then + sleep 1 + insmod /oem/usr/ko/pwm_bl.ko + fi +} + +case $1 in +start) + start & + ;; +*) + exit 1 + ;; +esac diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/etc/init.d/S99luckfoxconfigload b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/etc/init.d/S99luckfoxconfigload index e563abf30..e57031de3 100755 --- a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/etc/init.d/S99luckfoxconfigload +++ b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/etc/init.d/S99luckfoxconfigload @@ -4,12 +4,6 @@ load_luckfoxconfig() { if [ -f /usr/bin/luckfox-config ]; then luckfox-config load fi - if [ "$(cat /proc/device-tree/model)" == "Luckfox Pico Ultra" ] || - [ "$(cat /proc/device-tree/model)" == "Luckfox Pico Ultra W" ]; then - if [ -f /usr/bin/luckfox_switch_rgb_resolution ]; then - luckfox_switch_rgb_resolution & - fi - fi } case $1 in diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/usr/bin/luckfox-config b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/usr/bin/luckfox-config index 1d64b14d0..bcefc9588 100755 --- a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/usr/bin/luckfox-config +++ b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-config/usr/bin/luckfox-config @@ -144,8 +144,8 @@ function luckfox_pico_ultra_pin_diagram_file() { - - - 3V3 | | 5V PWM7_M0 - I2C2_M0_SCL - UART3_M0_TX - GPIO1_A0 | | 5V PWM4_M0 - I2C2_M0_SDA - UART3_M0_RX - GPIO1_A1 | | GND - PWM3_M1 - - UART4_M0_RX - GPIO1_B0 | | GPIO1_B2 - UART2_M1_TX - - - - GND | | GPIO1_B3 - UART2_M1_RX + PWM3_M1 - - UART4_M0_RX - GPIO1_B0 | | GPIO1_B2 - FIQtty_TX + - - - GND | | GPIO1_B3 - FIQtty_RX PWM7_M1 - - UART4_M0_TX - GPIO1_B1 | | GPIO1_C6 - - - PWM10_M1 PWM3_M2 - - UART3_M1_TX - GPIO1_D0 | | GND PWM10_M2- - UART3_M1_RX - GPIO1_D1 | | GPIO2_A7 - UART0_M1_CTS- I2C3_M0_SDA- PWM4_M1 @@ -242,7 +242,7 @@ function luckfox_config_init() { if [ ! -f $LUCKFOX_PIN_DIAGRAM_FILE ]; then if [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Plus" ]; then luckfox_pico_plus_pin_diagram_file - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_pico_pro_max_pin_diagram_file elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico" ]; then luckfox_pico_pin_diagram_file @@ -365,7 +365,7 @@ function luckfox_load_cfg() { luckfox_set_pin_mark "GPIO1_C3" "$value" luckfox_set_pin_mark "GPIO0_A4" "$value" luckfox_fbtft_app 1 "sitronix,st7789v" - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_set_pin_mark "GPIO2_B1" "$value" luckfox_set_pin_mark "GPIO1_C0" "$value" luckfox_set_pin_mark "GPIO1_C1" "$value" @@ -378,7 +378,7 @@ function luckfox_load_cfg() { fi elif [ "$value" == 0 ]; then if [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Plus" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico" ] || - [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then echo "Reset fbtft pins" #luckfox_fbtft_app 0 fi @@ -1108,7 +1108,7 @@ function luckfox_compatible_Pico_LCD() { luckfox_gpio_app 3 a 5 up luckfox_gpio_app 3 a 2 up - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_uart_app 0 1 1 luckfox_i2c_app 0 4 0 @@ -1213,7 +1213,7 @@ function luckfox_compatible_Pico_ResTouch_LCD() { luckfox_uart_app 0 5 0 luckfox_i2c_app 0 0 2 luckfox_result_handle $LF_OK - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_uart_app 0 1 1 luckfox_i2c_app 0 4 0 luckfox_i2c_app 0 3 0 @@ -1280,7 +1280,7 @@ function luckfox_compatible_Pico_OLED() { luckfox_uart_app 0 5 0 luckfox_gpio_app 1 d 1 up luckfox_gpio_app 3 a 7 up - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_uart_app 0 1 1 luckfox_gpio_app 1 d 1 up luckfox_gpio_app 2 a 5 up @@ -1350,7 +1350,7 @@ function luckfox_compatible_app() { compatible_group=(Pico_ePaper Pico_UPS_B OLED_Module DHT11) elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Plus" ] && [ "$LUCKFOX_CHIP_MEDIA_CLASS" == "spi_nand" ]; then compatible_group=(Pico_LCD Pico_ePaper Pico_UPS_B Pico_ResTouch_LCD OLED_Module Pico_OLED DHT11) - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then compatible_group=(Pico_LCD Pico_ePaper Pico_UPS_B Pico_ResTouch_LCD OLED_Module Pico_OLED DHT11) fi @@ -1789,7 +1789,7 @@ function luckfox_check_spi() { # Set GPIO if [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Plus" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico" ] || - [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then fbtft_status=$(luckfox_get_pin_cfg "FBTFT_ENABLE") spi0m0_status=$(luckfox_get_pin_cfg "SPI0_M0_STATUS") if [ "$spi_mode" == 0 ] && [ "$spi_main" == 0 ]; then @@ -2414,7 +2414,7 @@ function luckfox_fbtft_app() { if [ "$action" == 1 ]; then if [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Plus" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico" ]; then luckfox_check_pin_diagram "GPIO1_A2" "GPIO1_C0" "GPIO1_C1" "GPIO1_C2" "GPIO1_C3" "GPIO0_A4" - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_check_pin_diagram "GPIO2_B1" "GPIO1_C0" "GPIO1_C1" "GPIO1_C2" "GPIO1_C3" "GPIO2_B0" else luckfox_result_handle "$LF_ERR" "This Luckfox-Pico Model does not support FBTFT setting!" @@ -2504,7 +2504,7 @@ function luckfox_fbtft_app() { luckfox_set_pin_mark "GPIO1_C2" "$action" luckfox_set_pin_mark "GPIO1_C3" "$action" luckfox_set_pin_mark "GPIO0_A4" "$action" - elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ]; then + elif [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Max" ] || [ "$LUCKFOX_CHIP_MODEL" == "Luckfox Pico Pro Max" ]; then luckfox_set_pin_mark "GPIO2_B1" "$action" luckfox_set_pin_mark "GPIO1_C0" "$action" luckfox_set_pin_mark "GPIO1_C1" "$action" diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlbt/rtl8723b_config b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlbt/rtl8723b_config new file mode 100755 index 000000000..05f5901a6 Binary files /dev/null and b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlbt/rtl8723b_config differ diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlbt/rtl8723b_fw b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlbt/rtl8723b_fw new file mode 100755 index 000000000..034f05278 Binary files /dev/null and b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlbt/rtl8723b_fw differ diff --git a/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlwifi/rtl8723bs_nic.bin b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlwifi/rtl8723bs_nic.bin new file mode 100755 index 000000000..8d5340538 Binary files /dev/null and b/project/cfg/BoardConfig_IPC/overlay/overlay-luckfox-wifibt-firmware/lib/firmware/rtlwifi/rtl8723bs_nic.bin differ diff --git a/sysdrv/drv_ko/wifi/insmod_wifi.sh b/sysdrv/drv_ko/wifi/insmod_wifi.sh index a15cec1f9..d4a139d6b 100755 --- a/sysdrv/drv_ko/wifi/insmod_wifi.sh +++ b/sysdrv/drv_ko/wifi/insmod_wifi.sh @@ -44,6 +44,15 @@ if [ $? -eq 0 ]; then insmod bcmdhd.ko fi +#rtl8723bs +cat /sys/bus/sdio/devices/*/uevent | grep "024C:B723" +if [ $? -eq 0 ]; then + insmod libarc4.ko + insmod cfg80211.ko + insmod mac80211.ko + insmod r8723bs.ko +fi + #rtl8723ds cat /sys/bus/sdio/devices/*/uevent | grep "024C:D723" if [ $? -eq 0 ]; then 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 0d9181146..d7b50e115 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 @@ -59,16 +59,16 @@ // DHT11 dht11_sensor { - compatible = "dht11"; - pinctrl-names = "default"; - pinctrl-0 = <&gpio1_pc7>; + compatible = "dht11"; + pinctrl-names = "default"; + pinctrl-0 = <&gpio1_pc7>; - dht11@1 { - gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - label = "dht11"; - linux,default-trigger = "humidity"; - }; - }; + dht11@1 { + gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + label = "dht11"; + linux,default-trigger = "humidity"; + }; + }; }; /***************************** AUDIO ********************************/ @@ -316,22 +316,22 @@ #address-cells = <1>; #size-cells = <0>; - spidev@0 { - compatible = "rockchip,spidev"; + spidev@0 { + compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; reg = <0>; }; - fbtft@0{ - compatible = "sitronix,st7789v"; - reg = <0>; - spi-max-frequency = <20000000>; - fps = <30>; - buswidth = <8>; - debug = <0x7>; - led-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;//BL - dc-gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; //DC - reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; //RES - }; + fbtft@0 { + compatible = "sitronix,st7789v"; + reg = <0>; + spi-max-frequency = <20000000>; + fps = <30>; + buswidth = <8>; + debug = <0x7>; + led-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;//BL + dc-gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;//DC + reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;//RES + }; }; // I2C &i2c3 { @@ -402,9 +402,9 @@ }; }; - gpio1-pc7 { - gpio1_pc7:gpio1-pc7 { - rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; - }; + gpio1-pc7 { + gpio1_pc7: gpio1-pc7 { + rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini.dts index f172cb95f..85ce5b81d 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-mini.dts @@ -29,12 +29,18 @@ /**********SDMMC**********/ &sdmmc { max-frequency = <50000000>; - no-sdio; no-mmc; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; disable-wp; + + //sdio + cap-sdio-irq; + non-removable; + no-1-8-v; + supports-sdio; + pinctrl-names = "default"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; status = "okay"; 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 ba0404599..ee163b0a2 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 @@ -29,12 +29,18 @@ /**********SDMMC**********/ &sdmmc { max-frequency = <50000000>; - no-sdio; no-mmc; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; disable-wp; + + //sdio + cap-sdio-irq; + non-removable; + no-1-8-v; + supports-sdio; + pinctrl-names = "default"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; status = "okay"; @@ -58,9 +64,9 @@ spidev@0 { spi-max-frequency = <50000000>; }; - fbtft@0 { - spi-max-frequency = <50000000>; - }; + fbtft@0 { + spi-max-frequency = <50000000>; + }; }; /**********I2C**********/ diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-webbee.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-webbee.dts index ba8d23f71..28acfa70c 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-webbee.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-webbee.dts @@ -52,7 +52,7 @@ }; /**********CSI**********/ -&i2c4{ +&i2c4 { status = "disabled"; }; 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 278db7e41..76acc784d 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 @@ -13,7 +13,7 @@ model = "Luckfox Pico"; compatible = "rockchip,rv1103g-38x38-ipc-v10", "rockchip,rv1103"; - gpio4pa4:gpio4pa4 { + gpio4pa4: gpio4pa4 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&gpio4_pa4>; @@ -21,7 +21,7 @@ regulator-always-on; }; - gpio4pa3:gpio4pa3 { + gpio4pa3: gpio4pa3 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&gpio4_pa3>; @@ -29,7 +29,7 @@ regulator-always-on; }; - gpio4pa2:gpio4pa2 { + gpio4pa2: gpio4pa2 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&gpio4_pa2>; @@ -37,7 +37,7 @@ regulator-always-on; }; - gpio4pa6:gpio4pa6 { + gpio4pa6: gpio4pa6 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&gpio4_pa6>; @@ -45,7 +45,7 @@ regulator-always-on; }; - gpio4pb0:gpio4pb0 { + gpio4pb0: gpio4pb0 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&gpio4_pb0>; @@ -53,7 +53,7 @@ regulator-always-on; }; - gpio4pb1:gpio4pb1 { + gpio4pb1: gpio4pb1 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&gpio4_pb1>; @@ -65,27 +65,27 @@ /**********GPIO***********/ &pinctrl{ gpio { - gpio4_pa4:gpio4-pa4 { + gpio4_pa4: gpio4-pa4 { rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; - gpio4_pa3:gpio4-pa3 { + gpio4_pa3: gpio4-pa3 { rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; - gpio4_pa2:gpio4-pa2 { + gpio4_pa2: gpio4-pa2 { rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; }; - gpio4_pa6:gpio4-pa6 { + gpio4_pa6: gpio4-pa6 { rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; }; - gpio4_pb0:gpio4-pb0 { + gpio4_pb0: gpio4-pb0 { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; - gpio4_pb1:gpio4-pb1 { + gpio4_pb1: gpio4-pb1 { rockchip,pins = <4 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -123,9 +123,9 @@ spidev@0 { spi-max-frequency = <50000000>; }; - fbtft@0 { - spi-max-frequency = <50000000>; - }; + fbtft@0 { + spi-max-frequency = <50000000>; + }; }; /**********I2C**********/ diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-86panel-ipc.dtsi b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-86panel-ipc.dtsi index e8b7028ae..f4e6fb77e 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-86panel-ipc.dtsi +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-86panel-ipc.dtsi @@ -55,10 +55,6 @@ panel: panel { compatible = "simple-panel"; - backlight = <&backlight>; - - reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>; - reset-delay-ms = <200>; status = "okay"; bus-format = ; @@ -282,7 +278,7 @@ status = "okay"; pinctrl-0 = <&i2c3m2_xfer &tp_rst &tp_irq>; clock-frequency = <100000>; - GT911:touchscreen { + GT911: touchscreen { compatible = "goodix,gt911"; reg = <0x14>; @@ -297,11 +293,11 @@ /**************************** PINCTRL ******************************/ &pinctrl { touchscreen { - tp_rst:tp-rst { + tp_rst: tp-rst { rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; }; - tp_irq:tp-irq { + tp_irq: tp-irq { rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; 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 6ddf33254..b2e0a9c39 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 @@ -60,16 +60,16 @@ // DHT11 dht11_sensor { - compatible = "dht11"; - pinctrl-names = "default"; - pinctrl-0 = <&gpio1_pc7>; + compatible = "dht11"; + pinctrl-names = "default"; + pinctrl-0 = <&gpio1_pc7>; - dht11@1 { - gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - label = "dht11"; - linux,default-trigger = "humidity"; - }; - }; + dht11@1 { + gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + label = "dht11"; + linux,default-trigger = "humidity"; + }; + }; }; @@ -145,8 +145,6 @@ &i2c4 { status = "okay"; clock-frequency = <400000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c4m2_xfer>; sc3336: sc3336@30 { compatible = "smartsens,sc3336"; @@ -272,22 +270,22 @@ #address-cells = <1>; #size-cells = <0>; spidev@0 { - compatible = "rockchip,spidev"; + compatible = "rockchip,spidev"; spi-max-frequency = <50000000>; reg = <0>; }; - fbtft@0{ - compatible = "sitronix,st7789v"; - reg = <0>; - spi-max-frequency = <20000000>; - fps = <30>; - buswidth = <8>; - debug = <0x7>; - led-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;//BL - dc-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; //DC - reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; //RES - }; + fbtft@0 { + compatible = "sitronix,st7789v"; + reg = <0>; + spi-max-frequency = <20000000>; + fps = <30>; + buswidth = <8>; + debug = <0x7>; + led-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;//BL + dc-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;//DC + reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;//RES + }; }; // I2C &i2c0 { @@ -302,9 +300,11 @@ pinctrl-0 = <&i2c3m1_xfer &i2c3m0_xfer>; }; -// &i2c4 { -// pinctrl-0 = <&i2c4m0_xfer>; -// }; +&i2c4 { + pinctrl-names = "default", "conifg"; + pinctrl-0 = <&i2c4m2_xfer>; + pinctrl-1 = <&i2c4m0_xfer>; +}; // UART &uart0 { @@ -337,7 +337,7 @@ pinctrl-0 = <&pwm4m2_pins>; }; &pwm5 { - pinctrl-0 = <&pwm5m2_pins>; + pinctrl-0 = <&pwm5m1_pins &pwm5m2_pins>; }; &pwm6 { pinctrl-0 = <&pwm6m1_pins &pwm6m2_pins>; @@ -352,7 +352,7 @@ pinctrl-0 = <&pwm10m1_pins &pwm10m2_pins>; }; &pwm11 { - pinctrl-0 = <&pwm11m1_pins>; + pinctrl-0 = <&pwm11m1_pins &pwm11m2_pins>; }; &pinctrl { @@ -371,10 +371,10 @@ }; }; - gpio1-pc7 { - gpio1_pc7:gpio1-pc7 { - rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; - }; + gpio1-pc7 { + gpio1_pc7: gpio1-pc7 { + rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; }; 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 30ba9cdef..505e53a83 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 @@ -55,10 +55,6 @@ panel: panel { compatible = "simple-panel"; - backlight = <&backlight>; - - reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>; - reset-delay-ms = <200>; status = "okay"; bus-format = ; @@ -445,17 +441,18 @@ }; &i2c3 { - clock-frequency = <100000>; - GT911:touchscreen { - compatible = "goodix,gt911"; - reg = <0x14>; + status = "okay"; + clock-frequency = <100000>; + GT911:touchscreen { + compatible = "goodix,gt911"; + reg = <0x14>; - interrupt-parent = <&gpio0>; - interrupts = ; + interrupt-parent = <&gpio0>; + interrupts = ; - reset-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - }; + reset-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + }; }; /**************************** PINCTRL ******************************/ @@ -558,11 +555,11 @@ }; touchscreen { - tp_rst:tp-rst { + tp_rst: tp-rst { rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; - tp_irq:tp-irq { + tp_irq: tp-irq { rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; }; diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-86panel-w.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-86panel-w.dts index 9fcb0458c..aaaf6c3a1 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-86panel-w.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-86panel-w.dts @@ -100,7 +100,7 @@ }; &pinctrl{ - sdmmc0{ + sdmmc0 { sdmmc0_det: sdmmc0-det { rockchip,pins = /* sdmmc0_det */ diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pi-w.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pi-w.dts index 6594ac3df..e92b66995 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pi-w.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pi-w.dts @@ -96,7 +96,7 @@ }; &pinctrl{ - sdmmc0{ + sdmmc0 { sdmmc0_det: sdmmc0-det { rockchip,pins = /* sdmmc0_det */ diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-max.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts similarity index 93% rename from sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-max.dts rename to sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts index b72aebb01..7c8a3e503 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-max.dts +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts @@ -10,7 +10,7 @@ #include "rv1106-luckfox-pico-pro-max-ipc.dtsi" / { - model = "Luckfox Pico Max"; + model = "Luckfox Pico Pro Max"; compatible = "rockchip,rv1103g-38x38-ipc-v10", "rockchip,rv1106g3"; }; @@ -51,13 +51,19 @@ /**********SDMMC**********/ &sdmmc { - max-frequency = <50000000>; - no-sdio; + max-freqency = <50000000>; no-mmc; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; disable-wp; + + //sdio + cap-sdio-irq; + non-removable; + no-1-8-v; + supports-sdio; + pinctrl-names = "default"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; status = "okay"; @@ -93,9 +99,9 @@ spidev@0 { spi-max-frequency = <50000000>; }; - fbtft@0 { + fbtft@0 { spi-max-frequency = <50000000>; - }; + }; }; /**********I2C**********/ diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro.dts b/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro.dts deleted file mode 100755 index 773852048..000000000 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro.dts +++ /dev/null @@ -1,106 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2022 Rockchip Electronics Co., Ltd. - */ - -/dts-v1/; - -#include "rv1106.dtsi" -#include "rv1106-evb.dtsi" -#include "rv1106-luckfox-pico-pro-max-ipc.dtsi" - -/ { - model = "Luckfox Pico Pro"; - compatible = "rockchip,rv1103g-38x38-ipc-v10", "rockchip,rv1106"; -}; - -/**********FLASH**********/ -&sfc { - status = "okay"; - flash@0 { - compatible = "spi-nand"; - reg = <0>; - spi-max-frequency = <75000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; - }; -}; - -/**********SDMMC**********/ -&sdmmc { - max-frequency = <50000000>; - no-sdio; - no-mmc; - bus-width = <4>; - cap-mmc-highspeed; - cap-sd-highspeed; - disable-wp; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; - status = "okay"; -}; - -/**********ETH**********/ -&gmac { - status = "okay"; -}; - -/**********USB**********/ -&u2phy { - status = "okay"; -}; - -&u2phy_otg { - rockchip,dis-u2-susphy; - status = "okay"; -}; - -&usbdrd { - status = "okay"; -}; - -&usbdrd_dwc3 { - status = "okay"; - dr_mode = "peripheral"; -}; - -/**********SPI**********/ -&spi0 { - status = "disabled"; - spidev@0 { - spi-max-frequency = <50000000>; - }; - fbtft@0 { - spi-max-frequency = <50000000>; - }; -}; - -/**********I2C**********/ -/* I2C3_M1 */ -&i2c3 { - status = "disabled"; - clock-frequency = <100000>; -}; - -/* I2C1_M1 */ -&i2c1 { - status = "disabled"; - clock-frequency = <100000>; -}; - - -/**********UART**********/ -/* UART3_M1 */ -&uart3 { - status = "disabled"; -}; - -/* UART4_M1 */ -&uart4 { - status = "disabled"; -}; - -/**********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 a28d24fbd..cb08548fc 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 @@ -23,16 +23,16 @@ reset-gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_LOW>; }; - wireless_bluetooth: wireless-bluetooth { - compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; - pinctrl-names = "default", "rts_gpio"; - pinctrl-0 = <&uart1m0_rtsn>; - pinctrl-1 = <&uart1_gpios>; - BT,wake_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; + wireless_bluetooth: wireless-bluetooth { + compatible = "bluetooth-platdata"; + uart_rts_gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; + pinctrl-names = "default", "rts_gpio"; + pinctrl-0 = <&uart1m0_rtsn>; + pinctrl-1 = <&uart1_gpios>; + BT,wake_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,wake_host_irq = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; }; /**********CRU**********/ @@ -79,20 +79,20 @@ /**********SDIO-WIFI**********/ &sdmmc { - max-frequency = <50000000>; - bus-width = <4>; - cap-sd-highspeed; - cap-sdio-irq; - keep-power-in-suspend; - non-removable; - rockchip,default-sample-phase = <90>; - // no-sd; - // no-mmc; - supports-sdio; - mmc-pwrseq = <&sdio_pwrseq>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_bus4 &sdmmc0_det>; - status = "okay"; + max-frequency = <50000000>; + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + non-removable; + rockchip,default-sample-phase = <90>; + // no-sd; + // no-mmc; + supports-sdio; + mmc-pwrseq = <&sdio_pwrseq>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_bus4 &sdmmc0_det>; + status = "okay"; }; &pinctrl{ @@ -102,7 +102,7 @@ /* sdmmc0_det */ <3 RK_PA1 1 &pcfg_pull_down>; }; - }; + }; }; @@ -115,7 +115,7 @@ &usbdrd_dwc3 { status = "okay"; dr_mode = "peripheral"; - #dr_mode = "host"; + //dr_mode = "host"; }; /**********RTC**********/ @@ -131,11 +131,11 @@ }; &pinctrl { - wireless-bluetooth { - uart1_gpios: uart1-gpios { - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; + wireless-bluetooth { + uart1_gpios: uart1-gpios { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; /**********SPI**********/ 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 152559a29..4fe82d613 100755 --- a/sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig +++ b/sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig @@ -205,7 +205,7 @@ CONFIG_ROCKCHIP_VOP=y CONFIG_ROCKCHIP_RGB=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_SII902X=y -CONFIG_BACKLIGHT_PWM=y +CONFIG_BACKLIGHT_PWM=m CONFIG_ROCKCHIP_MULTI_RGA=m CONFIG_ROCKCHIP_RGA_PROC_FS=y # CONFIG_ROCKCHIP_RGA_DEBUG_FS is not set @@ -223,6 +223,7 @@ CONFIG_SND=y # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set # CONFIG_SND_SPI is not set +CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_SOC_ROCKCHIP=y CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y @@ -236,6 +237,8 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CH343=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y @@ -270,6 +273,7 @@ CONFIG_DMABUF_RK_HEAPS_DEBUG=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set CONFIG_STAGING=y +CONFIG_RTL8723BS=m CONFIG_FB_TFT=y CONFIG_FB_TFT_ST7735R=y CONFIG_FB_TFT_ST7789V=y diff --git a/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/Kconfig b/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/Kconfig index b30c238a1..599925167 100644 --- a/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/Kconfig +++ b/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/Kconfig @@ -1054,6 +1054,10 @@ config ROCKCHIP_SET_SN bool "Rockchip set serial number" default y +config LUCKFOX_EXECUTE_CMD + bool "luckfox execute cmd" + default n + config ROCKCHIP_SET_ETHADDR bool "Rockchip set eth address" default y diff --git a/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/board.c b/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/board.c index 6121bb8ce..067176a9b 100644 --- a/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/board.c +++ b/sysdrv/source/uboot/u-boot/arch/arm/mach-rockchip/board.c @@ -94,6 +94,16 @@ __weak int rk_board_init(void) return 0; } +#ifdef CONFIG_LUCKFOX_EXECUTE_CMD +static int luckfox_execute_cmd(void) +{ + /* Luckfox Pico RGB MCU reset gpio */ + run_command("gpio set 1 1",0); + + return 0; +} +#endif + #ifdef CONFIG_ROCKCHIP_SET_ETHADDR /* * define serialno max length, the max length is 512 Bytes @@ -453,6 +463,9 @@ static void scan_run_cmd(void) int board_late_init(void) { +#ifdef CONFIG_LUCKFOX_EXECUTE_CMD + luckfox_execute_cmd(); +#endif #ifdef CONFIG_ROCKCHIP_SET_ETHADDR rockchip_set_ethaddr(); #endif diff --git a/sysdrv/source/uboot/u-boot/configs/luckfox_rv1106_uboot_defconfig b/sysdrv/source/uboot/u-boot/configs/luckfox_rv1106_uboot_defconfig index b02e74e0c..0fe5c20b3 100644 --- a/sysdrv/source/uboot/u-boot/configs/luckfox_rv1106_uboot_defconfig +++ b/sysdrv/source/uboot/u-boot/configs/luckfox_rv1106_uboot_defconfig @@ -22,7 +22,6 @@ CONFIG_DEBUG_UART=y # CONFIG_DISTRO_DEFAULTS is not set CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y -# CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_FIT_HW_CRYPTO=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y @@ -40,7 +39,6 @@ CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_AB=y CONFIG_HUSH_PARSER=y @@ -54,6 +52,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_CRC32 is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y CONFIG_RANDOM_UUID=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/sysdrv/source/uboot/u-boot/configs/rv1106-luckfox-rgb-reset.config b/sysdrv/source/uboot/u-boot/configs/rv1106-luckfox-rgb-reset.config new file mode 100644 index 000000000..83d9e8db3 --- /dev/null +++ b/sysdrv/source/uboot/u-boot/configs/rv1106-luckfox-rgb-reset.config @@ -0,0 +1 @@ +CONFIG_LUCKFOX_EXECUTE_CMD=y diff --git a/sysdrv/tools/board/buildroot/luckfox_pico_defconfig b/sysdrv/tools/board/buildroot/luckfox_pico_defconfig index c78ae812e..0e94cc3de 100755 --- a/sysdrv/tools/board/buildroot/luckfox_pico_defconfig +++ b/sysdrv/tools/board/buildroot/luckfox_pico_defconfig @@ -40,6 +40,9 @@ BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_LIBV4L=y BR2_PACKAGE_LIBV4L_UTILS=y +BR2_PACKAGE_PCRE2=y +BR2_PACKAGE_PCRE2_16=y +BR2_PACKAGE_PCRE2_32=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPERF3=y BR2_PACKAGE_LRZSZ=y diff --git a/sysdrv/tools/board/buildroot/luckfox_pico_w_defconfig b/sysdrv/tools/board/buildroot/luckfox_pico_w_defconfig index 3a6dbaec6..cad801391 100755 --- a/sysdrv/tools/board/buildroot/luckfox_pico_w_defconfig +++ b/sysdrv/tools/board/buildroot/luckfox_pico_w_defconfig @@ -68,6 +68,8 @@ BR2_PACKAGE_CJSON=y BR2_PACKAGE_CJSON_UTILS=y BR2_PACKAGE_LIBRSYNC=y BR2_PACKAGE_PCRE2=y +BR2_PACKAGE_PCRE2_16=y +BR2_PACKAGE_PCRE2_32=y BR2_PACKAGE_BLUEZ_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y