diff --git a/build/Kconfig b/build/Kconfig
index 8609d6431..30ae76d8b 100644
--- a/build/Kconfig
+++ b/build/Kconfig
@@ -488,6 +488,12 @@ config ROOTFS_OVERLAYFS
 	help
 	  Enable rootfs with overlayfs.
 
+config BUILDROOT_FS
+	bool "Enable buildroot generate rootfs"
+	default n
+	help
+	  Enable buildroot generate rootfs.
+
 config USE_4K_ERASE_SIZE_FOR_JFFS2
 	bool "Use 4K erase size for jffs2 filesystem"
 	default n
diff --git a/build/Makefile b/build/Makefile
index 7c9cdfbde..5fabc48fe 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -534,10 +534,67 @@ define raw2cimg
 	${Q}python3 $(COMMON_TOOLS_PATH)/image_tool/raw2cimg.py $(OUTPUT_DIR)/rawimages/${1} $(OUTPUT_DIR) $(FLASH_PARTITION_XML)
 endef
 
+
+# BR_OVERLAY_DIR
+# BR_ROOTFS_RAWIMAGE
+br-rootfs-prepare:export CROSS_COMPILE_KERNEL=$(patsubst "%",%,$(CONFIG_CROSS_COMPILE_KERNEL))
+br-rootfs-prepare:export CROSS_COMPILE_SDK=$(patsubst "%",%,$(CONFIG_CROSS_COMPILE_SDK))
+br-rootfs-prepare:
+	$(call print_target)
+ifneq ($(STORAGE_TYPE), sd)
+	${Q}cp -r ${RAMDISK_PATH}/rootfs/buildroot_fs/arm/* $(BR_ROOTFS_DIR)
+	$(call TARGET_PACKAGE_INSTALL_BR_ROOTFS)
+	${Q}mkdir -p $(BR_ROOTFS_DIR)/etc/init.d/
+	${Q}python3 $(COMMON_TOOLS_PATH)/image_tool/create_automount.py $(FLASH_PARTITION_XML) $(BR_ROOTFS_DIR)/etc/init.d/
+	# Generate /etc/fw_env.config
+	# ${Q}mkdir -p $(BR_ROOTFS_DIR)/etc
+	${Q}python3 $(COMMON_TOOLS_PATH)/image_tool/mkcvipart.py $(FLASH_PARTITION_XML) $(BR_ROOTFS_DIR)/etc --fw_env
+endif
+# copy ko and mmf libs
+	${Q}mkdir -p $(BR_ROOTFS_DIR)/mnt/system
+	${Q}cp -arf ${SYSTEM_OUT_DIR}/* $(BR_ROOTFS_DIR)/mnt/system/
+# strip
+	${Q}find $(BR_ROOTFS_DIR) -name "*.ko" -type f -printf 'striping %p\n' -exec $(CROSS_COMPILE_KERNEL)strip --strip-unneeded {} \;
+	${Q}find $(BR_ROOTFS_DIR) -name "*.so*" -type f -printf 'striping %p\n' -exec $(CROSS_COMPILE_KERNEL)strip --strip-all {} \;
+	${Q}find $(BR_ROOTFS_DIR) -executable -type f ! -name "*.sh" ! -path "*etc*" ! -path "*.ko" -printf 'striping %p\n' -exec $(CROSS_COMPILE_SDK)strip --strip-all {} 2>/dev/null \;
+	${Q}mkdir -p $(BR_OVERLAY_DIR)
+	${Q}cp -arf $(BR_ROOTFS_DIR)/* $(BR_OVERLAY_DIR)
+
+br-rootfs-pack:export TARGET_OUTPUT_DIR=$(BR_DIR)/output/$(BR_BOARD)
+br-rootfs-pack:
+	$(call print_target)
+	${Q}$(MAKE) -C $(BR_DIR) $(BR_DEFCONFIG) BR2_TOOLCHAIN_EXTERNAL_PATH=$(CROSS_COMPILE_PATH)
+	${Q}$(MAKE) -j${NPROC} -C $(BR_DIR)
+	# ${Q}rm -rf $(BR_ROOTFS_DIR)/*
+# copy rootfs to rawimg dir
+	${Q}cp $(TARGET_OUTPUT_DIR)/images/rootfs.ext4 $(OUTPUT_DIR)/rawimages/rootfs_ext4.$(STORAGE_TYPE)
+	$(call raw2cimg ,rootfs_ext4.$(STORAGE_TYPE))
+
+ifeq ($(CONFIG_BUILDROOT_FS),y)
+rootfs:br-rootfs-prepare
+rootfs:br-rootfs-pack
+else
 rootfs:rootfs-pack
 rootfs:
 	$(call print_target)
+ifneq ($(STORAGE_TYPE), sd)
 	$(call raw2cimg ,rootfs.$(STORAGE_TYPE))
+endif
+endif
+
+
+sd_image:
+	$(call print_target)
+	-${Q}rm  $(OUTPUT_DIR)/fs
+ifeq ($(CONFIG_BUILDROOT_FS),y)
+	${Q}rm $(OUTPUT_DIR)/br-rootfs -rf
+	${Q}ln -s $(OUTPUT_DIR)/br-rootfs $(OUTPUT_DIR)/fs
+	${Q}mkdir $(OUTPUT_DIR)/br-rootfs
+	${Q}tar xvf $(BR_DIR)/output/$(BR_BOARD)/images/rootfs.tar.xz -C $(OUTPUT_DIR)/br-rootfs
+else
+	${Q}ln -s $(OUTPUT_DIR)/rootfs $(OUTPUT_DIR)/fs
+endif
+	$(COMMON_TOOLS_PATH)/sd_tools/sd_gen_burn_image.sh $(OUTPUT_DIR)
 
 jffs2:
 	$(call print_target)
diff --git a/build/boards/cv180x/cv1800b_sophpi_duo_sd/cv1800b_sophpi_duo_sd_defconfig b/build/boards/cv180x/cv1800b_sophpi_duo_sd/cv1800b_sophpi_duo_sd_defconfig
index 1bcd8b6bf..aaa58792d 100644
--- a/build/boards/cv180x/cv1800b_sophpi_duo_sd/cv1800b_sophpi_duo_sd_defconfig
+++ b/build/boards/cv180x/cv1800b_sophpi_duo_sd/cv1800b_sophpi_duo_sd_defconfig
@@ -28,6 +28,7 @@ CONFIG_UBOOT_2021_10=y
 CONFIG_KERNEL_SRC_5.10=y
 CONFIG_KERNEL_LZMA=y
 CONFIG_SKIP_RAMDISK=y
+CONFIG_BUILDROOT_FS=y
 # CONFIG_ROOTFS_OVERLAYFS is not set
 # CONFIG_TARGET_PACKAGE_CVITRACER is not set
 # CONFIG_TARGET_PACKAGE_GDBSERVER is not set
diff --git a/build/common_functions.sh b/build/common_functions.sh
index 474b7dcdf..9cf9864ce 100644
--- a/build/common_functions.sh
+++ b/build/common_functions.sh
@@ -246,7 +246,9 @@ function pack_upgrade
 
 function pack_sd_image
 {(
-  "$COMMON_TOOLS_PATH"/sd_tools/sd_gen_burn_image.sh "$OUTPUT_DIR"
+  pushd "$BUILD_PATH"
+  make sd_image || return "$?"
+  popd
 )}
 
 function pack_prog_img
diff --git a/build/cvisetup.sh b/build/cvisetup.sh
index becc1ad26..1847854d6 100644
--- a/build/cvisetup.sh
+++ b/build/cvisetup.sh
@@ -511,6 +511,15 @@ function cvi_setup_env()
       return 1
     fi
   fi
+
+  export SYSTEM_OUT_DIR
+  export CROSS_COMPILE_PATH
+  # buildroot config
+  export BR_DIR="$TOP_DIR"/buildroot-2021.05
+  export BR_BOARD=cvitek_${CHIP_ARCH}_${SDK_VER}
+  export BR_OVERLAY_DIR=${BR_DIR}/board/cvitek/${CHIP_ARCH}/overlay
+  export BR_DEFCONFIG=${BR_BOARD}_defconfig
+  export BR_ROOTFS_DIR="$OUTPUT_DIR"/tmp-rootfs
 }
 
 cvi_print_env()
diff --git a/build/tools/common/sd_tools/sd_gen_burn_image.sh b/build/tools/common/sd_tools/sd_gen_burn_image.sh
index 0f5994648..93d8af63a 100755
--- a/build/tools/common/sd_tools/sd_gen_burn_image.sh
+++ b/build/tools/common/sd_tools/sd_gen_burn_image.sh
@@ -66,7 +66,7 @@ sudo mount -t ext4 ${dev_name}p2 tmp2/
 # copy boot file and rootfs
 sudo cp ${output_dir}/fip.bin ./tmp1/
 sudo cp ${output_dir}/rawimages/boot.sd ./tmp1/
-sudo cp -raf ${output_dir}/rootfs/* ./tmp2
+sudo cp -raf ${output_dir}/fs/* ./tmp2
 
 sync