From 932cab4805db2bff706bd726ac450fd50ed48ad9 Mon Sep 17 00:00:00 2001 From: eng33 Date: Tue, 14 Nov 2023 17:06:47 +0800 Subject: [PATCH] fix:sd card mount --- project/build.sh | 12 ++++++++++++ .../BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico-IPC.mk | 2 +- ...onfig-EMMC-NONE-RV1103_Luckfox_Pico_Mini_A-IPC.mk | 2 +- ...g-SPI_NAND-NONE-RV1103_Luckfox_Pico_Mini_B-IPC.mk | 2 +- ...fig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Plus-IPC.mk | 2 +- ...-SPI_NAND-NONE-RV1106_Luckfox_Pico_Pro_Max-IPC.mk | 2 +- .../arch/arm/boot/dts/rv1103-luckfox-pico-ipc.dtsi | 2 +- .../arm/boot/dts/rv1103-luckfox-pico-mini-ipc.dtsi | 2 +- .../arm/boot/dts/rv1103-luckfox-pico-plus-ipc.dtsi | 2 +- .../boot/dts/rv1106-luckfox-pico-pro-max-ipc.dtsi | 2 +- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/project/build.sh b/project/build.sh index e23de049a..a3d6bfbb3 100755 --- a/project/build.sh +++ b/project/build.sh @@ -1312,6 +1312,18 @@ function parse_partition_file() echo "ln -sf /dev/${storage_dev_prefix}${part_num} ${part_name}" >> $RK_PROJECT_FILE_ROOTFS_SCRIPT part_num=$(( part_num + 1 )) done + cat >> $RK_PROJECT_FILE_ROOTFS_SCRIPT <> $RK_PROJECT_FILE_ROOTFS_SCRIPT diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico-IPC.mk index c40d4ae82..ef174ffb5 100644 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico-IPC.mk @@ -48,7 +48,7 @@ export RK_BOOTARGS_CMA_SIZE="24M" # := [@](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),2G(rootfs),1G(oem),1G(userdata),-(media)" +export RK_PARTITION_CMD_IN_ENV="32K(env),512K@32K(idblock),256K(uboot),32M(boot),512M(oem),256M(userdata),3G(rootfs),-(media)" # config partition's filesystem type (squashfs is readonly) # emmc: squashfs/ext4 diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico_Mini_A-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico_Mini_A-IPC.mk index 6d7864e58..6fcbb7ad6 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico_Mini_A-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-NONE-RV1103_Luckfox_Pico_Mini_A-IPC.mk @@ -48,7 +48,7 @@ export RK_BOOTARGS_CMA_SIZE="24M" # := [@](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),2G(rootfs),1G(oem),2G(userdata),-(media)" +export RK_PARTITION_CMD_IN_ENV="32K(env),512K@32K(idblock),256K(uboot),32M(boot),512M(oem),256M(userdata),3G(rootfs),-(media)" # config partition's filesystem type (squashfs is readonly) # emmc: squashfs/ext4 diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Mini_B-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Mini_B-IPC.mk index 12fe9f2b9..93a227775 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Mini_B-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Mini_B-IPC.mk @@ -48,7 +48,7 @@ export RK_BOOTARGS_CMA_SIZE="24M" # := [@](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),80M(rootfs),30M(oem),10M(userdata)" +export RK_PARTITION_CMD_IN_ENV="256K(env),256K@256K(idblock),512K(uboot),4M(boot),30M(oem),10M(userdata),80M(rootfs)" # config partition's filesystem type (squashfs is readonly) # emmc: squashfs/ext4 diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Plus-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Plus-IPC.mk index 47458fd8a..6f249e97f 100644 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Plus-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1103_Luckfox_Pico_Plus-IPC.mk @@ -51,7 +51,7 @@ export RK_BOOTARGS_CMA_SIZE="24M" # := [@](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),80M(rootfs),30M(oem),10M(userdata)" +export RK_PARTITION_CMD_IN_ENV="256K(env),256K@256K(idblock),512K(uboot),4M(boot),30M(oem),10M(userdata),80M(rootfs)" #export RK_PARTITION_CMD_IN_ENV="256K(env),256K@256K(idblock),256K(uboot),8M(boot),32M(rootfs),48M(oem),32M(userdata),-(media)" # config partition's filesystem type (squashfs is readonly) diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1106_Luckfox_Pico_Pro_Max-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1106_Luckfox_Pico_Pro_Max-IPC.mk index b082169de..a3ddb592f 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1106_Luckfox_Pico_Pro_Max-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-SPI_NAND-NONE-RV1106_Luckfox_Pico_Pro_Max-IPC.mk @@ -49,7 +49,7 @@ export RK_BOOTARGS_CMA_SIZE="66M" # := [@](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),210M(rootfs),30M(oem),10M(userdata)" +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) 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 7600c916d..dee1d3f87 100644 --- 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 @@ -6,7 +6,7 @@ / { chosen { - bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; + bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=/dev/mmcblk1p7 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; }; acodec_sound: acodec-sound { diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-mini-ipc.dtsi b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-mini-ipc.dtsi index fc4cf25f6..823c805f2 100755 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-mini-ipc.dtsi +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-mini-ipc.dtsi @@ -6,7 +6,7 @@ / { chosen { - bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; + bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=/dev/mmcblk1p7 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; }; acodec_sound: acodec-sound { diff --git a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-plus-ipc.dtsi b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-plus-ipc.dtsi index fc4cf25f6..823c805f2 100644 --- a/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-plus-ipc.dtsi +++ b/sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-plus-ipc.dtsi @@ -6,7 +6,7 @@ / { chosen { - bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; + bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=/dev/mmcblk1p7 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; }; acodec_sound: acodec-sound { 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 583c684c2..84449ef45 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 @@ -6,7 +6,7 @@ / { chosen { - bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; + bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=/dev/mmcblk1p7 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0"; }; acodec_sound: acodec-sound {