diff --git a/rk3126c/BoardConfig.mk b/rk312x/BoardConfig-rk3126c-evb-ddr3-v10-debian.mk
old mode 100755
new mode 100644
similarity index 78%
rename from rk3126c/BoardConfig.mk
rename to rk312x/BoardConfig-rk3126c-evb-ddr3-v10-debian.mk
index 6ed2c37..1d71e2c
--- a/rk3126c/BoardConfig.mk
+++ b/rk312x/BoardConfig-rk3126c-evb-ddr3-v10-debian.mk
@@ -12,16 +12,18 @@ export RK_UBOOT_SIZE_CONFIG=1024\ 2
 export RK_TRUST_SIZE_CONFIG=1024\ 2
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3126_linux.config
 # Kernel dts
-export RK_KERNEL_DTS=rk3126-linux
+export RK_KERNEL_DTS=rk3126c-evb-ddr3-v10-linux
 # boot image type
 export RK_BOOT_IMG=zboot.img
 # kernel image path
 export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage
 # parameter for GPT table
-export RK_PARAMETER=parameter-buildroot.txt
+export RK_PARAMETER=parameter-debian-rk3126.txt
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk312x
+export RK_CFG_BUILDROOT=rockchip_rk3126c
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rk312x_recovery
 # ramboot config
@@ -33,7 +35,9 @@ export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3126c
 # Set rootfs type, including ext2 ext4 squashfs
-export RK_ROOTFS_TYPE=squashfs
+export RK_ROOTFS_TYPE=ext4
+# Set debian version (debian10: buster, debian11: bullseye)
+export RK_DEBIAN_VERSION=buster
 # rootfs image path
 export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 # Set oem partition type, including ext2 squashfs
diff --git a/rk3126c/BoardConfig-rk3126c-evb-ddr3-v10-slc-nand.mk b/rk312x/BoardConfig-rk3126c-evb-ddr3-v10-slc-nand.mk
similarity index 90%
rename from rk3126c/BoardConfig-rk3126c-evb-ddr3-v10-slc-nand.mk
rename to rk312x/BoardConfig-rk3126c-evb-ddr3-v10-slc-nand.mk
index 68f35da..ab66698 100644
--- a/rk3126c/BoardConfig-rk3126c-evb-ddr3-v10-slc-nand.mk
+++ b/rk312x/BoardConfig-rk3126c-evb-ddr3-v10-slc-nand.mk
@@ -15,9 +15,9 @@ export RK_UBOOT_SIZE_CONFIG=1024\ 2
 # Trust size
 export RK_TRUST_SIZE_CONFIG=1024\ 2
 # Kernel defconfig
-export RK_KERNEL_DEFCONFIG=rk3126_linux_defconfig
+export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig
 # Kernel defconfig fragment
-export RK_KERNEL_DEFCONFIG_FRAGMENT=rk312x-slc-nand.config
+export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3126_linux_slc_nand.config
 # Kernel dts
 export RK_KERNEL_DTS=rk3126c-evb-ddr3-v10-linux-slc
 # boot image type
@@ -25,7 +25,7 @@ export RK_BOOT_IMG=zboot.img
 # kernel image path
 export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage
 # parameter for GPT table
-export RK_PARAMETER=parameter-buildroot-slc.txt
+export RK_PARAMETER=parameter-buildroot-rk3126-slc.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3126c
 # Recovery config
diff --git a/rk3126c/BoardConfig-rk3126c-evb-ddr3-v10.mk b/rk312x/BoardConfig-rk3126c-evb-ddr3-v10.mk
old mode 100755
new mode 100644
similarity index 87%
rename from rk3126c/BoardConfig-rk3126c-evb-ddr3-v10.mk
rename to rk312x/BoardConfig-rk3126c-evb-ddr3-v10.mk
index 0724615..a34f2e1
--- a/rk3126c/BoardConfig-rk3126c-evb-ddr3-v10.mk
+++ b/rk312x/BoardConfig-rk3126c-evb-ddr3-v10.mk
@@ -11,7 +11,9 @@ export RK_UBOOT_SIZE_CONFIG=1024\ 2
 # Trust size
 export RK_TRUST_SIZE_CONFIG=1024\ 2
 # Kernel defconfig
-export RK_KERNEL_DEFCONFIG=rk3126_linux_defconfig
+export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3126_linux.config
 # Kernel dts
 export RK_KERNEL_DTS=rk3126c-evb-ddr3-v10-linux
 # boot image type
@@ -19,7 +21,7 @@ export RK_BOOT_IMG=zboot.img
 # kernel image path
 export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage
 # parameter for GPT table
-export RK_PARAMETER=parameter-buildroot.txt
+export RK_PARAMETER=parameter-buildroot-rk3126.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3126c
 # Recovery config
