From 0ddc9756315ed3c35c86a273450cc09926fe346b Mon Sep 17 00:00:00 2001 From: FantasyGmm <16450052+FantasyGmm@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:52:28 +0000 Subject: [PATCH 1/3] Add zram config --- .../cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig | 5 +++++ .../linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig | 5 +++++ device/milkv-duo/overlay/mnt/system/duo-init.sh | 8 +++++++- device/milkv-duo256m/overlay/mnt/system/duo-init.sh | 8 +++++++- device/milkv-duos/overlay/mnt/system/duo-init.sh | 8 +++++++- 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig b/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig index 7dda2af25..db42ac021 100644 --- a/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig +++ b/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig @@ -42,3 +42,8 @@ CONFIG_USE_4K_ERASE_SIZE_FOR_JFFS2=y CONFIG_USB_OSDRV_CVITEK_GADGET=n CONFIG_BUILDROOT_FS=y CONFIG_BUILD_FOR_DEBUG=y +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=y +CONFIG_ZRAM=m +CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_MEMORY_TRACKING=y \ No newline at end of file diff --git a/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig b/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig index 43ed58c24..064f65499 100644 --- a/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig +++ b/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig @@ -37,6 +37,8 @@ CONFIG_BLK_SCSI_REQUEST=y # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_COREDUMP is not set CONFIG_CMA=y +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -56,6 +58,9 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BLOCK=y +CONFIG_ZRAM=m +CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_SCSI_PROC_FS=y diff --git a/device/milkv-duo/overlay/mnt/system/duo-init.sh b/device/milkv-duo/overlay/mnt/system/duo-init.sh index b7f31bcc4..d04767e87 100755 --- a/device/milkv-duo/overlay/mnt/system/duo-init.sh +++ b/device/milkv-duo/overlay/mnt/system/duo-init.sh @@ -7,5 +7,11 @@ devmem 0x03001068 32 0x3 # Set Pin-19(GP14) to GPIO duo-pinmux -w GP14/GP14 > /dev/null -# insmod pwm module +# Insmod PWM Module insmod /mnt/system/ko/cv180x_pwm.ko + +# Init Zram +insmod /mnt/system/ko/zram.ko +echo "128M" | tee /sys/block/zram0/disksize +/sbin/mkswap /dev/zram0 +/sbin/swapon /dev/zram0 \ No newline at end of file diff --git a/device/milkv-duo256m/overlay/mnt/system/duo-init.sh b/device/milkv-duo256m/overlay/mnt/system/duo-init.sh index fda9d7862..302eff8f7 100755 --- a/device/milkv-duo256m/overlay/mnt/system/duo-init.sh +++ b/device/milkv-duo256m/overlay/mnt/system/duo-init.sh @@ -7,5 +7,11 @@ devmem 0x03001068 32 0x3 # Set Pin-19(GP14) to GPIO duo-pinmux -w GP14/GP14 > /dev/null -# insmod pwm module +# Insmod PWM Module insmod /mnt/system/ko/cv181x_pwm.ko + +# Init Zram +insmod /mnt/system/ko/zram.ko +echo "128M" | tee /sys/block/zram0/disksize +/sbin/mkswap /dev/zram0 +/sbin/swapon /dev/zram0 \ No newline at end of file diff --git a/device/milkv-duos/overlay/mnt/system/duo-init.sh b/device/milkv-duos/overlay/mnt/system/duo-init.sh index bcdcdf327..07239630b 100755 --- a/device/milkv-duos/overlay/mnt/system/duo-init.sh +++ b/device/milkv-duos/overlay/mnt/system/duo-init.sh @@ -25,9 +25,15 @@ insmod /mnt/system/ko/aic8800_bsp.ko sleep 0.5 insmod /mnt/system/ko/aic8800_fdrv.ko -# insmod pwm module +# Insmod PWM Module insmod /mnt/system/ko/cv181x_pwm.ko +# Init Zram +insmod /mnt/system/ko/zram.ko +echo "128M" | tee /sys/block/zram0/disksize +/sbin/mkswap /dev/zram0 +/sbin/swapon /dev/zram0 + # Camera2 camera2_rst=484 set_gpio ${camera2_rst} 1 From 7e3d9f7a8d96fecee490edd49a8f9ef0fdd21714 Mon Sep 17 00:00:00 2001 From: FantasyGmm <16450052+FantasyGmm@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:04:57 +0000 Subject: [PATCH 2/3] add br top-level parallel build --- buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig | 2 +- .../configs/milkv-duo256m-lite_musl_riscv64_defconfig | 2 +- buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig | 2 +- buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig | 2 +- buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig index aeb4cc8c7..c430fead5 100644 --- a/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig +++ b/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig @@ -97,7 +97,7 @@ BR2_GLOBAL_PATCH_DIR="" BR2_COMPILER_PARANOID_UNSAFE_PATH=y # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set -# BR2_PER_PACKAGE_DIRECTORIES is not set +BR2_PER_PACKAGE_DIRECTORIES=y # # Security Hardening Options diff --git a/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig index 39387eff8..ff0a4debd 100644 --- a/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig +++ b/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig @@ -97,7 +97,7 @@ BR2_GLOBAL_PATCH_DIR="" BR2_COMPILER_PARANOID_UNSAFE_PATH=y # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set -# BR2_PER_PACKAGE_DIRECTORIES is not set +BR2_PER_PACKAGE_DIRECTORIES=y # # Security Hardening Options diff --git a/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig index 2b0a01ccb..0fbb2c4d4 100644 --- a/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig +++ b/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig @@ -97,7 +97,7 @@ BR2_GLOBAL_PATCH_DIR="" BR2_COMPILER_PARANOID_UNSAFE_PATH=y # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set -# BR2_PER_PACKAGE_DIRECTORIES is not set +BR2_PER_PACKAGE_DIRECTORIES=y # # Security Hardening Options diff --git a/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig index 85526b7b4..9c29c1c41 100644 --- a/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig +++ b/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig @@ -97,7 +97,7 @@ BR2_GLOBAL_PATCH_DIR="" BR2_COMPILER_PARANOID_UNSAFE_PATH=y # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set -# BR2_PER_PACKAGE_DIRECTORIES is not set +BR2_PER_PACKAGE_DIRECTORIES=y # # Security Hardening Options diff --git a/buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig index 344b40166..9ff8329b4 100644 --- a/buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig +++ b/buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig @@ -97,7 +97,7 @@ BR2_GLOBAL_PATCH_DIR="" BR2_COMPILER_PARANOID_UNSAFE_PATH=y # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set -# BR2_PER_PACKAGE_DIRECTORIES is not set +BR2_PER_PACKAGE_DIRECTORIES=y # # Security Hardening Options From 727fed9df7f7ad022b4c8e88e763a3a556ca99d5 Mon Sep 17 00:00:00 2001 From: FantasyGmm <16450052+FantasyGmm@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:43:13 +0000 Subject: [PATCH 3/3] add mising swap config --- .../cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig | 7 +------ .../linux/cvitek_cv1800b_milkv_duo_sd_defconfig | 5 +++++ .../linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig | 2 +- .../linux/cvitek_cv1813h_milkv_duos_emmc_defconfig | 7 ++++++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig b/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig index db42ac021..cea139a23 100644 --- a/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig +++ b/build/boards/cv180x/cv1800b_milkv_duo_sd/cv1800b_milkv_duo_sd_defconfig @@ -41,9 +41,4 @@ CONFIG_DUMP_PRINT_SZ_IDX=17 CONFIG_USE_4K_ERASE_SIZE_FOR_JFFS2=y CONFIG_USB_OSDRV_CVITEK_GADGET=n CONFIG_BUILDROOT_FS=y -CONFIG_BUILD_FOR_DEBUG=y -CONFIG_ZSMALLOC=y -CONFIG_ZSMALLOC_STAT=y -CONFIG_ZRAM=m -CONFIG_ZRAM_WRITEBACK=y -CONFIG_ZRAM_MEMORY_TRACKING=y \ No newline at end of file +CONFIG_BUILD_FOR_DEBUG=y \ No newline at end of file diff --git a/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig b/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig index c75c4dd83..4c60136fc 100644 --- a/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig +++ b/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig @@ -38,6 +38,11 @@ CONFIG_BLK_SCSI_REQUEST=y # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_COREDUMP is not set CONFIG_CMA=y +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=y +CONFIG_ZRAM=m +CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y diff --git a/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig b/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig index 064f65499..4bfbc511c 100644 --- a/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig +++ b/build/boards/cv181x/cv1812cp_milkv_duo256m_sd/linux/cvitek_cv1812cp_milkv_duo256m_sd_defconfig @@ -1,5 +1,5 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_SWAP is not set +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ_IDLE=y diff --git a/build/boards/cv181x/cv1813h_milkv_duos_emmc/linux/cvitek_cv1813h_milkv_duos_emmc_defconfig b/build/boards/cv181x/cv1813h_milkv_duos_emmc/linux/cvitek_cv1813h_milkv_duos_emmc_defconfig index 9a32709d9..268160993 100644 --- a/build/boards/cv181x/cv1813h_milkv_duos_emmc/linux/cvitek_cv1813h_milkv_duos_emmc_defconfig +++ b/build/boards/cv181x/cv1813h_milkv_duos_emmc/linux/cvitek_cv1813h_milkv_duos_emmc_defconfig @@ -1,5 +1,5 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_SWAP is not set +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ_IDLE=y @@ -37,6 +37,8 @@ CONFIG_BLK_SCSI_REQUEST=y # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_COREDUMP is not set CONFIG_CMA=y +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -54,6 +56,9 @@ CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_OF_PARTS is not set CONFIG_MTD_BLOCK=y CONFIG_MTD_RAW_NAND=y +CONFIG_ZRAM=m +CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_SCSI_PROC_FS=y