diff --git a/configs/sipeed_licheervnano_defconfig b/configs/sipeed_licheervnano_defconfig
index 3482b86..5541f2c 100644
--- a/configs/sipeed_licheervnano_defconfig
+++ b/configs/sipeed_licheervnano_defconfig
@@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/linux_defconfig"
 BR2_LINUX_KERNEL_IMAGEGZ=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/dts/sg2002_licheervnano_sd.dts $(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/dts/*.dtsi $(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/generated/cvi_board_memmap.h"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/dts/sg2002_licheervnano_sd.dts $(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/dts/*.dtsi $(@D)/include/cvi_board_memmap.h"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
@@ -244,7 +244,7 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="a57aa1f29bb62dd9bc0c5f22b74520b8225d321f"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/uboot_defconfig"
 BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_LICHEERVNANO_BR_PATH)/board/sipeed/licheervnano/dts/*"
-BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="CVIBOARD=licheervnano_sd CHIP=sg2002 STORAGE_TYPE=sd CONFIG_USE_DEFAULT_ENV=y PANEL_TUNING_PARAM=MIPI_PANEL_ZCT2133V1"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="CVIBOARD=$(BR2_PACKAGE_CVITEKCONFIG_BOARD_NAME)_$(BR2_PACKAGE_CVITEKCONFIG_STORAGE) CHIP=$(BR2_PACKAGE_CVITEKCONFIG_CHIP) STORAGE_TYPE=$(BR2_PACKAGE_CVITEKCONFIG_STORAGE) CONFIG_USE_DEFAULT_ENV=y PANEL_TUNING_PARAM=$(UBOOT_PANEL_TUNING_PARM)"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
 BR2_PACKAGE_HOST_GENIMAGE=y
@@ -252,7 +252,8 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_PYTHON3=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
+BR2_PACKAGE_CVITEKCONFIG_PANEL_ZCT2133V1=y
 BR2_PACKAGE_AIC_FIRMWARE=y
 BR2_PACKAGE_CLOUDUTILS=y
 BR2_PACKAGE_CVITEK_MODULES=y
-BR2_PACKAGE_CVITEK_FSBL=y
+BR2_TARGET_CVITEKFSBL=y
diff --git a/package/cvitekconfig/cvitekconfig.mk b/package/cvitekconfig/cvitekconfig.mk
index 051447f..204e4f8 100644
--- a/package/cvitekconfig/cvitekconfig.mk
+++ b/package/cvitekconfig/cvitekconfig.mk
@@ -79,7 +79,7 @@ else ifeq ($(BR2_PACKAGE_CVITEKCONFIG_PANEL_OTA7290B),y)
 	UBOOT_PANEL_TUNING_PARM=MIPI_PANEL_OTA7290B
 else ifeq ($(BR2_PACKAGE_CVITEKCONFIG_PANEL_ST7701_D300FPC9307A),y)
 	UBOOT_PANEL_TUNING_PARM=MIPI_PANEL_ST7701_D300FPC9307A
-else ifeq ($(BR2_PACKAGE_CVITEKCONFIG_PANEL_OTA7290B_1920))
+else ifeq ($(BR2_PACKAGE_CVITEKCONFIG_PANEL_OTA7290B_1920),y)
 	UBOOT_PANEL_TUNING_PARM=MIPI_PANEL_OTA7290B_1920
 else ifeq ($(BR2_PACKAGE_CVITEKCONFIG_PANEL_ICN9707),y)
 	UBOOT_PANEL_TUNING_PARM=MIPI_PANEL_ICN9707