diff --git a/rk3128/BoardConfig.mk b/rk312x/BoardConfig-rk3128-evb-ddr3-v10-debian.mk
old mode 100755
new mode 100644
similarity index 79%
rename from rk3128/BoardConfig.mk
rename to rk312x/BoardConfig-rk3128-evb-ddr3-v10-debian.mk
index 4c7fd2e..fd27ef2
--- a/rk3128/BoardConfig.mk
+++ b/rk312x/BoardConfig-rk3128-evb-ddr3-v10-debian.mk
@@ -12,14 +12,16 @@ export RK_UBOOT_SIZE_CONFIG=1024\ 2
 export RK_TRUST_SIZE_CONFIG=1024\ 2
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3128_linux.config
 # Kernel dts
-export RK_KERNEL_DTS=rk3128-fireprime
+export RK_KERNEL_DTS=rk3128-evb-ddr3-v10-linux
 # boot image type
 export RK_BOOT_IMG=zboot.img
 # kernel image path
 export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage
 # parameter for GPT table
-export RK_PARAMETER=parameter-buildroot.txt
+export RK_PARAMETER=parameter-debian-rk3128.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk312x
 # Recovery config
@@ -31,7 +33,9 @@ export RK_JOBS=12
 # target chip
 export RK_TARGET_PRODUCT=rk3128
 # Set rootfs type, including ext2 ext4 squashfs
-export RK_ROOTFS_TYPE=squashfs
+export RK_ROOTFS_TYPE=ext4
+# Set debian version (debian10: buster, debian11: bullseye)
+export RK_DEBIAN_VERSION=buster
 # rootfs image path
 export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
 # Set oem partition type, including ext2 squashfs
diff --git a/rk3128/BoardConfig-rk3128-evb-ddr3-v10.mk b/rk312x/BoardConfig-rk3128-evb-ddr3-v10.mk
old mode 100755
new mode 100644
similarity index 86%
rename from rk3128/BoardConfig-rk3128-evb-ddr3-v10.mk
rename to rk312x/BoardConfig-rk3128-evb-ddr3-v10.mk
index 4c44699..9d058b3
--- a/rk3128/BoardConfig-rk3128-evb-ddr3-v10.mk
+++ b/rk312x/BoardConfig-rk3128-evb-ddr3-v10.mk
@@ -11,7 +11,9 @@ export RK_UBOOT_SIZE_CONFIG=1024\ 2
 # Trust size
 export RK_TRUST_SIZE_CONFIG=1024\ 2
 # Kernel defconfig
-export RK_KERNEL_DEFCONFIG=rk312x_linux_defconfig
+export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=rk3128_linux.config
 # Kernel dts
 export RK_KERNEL_DTS=rk3128-evb-ddr3-v10-linux
 # boot image type
@@ -19,7 +21,7 @@ export RK_BOOT_IMG=zboot.img
 # kernel image path
 export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage
 # parameter for GPT table
-export RK_PARAMETER=parameter-buildroot.txt
+export RK_PARAMETER=parameter-buildroot-rk3128.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk312x
 # Recovery config
diff --git a/rk312x/BoardConfig.mk b/rk312x/BoardConfig.mk
new file mode 120000
index 0000000..69a7585
--- /dev/null
+++ b/rk312x/BoardConfig.mk
@@ -0,0 +1 @@
+BoardConfig-rk3126c-evb-ddr3-v10.mk
\ No newline at end of file
diff --git a/rk3126c/parameter-buildroot-slc.txt b/rk312x/parameter-buildroot-rk3126-slc.txt
similarity index 89%
rename from rk3126c/parameter-buildroot-slc.txt
rename to rk312x/parameter-buildroot-rk3126-slc.txt
index d916d9f..5406110 100644
--- a/rk3126c/parameter-buildroot-slc.txt
+++ b/rk312x/parameter-buildroot-rk3126-slc.txt
@@ -8,7 +8,7 @@ MACHINE: 3126
 CHECK_MASK: 0x80
 PWR_HLD: 0,0,A,0,1
 TYPE: GPT
-CMDLINE: mtdparts=rk29xxnand:0x0000800@0x00001800(vnvm),0x00002000@0x00002000(uboot),0x00002000@0x00004000(trust),0x00000800@0x00006000(misc),0x00004000@0x00006800(boot),0x00007000@0x0000a800(recovery),0x00018000@0x00011800(rootfs),0x0000A000@0x00029800(oem),-@0x00033800(userdata:grow)
+CMDLINE: mtdparts=rk29xxnand:0x0000800@0x00001800(vnvm),0x00002000@0x00002000(uboot),0x00002000@0x00004000(trust),0x00000800@0x00006000(misc),0x00004000@0x00006800(boot),0x00007000@0x0000A800(recovery),0x00018000@0x00011800(rootfs),0x0000A000@0x00029800(oem),-@0x00033800(userdata:grow)
 uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9
 # partition size default
 # 1MB(vnvm),4MB(uboot),4MB(trust),1MB(misc),8MB(boot),14MB(recovery),20MB(oem),48MB(rootfs),-(userdata)
