Merge pull request #53 from FantasyGmm/develop

Add zram config and parallel build
2024-01-17 03:37:22 +00:00
parent a488d06c79 c0aebb8a8e
commit 9ae7f96adb
12 changed files with 44 additions and 11 deletions
--- 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,4 +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_BUILD_FOR_DEBUG=y
--- 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
--- 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
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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