diff --git a/rk3126c/parameter-buildroot.txt b/rk312x/parameter-buildroot-rk3126.txt
similarity index 89%
rename from rk3126c/parameter-buildroot.txt
rename to rk312x/parameter-buildroot-rk3126.txt
index 8552133..0e7ae8d 100644
--- a/rk3126c/parameter-buildroot.txt
+++ b/rk312x/parameter-buildroot-rk3126.txt
@@ -8,7 +8,7 @@ MACHINE: 3126
 CHECK_MASK: 0x80
 PWR_HLD: 0,0,A,0,1
 TYPE: GPT
-CMDLINE: mtdparts=rk29xxnand:0x00001000@0x00002000(uboot),0x00001000@0x00003000(trust),0x00000800@0x00004000(misc),0x00004000@0x00004800(boot),0x00007000@0x00008800(recovery),0x0000A000@0x0000f800(oem),0x00020800@0x00019800(rootfs),-@0x0003A000(userdata:grow)
+CMDLINE: mtdparts=rk29xxnand:0x00001000@0x00002000(uboot),0x00001000@0x00003000(trust),0x00000800@0x00004000(misc),0x00004000@0x00004800(boot),0x00007000@0x00008800(recovery),0x0000A000@0x0000F800(oem),0x00020800@0x00019800(rootfs),-@0x0003A000(userdata:grow)
 uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9
 # partition size default
 # 2MB(uboot),2MB(trust),1MB(misc),8MB(boot),14MB(recovery),20MB(oem),65MB(rootfs),-(userdata)
diff --git a/rk3128/parameter-buildroot.txt b/rk312x/parameter-buildroot-rk3128.txt
similarity index 100%
rename from rk3128/parameter-buildroot.txt
rename to rk312x/parameter-buildroot-rk3128.txt
diff --git a/rk312x/parameter-debian-rk3126.txt b/rk312x/parameter-debian-rk3126.txt
new file mode 100644
index 0000000..e318842
--- /dev/null
+++ b/rk312x/parameter-debian-rk3126.txt
@@ -0,0 +1,14 @@
+FIRMWARE_VER: 8.1
+MACHINE_MODEL: RK3126
+MACHINE_ID: 007
+MANUFACTURER: RK3126
+MAGIC: 0x5041524B
+ATAG: 0x00200800
+MACHINE: 3126
+CHECK_MASK: 0x80
+PWR_HLD: 0,0,A,0,1
+TYPE: GPT
+CMDLINE: mtdparts=rk29xxnand:0x00001000@0x00002000(uboot),0x00001000@0x00003000(trust),0x00000800@0x00004000(misc),0x00004000@0x00004800(boot),0x00007000@0x00008800(recovery),0x0000A000@0x0000F800(oem),0x00800000@0x00019800(rootfs),-@0x00819800(userdata:grow)
+uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9
+# partition size default
+# 2MB(uboot),2MB(trust),1MB(misc),8MB(boot),14MB(recovery),20MB(oem),4096MB(rootfs),-(userdata)
diff --git a/rk312x/parameter-debian-rk3128.txt b/rk312x/parameter-debian-rk3128.txt
new file mode 100644
index 0000000..85524d5
--- /dev/null
+++ b/rk312x/parameter-debian-rk3128.txt
@@ -0,0 +1,14 @@
+FIRMWARE_VER: 8.1
+MACHINE_MODEL: RK3128
+MACHINE_ID: 007
+MANUFACTURER: RK3128
+MAGIC: 0x5041524B
+ATAG: 0x00200800
+MACHINE: 3128
+CHECK_MASK: 0x80
+PWR_HLD: 0,0,A,0,1
+TYPE: GPT
+CMDLINE: mtdparts=rk29xxnand:0x00001000@0x00002000(uboot),0x00001000@0x00003000(trust),0x00000800@0x00004000(misc),0x00004000@0x00004800(boot),0x00007000@0x00008800(recovery),0x0000A000@0x0000F800(oem),0x00800000@0x00019800(rootfs),-@0x00819800(userdata:grow)
+uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9
+# partition size default
+# 2MB(uboot),2MB(trust),1MB(misc),8MB(boot),14MB(recovery),20MB(oem),4096MB(rootfs),-(userdata)