diff --git a/external/config/boards/orangepi6plus.conf b/external/config/boards/orangepi6plus.conf
index 6c620992bff4..bdf381faf797 100644
--- a/external/config/boards/orangepi6plus.conf
+++ b/external/config/boards/orangepi6plus.conf
@@ -1,10 +1,10 @@
 # Cix P1 SoC
 BOARD_NAME="Orange Pi 6 Plus"
 BOARDFAMILY="cix"
-KERNEL_TARGET="current"
+KERNEL_TARGET="current next"
 IMAGE_PARTITION_TABLE="gpt"
 DISTRIB_TYPE_CURRENT="bookworm"
 MODULES_CURRENT="armcb_isp_v4l2 btusb"
 PLYMOUTH="no"
 BUILD_MINIMAL="no"
-REVISION="1.0.0"
+REVISION="1.0.2"
diff --git a/external/config/desktop/bookworm/environments/gnome/config_base/packages b/external/config/desktop/bookworm/environments/gnome/config_base/packages
index 6713f0ed1d63..08ea628891ff 100644
--- a/external/config/desktop/bookworm/environments/gnome/config_base/packages
+++ b/external/config/desktop/bookworm/environments/gnome/config_base/packages
@@ -1,3 +1,4 @@
+alsa-ucm-conf
 anacron
 apt-xapian-index
 at-spi2-core
@@ -5,6 +6,7 @@ bluetooth
 cifs-utils
 cheese
 clpeak
+cmake
 colord
 command-not-found
 cups
diff --git a/external/config/kernel/linux-cix-p1-current.config b/external/config/kernel/linux-6.1-cix-p1-current.config
similarity index 100%
rename from external/config/kernel/linux-cix-p1-current.config
rename to external/config/kernel/linux-6.1-cix-p1-current.config
diff --git a/external/config/kernel/linux-cix-p1-next.config b/external/config/kernel/linux-6.6-cix-p1-next.config
similarity index 96%
rename from external/config/kernel/linux-cix-p1-next.config
rename to external/config/kernel/linux-6.6-cix-p1-next.config
index e6d45f4de1d2..b7f3f06cd698 100644
--- a/external/config/kernel/linux-cix-p1-next.config
+++ b/external/config/kernel/linux-6.6-cix-p1-next.config
@@ -1030,6 +1030,7 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y
 # end of Memory Management options
 
 CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_XGRESS=y
@@ -1046,19 +1047,20 @@ CONFIG_AF_UNIX_OOB=y
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
 # CONFIG_XFRM_INTERFACE is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_ESP=m
+CONFIG_XFRM_ESP=y
 # CONFIG_NET_KEY is not set
 # CONFIG_XDP_SOCKETS is not set
 CONFIG_NET_HANDSHAKE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -1067,13 +1069,13 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=m
 # CONFIG_IP_MROUTE is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_NET_FOU is not set
 # CONFIG_NET_FOU_IP_TUNNELS is not set
 # CONFIG_INET_AH is not set
-CONFIG_INET_ESP=m
+CONFIG_INET_ESP=y
 # CONFIG_INET_ESP_OFFLOAD is not set
 # CONFIG_INET_ESPINTCP is not set
 # CONFIG_INET_IPCOMP is not set
@@ -1088,7 +1090,7 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_INET6_AH is not set
@@ -1114,7 +1116,7 @@ CONFIG_NET_PTP_CLASSIFY=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -1124,158 +1126,199 @@ CONFIG_NETFILTER_EGRESS=y
 CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
 CONFIG_NETFILTER_BPF_LINK=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_OSF is not set
-CONFIG_NF_CONNTRACK=m
+CONFIG_NETFILTER_NETLINK_HOOK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_LOG_SYSLOG=m
-# CONFIG_NF_CONNTRACK_MARK is not set
-# CONFIG_NF_CONNTRACK_SECMARK is not set
-# CONFIG_NF_CONNTRACK_ZONES is not set
-# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-# CONFIG_NF_CONNTRACK_LABELS is not set
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_FTP=m
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_SNMP is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_TFTP=m
-# CONFIG_NF_CT_NETLINK is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=y
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=y
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=y
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
-# CONFIG_NFT_NUMGEN is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-# CONFIG_NFT_CONNLIMIT is not set
-# CONFIG_NFT_LOG is not set
-# CONFIG_NFT_LIMIT is not set
+# CONFIG_NFT_FLOW_OFFLOAD is not set
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
-# CONFIG_NFT_REDIR is not set
+CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
-# CONFIG_NFT_TUNNEL is not set
-# CONFIG_NFT_QUOTA is not set
-# CONFIG_NFT_REJECT is not set
-# CONFIG_NFT_COMPAT is not set
-# CONFIG_NFT_HASH is not set
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
-# CONFIG_NFT_XFRM is not set
-# CONFIG_NFT_SOCKET is not set
-# CONFIG_NFT_OSF is not set
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_SYNPROXY is not set
-# CONFIG_NF_FLOW_TABLE is not set
-CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XTABLES_COMPAT is not set
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+# CONFIG_NF_FLOW_TABLE_INET is not set
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES_COMPAT=y
 
 #
 # Xtables combined modules
 #
-CONFIG_NETFILTER_XT_MARK=m
-# CONFIG_NETFILTER_XT_CONNMARK is not set
+CONFIG_NETFILTER_XT_MARK=y
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
 
 #
 # Xtables targets
 #
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-CONFIG_NETFILTER_XT_NAT=m
-# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=y
+CONFIG_NETFILTER_XT_TARGET_NETMAP=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 
 #
 # Xtables matches
 #
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ECN is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+CONFIG_NETFILTER_XT_MATCH_BPF=y
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
-# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 # end of Core Netfilter Configuration
 
-# CONFIG_IP_SET is not set
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=y
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_DEBUG=y
 CONFIG_IP_VS_TAB_BITS=12
 
 #
@@ -1320,79 +1363,109 @@ CONFIG_IP_VS_MH_TAB_INDEX=12
 #
 # CONFIG_IP_VS_FTP is not set
 CONFIG_IP_VS_NFCT=y
+# CONFIG_IP_VS_PE_SIP is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_NF_DEFRAG_IPV4=m
-# CONFIG_NF_SOCKET_IPV4 is not set
-# CONFIG_NF_TPROXY_IPV4 is not set
+CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-# CONFIG_NFT_DUP_IPV4 is not set
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
-# CONFIG_NF_TABLES_ARP is not set
-# CONFIG_NF_DUP_IPV4 is not set
-# CONFIG_NF_LOG_ARP is not set
-# CONFIG_NF_LOG_IPV4 is not set
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_IP_NF_IPTABLES=m
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-CONFIG_IP_NF_FILTER=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=m
-# CONFIG_IP_NF_TARGET_SYNPROXY is not set
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=y
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
 # end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
 #
-# CONFIG_NF_SOCKET_IPV6 is not set
-# CONFIG_NF_TPROXY_IPV6 is not set
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-# CONFIG_NFT_DUP_IPV6 is not set
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
-# CONFIG_NF_DUP_IPV6 is not set
+CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_MATCH_SRH is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-# CONFIG_IP6_NF_TARGET_NPT is not set
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_RAW=y
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=y
+CONFIG_IP6_NF_TARGET_MASQUERADE=y
+CONFIG_IP6_NF_TARGET_NPT=y
 # end of IPv6: Netfilter Configuration
 
-CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_NF_DEFRAG_IPV6=y
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+# CONFIG_NFT_BRIDGE_REJECT is not set
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
 # CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
@@ -1407,10 +1480,10 @@ CONFIG_INET_SCTP_DIAG=m
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_L2TP is not set
-CONFIG_STP=m
+CONFIG_STP=y
 CONFIG_GARP=m
 CONFIG_MRP=m
-CONFIG_BRIDGE=m
+CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BRIDGE_MRP is not set
@@ -1441,7 +1514,7 @@ CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-CONFIG_LLC=m
+CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
@@ -1514,9 +1587,12 @@ CONFIG_NET_ACT_MIRRED=m
 # CONFIG_NET_ACT_MPLS is not set
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
+# CONFIG_NET_ACT_CONNMARK is not set
+# CONFIG_NET_ACT_CTINFO is not set
 # CONFIG_NET_ACT_SKBMOD is not set
 # CONFIG_NET_ACT_IFE is not set
 # CONFIG_NET_ACT_TUNNEL_KEY is not set
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_ACT_GATE=m
 # CONFIG_NET_TC_SKB_EXT is not set
 CONFIG_NET_SCH_FIFO=y
@@ -1629,6 +1705,9 @@ CONFIG_BT_NXPUART=m
 # CONFIG_AF_KCM is not set
 # CONFIG_MCTP is not set
 CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2496,16 +2575,16 @@ CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
-CONFIG_DUMMY=m
+CONFIG_DUMMY=y
 # CONFIG_WIREGUARD is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
 # CONFIG_IFB is not set
 # CONFIG_NET_TEAM is not set
-CONFIG_MACVLAN=m
+CONFIG_MACVLAN=y
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
+CONFIG_IPVLAN=y
 # CONFIG_IPVTAP is not set
 CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
@@ -2517,7 +2596,7 @@ CONFIG_VXLAN=m
 CONFIG_TUN=y
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
+CONFIG_VETH=y
 CONFIG_VIRTIO_NET=y
 # CONFIG_NLMON is not set
 CONFIG_MHI_NET=m
@@ -3020,7 +3099,19 @@ CONFIG_WLAN_VENDOR_INTEL=y
 # CONFIG_IPW2200 is not set
 # CONFIG_IWL4965 is not set
 # CONFIG_IWL3945 is not set
-# CONFIG_IWLWIFI is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 # CONFIG_HOSTAP is not set
 # CONFIG_HERMES is not set
@@ -3137,6 +3228,11 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_VIRT_WIFI is not set
+CONFIG_RTL8723DS=m
+CONFIG_RTL8822BU=m
+CONFIG_RTL8821CU=m
+CONFIG_88XXAU=m
+CONFIG_RTL8192EU=m
 # CONFIG_WAN is not set
 
 #
@@ -7968,7 +8064,7 @@ CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_STATS=y
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 # CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
@@ -8015,7 +8111,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 # CONFIG_VIRTIO_FS is not set
-CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS=y
 CONFIG_OVERLAY_FS_REDIRECT_DIR=y
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 CONFIG_OVERLAY_FS_INDEX=y
@@ -8335,7 +8431,7 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Kernel hardening options
 # end of Security options
 
-CONFIG_XOR_BLOCKS=m
+CONFIG_XOR_BLOCKS=y
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
@@ -8369,7 +8465,7 @@ CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_PCRYPT is not set
 # CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 # end of Crypto core or helper
@@ -8416,9 +8512,9 @@ CONFIG_CRYPTO_SM4_GENERIC=m
 # CONFIG_CRYPTO_ADIANTUM is not set
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 # CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
@@ -8435,9 +8531,9 @@ CONFIG_CRYPTO_XTS=m
 # CONFIG_CRYPTO_AEGIS128 is not set
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
 CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GENIV=y
-CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=y
 # CONFIG_CRYPTO_ESSIV is not set
 # end of AEAD (authenticated encryption with associated data) ciphers
@@ -8445,9 +8541,9 @@ CONFIG_CRYPTO_ECHAINIV=y
 #
 # Hashes, digests, and MACs
 #
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
@@ -8464,7 +8560,7 @@ CONFIG_CRYPTO_SM3_GENERIC=m
 # CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 # end of Hashes, digests, and MACs
 
 #
@@ -8599,7 +8695,7 @@ CONFIG_BINARY_PRINTF=y
 #
 # Library routines
 #
-CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ=y
 CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_LINEAR_RANGES=y
 CONFIG_PACKING=y
@@ -8653,7 +8749,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 CONFIG_CRC7=y
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_CRC8=y
 CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
@@ -8692,6 +8788,10 @@ CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_BCH=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_INTERVAL_TREE=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
diff --git a/external/config/sources/families/cix.conf b/external/config/sources/families/cix.conf
index bbadfb0da118..88067d33619e 100644
--- a/external/config/sources/families/cix.conf
+++ b/external/config/sources/families/cix.conf
@@ -16,15 +16,17 @@ case $BRANCH in
 		fi
 		KERNELBRANCH='branch:orange-pi-6.1-cix'
 		KERNELPATCHDIR='cix-current'
-		LINUXCONFIG="linux-cix-p1-current"
+		LINUXCONFIG="linux-6.1-cix-p1-current"
 		KERNEL_USE_GCC='> 12.0'
+		ROOTFSCACHE_VERSION=12
 	;;
 
 	next)
 		KERNELBRANCH='branch:orange-pi-6.6-cix'
 		KERNELPATCHDIR='cix-next'
-		LINUXCONFIG="linux-cix-p1-next"
+		LINUXCONFIG="linux-6.6-cix-p1-next"
 		KERNEL_USE_GCC='> 12.0'
+		ROOTFSCACHE_VERSION=11
 	;;
 esac
 
@@ -32,109 +34,6 @@ family_tweaks_bsp() {
 	:
 }
 
-function build_cix_prideb() {
-	local PATH_OUT_PRIVATE_DEB_PACKAGES=${EXTER}/cache/sources/component_cix-${BRANCH}/cix_proprietary/cix_proprietary-debs
-	local amvx_module=${EXTER}/cache/sources/component_cix-${BRANCH}/cix_opensource/vpu/vpu_driver/bin/aarch64-none-linux-gnu/amvx.ko
-	local linux_version=$(modinfo ${amvx_module} | awk -F': ' '/vermagic/{split($2,a," "); print a[1]}')
-
-	#npu-noe-umd
-	pkg_Name="cix-noe-umd"
-	create_cix_deb "$pkg_Name"
-
-	#isp-umd
-	pkg_Name="cix-isp-umd"
-	create_cix_deb "$pkg_Name"
-
-	#gpu
-	pkg_Name="cix-gpu-umd"
-	if [[ ! -e $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/etc/systemd/system ]]; then
-		mkdir -p $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/etc/systemd/system
-	fi
-	if [[ ! -e $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/usr/bin ]]; then
-		mkdir -p $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/usr/bin
-	fi
-	cat > $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/etc/systemd/system/load-modules.service <<- EOF
-[Unit]
-Description=Load custom kernel modules
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/load-modules.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=sysinit.target
-EOF
-	cat > $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/usr/bin/load-modules.sh <<- EOF
-#!/bin/bash
-
-insmod /lib/modules/$linux_version/extra/protected_memory_allocator.ko
-insmod /lib/modules/$linux_version/extra/memory_group_manager.ko
-insmod /lib/modules/$linux_version/extra/mali_kbase.ko
-#insmod /lib/modules/$linux_version/extra/rtl_btusb.ko
-#insmod /lib/modules/$linux_version/extra/rtl_wlan.ko
-insmod /lib/modules/$linux_version/extra/aipu.ko
-insmod /lib/modules/$linux_version/extra/amvx.ko
-insmod /lib/modules/$linux_version/kernel/drivers/hid/uhid.ko
-
-#insmod /lib/modules/$linux_version/kernel/net/netfilter/x_tables.ko
-#insmod /lib/modules/$linux_version/kernel/net/ipv4/netfilter/ip_tables.ko
-#insmod /lib/modules/$linux_version/kernel/net/ipv4/netfilter/iptable_nat.ko
-#insmod /lib/modules/$linux_version/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
-#insmod /lib/modules/$linux_version/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko
-#insmod /lib/modules/$linux_version/kernel/lib/libcrc32c.ko
-#insmod /lib/modules/$linux_version/kernel/net/netfilter/nf_conntrack.ko
-#insmod /lib/modules/$linux_version/kernel/net/netfilter/nf_nat.ko
-#insmod /lib/modules/$linux_version/kernel/net/netfilter/xt_MASQUERADE.ko
-
-ln -s /dev/dma_heap/reserved /dev/dma_heap/linux,cma
-
-if [[ ! -e  /etc/machine-id ]]; then
-	dbus-uuidgen > /etc/machine-id
-	ln -sf /etc/machine-id /var/lib/dbus/machine-id
-fi
-
-EOF
-	cat >> $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/usr/bin/load-modules.sh <<- 'EOF'
-video_devices=($(ls /dev/video* 2>/dev/null | sort -V))
-
-if [ ${#video_devices[@]} -eq 1 ]; then
-	ln -s "${video_devices[0]}" /dev/video-cixdec0
-elif [ ${#video_devices[@]} -eq 0 ]; then
-	echo "Not found /dev/video*"
-else
-	max_device="${video_devices[-2]}"
-	ln -s "$max_device" /dev/video-cixdec0
-fi
-EOF
-	sudo chmod a+x $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/usr/bin/load-modules.sh
-	if [[ ! -e $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/DEBIAN ]]; then
-		mkdir -p $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/DEBIAN
-	fi
-	cat > $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/DEBIAN/postinst <<- EOF
-#!/bin/sh
-set -e
-
-# Enable the service to start on boot
-systemctl enable load-modules.service || true
-
-exit 0
-EOF
-	cat > $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/DEBIAN/triggers <<- EOF
-activate-noawait ldconfig
-EOF
-	cat > $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/DEBIAN/shlibs <<- EOF
-libgbm 1 cix-gpu-umd (>= 1.0.0-1)
-EOF
-	sudo chmod a+x $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/DEBIAN/postinst
-	rm -rf $PATH_OUT_PRIVATE_DEB_PACKAGES/cix-gpu-umd/usr/share/cix
-	create_cix_deb "$pkg_Name"
-
-	#dsp
-	pkg_Name="cix-audio-dsp"
-	create_cix_deb "$pkg_Name"
-}
-
 function create_cix_deb() {
 	local pkg_Name="$1"
 	local PATH_CHANGELOGS=${EXTER}/cache/sources/component_cix-${BRANCH}/changelogs
@@ -168,62 +67,6 @@ function create_cix_deb() {
 	local build_deb_dir="${PATH_OUT_DEB_PACKAGES}/${pkg_Name}"
 
 	case "$pkg_Name" in
-	("cix-mesa")
-	CONTROL_CONTENT="Package: ${pkg_Name}
-Version: ${pkg_Ver}
-Architecture: arm64
-Maintainer: Cix OS team
-Depends: libc6 (>= 2.34)
-Provides: libgl1-mesa-dri, libgl1, libglapi-mesa, libgl-dev
-Replaces: libgl1-mesa-dri, libgl1, libglapi-mesa, libgl-dev
-Section: utils
-Priority: optional
-Description: $pkg_Name package"
-	;;
-	("cix-xserver")
-	CONTROL_CONTENT="Package: ${pkg_Name}
-Version: ${pkg_Ver}
-Architecture: arm64
-Maintainer: Cix OS team
-Depends: libc6 (>= 2.34)
-Provides: xwayland
-Replaces: xwayland
-Section: utils
-Priority: optional
-Description: $pkg_Name package"
-	;;
-	("cix-gpu-umd")
-	CONTROL_CONTENT="Package: ${pkg_Name}
-Version: ${pkg_Ver}
-Architecture: arm64
-Maintainer: Cix OS team
-Depends: libc6 (>= 2.34)
-Provides: libwayland-dev, libwayland-egl1, libgles2, ocl-icd-libopencl1, libgbm1, libegl-dev, libgles1, libegl1, libgles1, libgles-dev, ocl-icd-opencl-dev, libgbm-dev
-Replaces: libwayland-dev, libwayland-egl1, libgles2, ocl-icd-libopencl1, libgbm1, libegl-dev, libgles1, libegl1, libgles1, libgles-dev, ocl-icd-opencl-dev, libgbm-dev
-Section: utils
-Priority: optional
-Description: $pkg_Name package"
-	;;
-	("cix-gstreamer")
-	CONTROL_CONTENT="Package: ${pkg_Name}
-Version: ${pkg_Ver}
-Architecture: arm64
-Maintainer: Cix OS team
-Depends: libc6 (>= 2.34), libglib2.0-0, libglib2.0-bin, libx11-6, libgdk-pixbuf-2.0-0, zlib1g, libasound2, libogg0, libopus0, libxext6, libxi6, libxfixes3, libxdamage1, libxml2, libnettle8, libcairo2, libjpeg62-turbo, libpng16-16, libsoup-3.0-0, libva-drm2, libva-glx2, libva-wayland2, libva-x11-2, libva2, libdrm2, libdrm-radeon1, libdrm-nouveau2, libdrm-amdgpu1, libdrm-freedreno1, libdrm-tegra0, libdrm-etnaviv1, libvulkan1, libxcb1, libxkbcommon0, libwayland-client0, libwayland-server0, libwayland-cursor0, libwayland-egl1, libwayland-bin, libnice10, libwebp7, libwebpmux3, libwebpdemux2, libjson-glib-1.0-0, libpango-1.0-0, libpangocairo-1.0-0, libpangoft2-1.0-0, libpangoxft-1.0-0
-Section: utils
-Priority: optional
-Description: $pkg_Name package"
-	;;
-	("cix-npu-onnxruntime")
-	CONTROL_CONTENT="Package: ${pkg_Name}
-Version: ${pkg_Ver}
-Architecture: arm64
-Maintainer: Cix OS team
-Depends: python3-pip
-Section: utils
-Priority: optional
-Description: $pkg_Name package"
-	;;
 	(*)
 	CONTROL_CONTENT="Package: ${pkg_Name}
 Version: ${pkg_Ver}
@@ -288,7 +131,7 @@ family_tweaks_kernel () {
 	scons $CTHREADS target=linux > /dev/null
 	# build deb package
 	pkg_Name="cix-vpu-driver"
-	linux_version=$(strings ${LINUXSOURCEDIR}/arch/arm64/boot/Image | grep "Linux version" | cut -d' ' -f3 | head -1)
+	linux_version=$(strings ${SRC}/output/cix/Image | grep "Linux version" | cut -d' ' -f3 | head -1)
 	build_deb_dir=${PATH_OUT_DEB_PACKAGES}/${pkg_Name}
 	rm -rf ${build_deb_dir}
 	install_dir=${build_deb_dir}/usr/share/cix/bin
@@ -314,7 +157,7 @@ family_tweaks_kernel () {
 
 	export COMPASS_DRV_BTENVAR_ARCH=${ARCH}
 	export COMPASS_DRV_BTENVAR_KMD_DIR=driver
-	export COMPASS_DRV_BTENVAR_KMD_VERSION=5.8.0
+	export COMPASS_DRV_BTENVAR_KMD_VERSION=5.11.0
 	export COMPASS_DRV_BTENVAR_KPATH=${KDIR}
 	export BUILD_AIPU_VERSION_KMD=BUILD_ZHOUYI_V3
 	export BUILD_TARGET_PLATFORM_KMD=BUILD_PLATFORM_SKY1
@@ -329,8 +172,12 @@ family_tweaks_kernel () {
 		build_deb_dir=${PATH_OUT_DEB_PACKAGES}/${pkg_Name}
 		rm -rf ${build_deb_dir}
 		install_dir=${build_deb_dir}/lib/modules/${linux_version}/extra
+		dkms_src_dir=${build_deb_dir}/usr/src
 		mkdir -p ${install_dir}
+		mkdir -p ${dkms_src_dir}
 		cp ${COMPASS_DRV_BTENVAR_KMD_DIR}/aipu.ko ${install_dir}
+		make $CTHREADS -C ${COMPASS_DRV_BTENVAR_KMD_DIR} ARCH=${COMPASS_DRV_BTENVAR_ARCH} CROSS_COMPILE=${CROSS_COMPILE} clean > /dev/null
+		cp -r ${COMPASS_DRV_BTENVAR_KMD_DIR} ${dkms_src_dir}/aipu-${COMPASS_DRV_BTENVAR_KMD_VERSION}
 		create_cix_deb "${pkg_Name}"
 		rm -f $PATH_LINUX/include/uapi/misc/armchina_aipu.h
 		# finish build deb package
@@ -391,12 +238,8 @@ family_tweaks_kernel () {
 	fi
 	cd - > /dev/null
 
-	build_cix_prideb
-
-	mkdir -p ${SRC}/output/cix/ > /dev/null 2>&1
-	cp ${KDIR}/arch/arm64/boot/Image ${SRC}/output/cix/
-	cp ${KDIR}/arch/arm64/boot/dts/cix/sky1-*dtb ${SRC}/output/cix/
-	rm ${SRC}/output/debs/linux-dtb*
+	rm ${SRC}/output/debs/linux-dtb* > /dev/null 2>&1
+	rm ${SRC}/output/debs/linux-libc-dev* > /dev/null 2>&1
 }
 
 install_cix_debs() {
@@ -410,28 +253,29 @@ install_cix_debs() {
 	local DEB_PATH=${SDCARD}/root/debs
 
 	mkdir -p ${DEB_PATH}
-	cp -fp $POOL_PATH/pool/main/*/*/*.deb ${DEB_PATH}/
-	cp -fp $POOL_PATH/pool/main/*/*.deb   ${DEB_PATH}/
+	if [[ $BRANCH == current ]]; then
+		cp -fp $POOL_PATH/pool/main/*/*/*.deb ${DEB_PATH}/
+		cp -fp $POOL_PATH/pool/main/*/*.deb   ${DEB_PATH}/
+	fi
 	cp ${EXTER}/cache/sources/component_cix-${BRANCH}/debs/*.deb ${DEB_PATH}/
 
-	run_on_sdcard "apt-get -y --allow-downgrades install /root/debs/*.deb"
+	chroot $SDCARD /bin/bash -e -c "apt-get -y --allow-downgrades install /root/debs/*.deb"
 	run_on_sdcard "systemctl mask swap.target"
 	run_on_sdcard "systemctl enable cix_resume.service"
 	run_on_sdcard "systemctl enable cix_resume_prepare.service"
 	rm ${DEB_PATH} -rf
 
-	dpkg_install_deb_chroot "${EXTER}/cache/sources/component_cix-${BRANCH}/debs_manual/cix-gnome-core-1.43_arm64.deb"
-	dpkg_install_deb_chroot "${EXTER}/cache/sources/component_cix-${BRANCH}/debs_manual/yolox-demo-v4l2_2.0.0_arm64.deb"
-	#dpkg_install_deb_chroot "${EXTER}/cache/sources/component_cix-${BRANCH}/debs_manual/systemd_252.26-1~deb12u2_arm64.deb"
 	run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq install pulseaudio"
 	run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq remove wireplumber"
 	run_on_sdcard "EBIAN_FRONTEND=noninteractive apt-get -yqq remove pipewire-pulse"
+	dpkg_install_deb_chroot "${EXTER}/cache/sources/component_cix-${BRANCH}/debs_manual/gnome-core_arm64.deb"
 
 	rm $SDCARD/root/*.deb >/dev/null 2>&1
 }
 
 family_tweaks() {
 
+	#install_cix_debs
 	install_balenaEtcher
 	#install_wiringop
 
@@ -442,8 +286,7 @@ family_tweaks() {
 	cp ${DEB_STORAGE}/cix_debs-${BRANCH} ${SDCARD}/root/ -rf
 	run_on_sdcard "apt-get -y --allow-downgrades install /root/cix_debs-${BRANCH}/*.deb"
 
-	amvx_module=${EXTER}/cache/sources/component_cix-${BRANCH}/cix_opensource/vpu/vpu_driver/bin/aarch64-none-linux-gnu/amvx.ko
-	linux_version=$(modinfo ${amvx_module} | awk -F': ' '/vermagic/{split($2,a," "); print a[1]}')
+	linux_version=$(strings ${SRC}/output/cix/Image | grep "Linux version" | cut -d' ' -f3 | head -1)
 
 	run_on_sdcard "depmod -a $linux_version/"
 	rm -rf ${SDCARD}/root/cix_debs-${BRANCH}
@@ -457,12 +300,17 @@ family_tweaks() {
 	sed -i 's/^ENABLED=true$/ENABLED=false/' ${SDCARD}/etc/default/orangepi-zram-config
 
 	run_on_sdcard "systemctl --no-reload enable getty@tty1.service >/dev/null 2>&1"
-	run_on_sdcard "systemctl --no-reload enable isp-daemon.service >/dev/null 2>&1"
 	if [[ ${RELEASE} == bookworm ]]; then
 		run_on_sdcard "systemctl mask ssh.socket" >/dev/null 2>&1
 	fi
 
 	rsync -a --chown=root:root "${EXTER}"/packages/bsp/overlays_cix/* ${SDCARD}/
+	if [[ $BRANCH == next ]]; then
+		rsync -a --chown=root:root "${EXTER}"/packages/bsp/overlays_cix_next/* ${SDCARD}/
+	fi
+	run_on_sdcard "systemctl --no-reload enable isp-daemon.service >/dev/null 2>&1"
+
+	rm $SDCARD/root/*.deb >/dev/null 2>&1
 }
 
 install_balenaEtcher(){
diff --git a/external/packages/bsp/overlays_cix/opt/make_bios_image/.gitignore b/external/packages/bsp/overlays_cix/opt/make_bios_image/.gitignore
new file mode 100644
index 000000000000..a89285e545d1
--- /dev/null
+++ b/external/packages/bsp/overlays_cix/opt/make_bios_image/.gitignore
@@ -0,0 +1 @@
+*.img
diff --git a/external/packages/bsp/overlays_cix/opt/make_bios_image/EFI/BOOT/BOOTX64.EFI b/external/packages/bsp/overlays_cix/opt/make_bios_image/EFI/BOOT/BOOTX64.EFI
new file mode 100644
index 000000000000..a5bbd0b90eb7
Binary files /dev/null and b/external/packages/bsp/overlays_cix/opt/make_bios_image/EFI/BOOT/BOOTX64.EFI differ
diff --git a/external/packages/bsp/overlays_cix/opt/make_bios_image/bios_flash/FlashUpdate.efi b/external/packages/bsp/overlays_cix/opt/make_bios_image/bios_flash/FlashUpdate.efi
new file mode 100644
index 000000000000..171c76be1ecb
Binary files /dev/null and b/external/packages/bsp/overlays_cix/opt/make_bios_image/bios_flash/FlashUpdate.efi differ
diff --git a/external/packages/bsp/overlays_cix/opt/make_bios_image/bios_flash/flash_bios.nsh b/external/packages/bsp/overlays_cix/opt/make_bios_image/bios_flash/flash_bios.nsh
new file mode 100644
index 000000000000..2d17d483fe5f
--- /dev/null
+++ b/external/packages/bsp/overlays_cix/opt/make_bios_image/bios_flash/flash_bios.nsh
@@ -0,0 +1 @@
+FlashUpdate.efi -f bios_v1.0.bin
diff --git a/external/packages/bsp/overlays_cix/opt/make_bios_image/make_bios_img.sh b/external/packages/bsp/overlays_cix/opt/make_bios_image/make_bios_img.sh
new file mode 100755
index 000000000000..c7fac00c8c24
--- /dev/null
+++ b/external/packages/bsp/overlays_cix/opt/make_bios_image/make_bios_img.sh
@@ -0,0 +1,169 @@
+#!/bin/bash
+
+# BIOS镜像制作脚本
+
+set -e
+
+# 配置变量
+IMAGE_NAME="opi6plus_bios_image_for_linux_$(date +"%Y%m%d").img"
+IMAGE_SIZE="100"  # 100MB镜像
+MOUNT_POINT="/tmp/bios_mount"
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+info() { echo -e "${GREEN}[INFO]${NC} $1"; }
+warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
+error() { echo -e "${RED}[ERROR]${NC} $1"; }
+
+# 检查依赖
+check_dependencies() {
+    local deps=("dosfstools" "parted")
+    for dep in "${deps[@]}"; do
+        if ! command -v $dep &> /dev/null; then
+            info "安装依赖: $dep"
+            sudo apt-get install -y $dep
+        fi
+    done
+}
+
+# 清理函数
+cleanup() {
+    if mountpoint -q "$MOUNT_POINT"; then
+        sudo umount "$MOUNT_POINT" 2>/dev/null || true
+    fi
+    if [ -n "$LOOP_DEVICE" ]; then
+        sudo losetup -d "$LOOP_DEVICE" 2>/dev/null || true
+    fi
+    if [ -d "$MOUNT_POINT" ]; then
+        sudo rmdir "$MOUNT_POINT" 2>/dev/null || true
+    fi
+}
+
+trap cleanup EXIT
+
+main() {
+    info "开始制作BIOS镜像..."
+
+    check_dependencies
+
+    if [ ! -d "bios_flash" ] || [ ! -d "EFI" ]; then
+        error "缺少必要的文件夹: bios_flash 或 EFI"
+        exit 1
+    fi
+
+    # 删除已存在的镜像文件
+    [ -f "$IMAGE_NAME" ] && rm -f "$IMAGE_NAME"
+
+    # 1. 创建100MB镜像文件
+    info "创建${IMAGE_SIZE}MB空白镜像..."
+    dd if=/dev/zero of="$IMAGE_NAME" bs=1M count=$IMAGE_SIZE status=progress
+    sync
+
+    # 2. 使用parted创建分区
+    info "创建分区表和分区..."
+    sudo parted "$IMAGE_NAME" --script mklabel msdos
+    sudo parted "$IMAGE_NAME" --script mkpart primary fat32 1MiB 100%
+    sudo parted "$IMAGE_NAME" --script set 1 boot on
+
+    sync
+    sleep 2
+
+    # 3. 设置循环设备
+    info "设置循环设备..."
+    LOOP_DEVICE=$(sudo losetup --find --show --partscan "$IMAGE_NAME")
+    PARTITION="${LOOP_DEVICE}p1"
+    info "使用循环设备: $LOOP_DEVICE"
+    info "分区: $PARTITION"
+
+    sleep 2
+
+    # 4. 使用wipefs清除文件系统签名（更安全的方法）
+    info "清除文件系统签名..."
+    if command -v wipefs > /dev/null; then
+        sudo wipefs -a "$PARTITION"
+    else
+        warn "wipefs不可用，跳过清除签名步骤"
+    fi
+
+    # 5. 格式化分区
+    info "使用gparted相同命令格式化..."
+    sudo mkfs.fat -F32 -v -I -n "BIOSFLASH" "$PARTITION"
+
+    # 6. 挂载分区
+    info "挂载分区..."
+    sudo mkdir -p "$MOUNT_POINT"
+    sudo mount "$PARTITION" "$MOUNT_POINT"
+    
+    # 7. 复制文件
+    info "复制bios_flash文件夹..."
+    sudo cp -r bios_flash "$MOUNT_POINT/"
+    info "复制EFI文件夹..."
+    sudo cp -r EFI "$MOUNT_POINT/"
+
+    # 8. 验证文件
+    info "验证文件复制..."
+    if [ -d "$MOUNT_POINT/bios_flash" ] && [ -d "$MOUNT_POINT/EFI" ]; then
+        info "✅ 文件复制成功"
+        echo "=== 文件列表 ==="
+        ls -la "$MOUNT_POINT"
+        echo ""
+        echo "=== 文件大小 ==="
+        du -sh "$MOUNT_POINT"/*
+    else
+        error "❌ 文件复制失败"
+        exit 1
+    fi
+
+    # 9. 同步并卸载
+    info "同步数据..."
+    sync
+    sudo umount "$MOUNT_POINT"
+    sudo losetup -d "$LOOP_DEVICE"
+
+    # 10. 最终验证
+    info "最终验证..."
+    echo "=== 分区信息 ==="
+    sudo parted "$IMAGE_NAME" --script print
+    
+    echo "=== 文件系统信息 ==="
+    sudo losetup --find --show --partscan "$IMAGE_NAME" > /tmp/loopdev
+    LOOP_DEVICE=$(cat /tmp/loopdev)
+    echo "文件系统检查:"
+    sudo fsck.fat -v "${LOOP_DEVICE}p1" || true
+    sudo losetup -d "$LOOP_DEVICE"
+    rm -f /tmp/loopdev
+
+    echo ""
+    info "✅ 镜像制作完成: $IMAGE_NAME"
+    info "📊 文件大小: $(du -h $IMAGE_NAME | cut -f1)"
+    echo ""
+    info "🔥 烧录命令:"
+    echo "sudo dd if=$IMAGE_NAME of=/dev/sdX bs=4M status=progress oflag=sync"
+    echo ""
+    info "💡 测试方法:"
+    echo "1. 烧录到U盘: sudo dd if=$IMAGE_NAME of=/dev/sdX bs=4M status=progress oflag=sync"
+    echo "2. 在Linux中检查: ls /media/\$USER/BIOSFLASH/"
+    echo "3. 在Windows中应该能看到bios_flash和EFI文件夹"
+    echo ""
+    warn "⚠️  注意: 将 /dev/sdX 替换为正确的U盘设备路径！"
+}
+
+echo "=================================================="
+info "   BIOS镜像制作脚本"
+echo "=================================================="
+
+info "当前目录结构:"
+tree -L 2
+
+echo ""
+read -p "是否继续? (y/N): " -n 1 -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    exit 0
+fi
+
+main
diff --git a/external/packages/bsp/overlays_cix/usr/bin/cam1_test.sh b/external/packages/bsp/overlays_cix/usr/bin/cam1_test.sh
index 9b276b18b44a..507ce52bc64c 100755
--- a/external/packages/bsp/overlays_cix/usr/bin/cam1_test.sh
+++ b/external/packages/bsp/overlays_cix/usr/bin/cam1_test.sh
@@ -1,2 +1,27 @@
-gst-launch-1.0 v4l2src device=/dev/video1 ! videoconvert ! autovideosink
-
+#!/bin/bash
+
+# 通过 sysfs 查找 armcb-00-vid-cap 对应的视频设备
+find_cam1_device() {
+    for dev in /dev/video*; do
+        dev_name=$(basename "$dev")
+        if [ -f "/sys/class/video4linux/${dev_name}/name" ]; then
+            name=$(cat "/sys/class/video4linux/${dev_name}/name")
+            if [ "$name" = "armcb-00-vid-cap" ]; then
+                echo "$dev"
+                return 0
+            fi
+        fi
+    done
+    return 1
+}
+
+VIDEO_DEVICE=$(find_cam1_device)
+
+if [ -z "$VIDEO_DEVICE" ]; then
+    echo "Error: Cannot find video device for armcb-00-vid-cap"
+    exit 1
+fi
+
+echo "Using video device: $VIDEO_DEVICE for armcb-00-vid-cap"
+
+gst-launch-1.0 v4l2src device=$VIDEO_DEVICE ! videoconvert ! autovideosink
diff --git a/external/packages/bsp/overlays_cix/usr/bin/cam2_test.sh b/external/packages/bsp/overlays_cix/usr/bin/cam2_test.sh
index f9bb3bb55513..2c8bf4e485a6 100755
--- a/external/packages/bsp/overlays_cix/usr/bin/cam2_test.sh
+++ b/external/packages/bsp/overlays_cix/usr/bin/cam2_test.sh
@@ -1 +1,27 @@
-gst-launch-1.0 v4l2src device=/dev/video3 ! videoconvert ! autovideosink
+#!/bin/bash
+
+# 通过 sysfs 查找 armcb-01-vid-cap 对应的视频设备
+find_cam2_device() {
+    for dev in /dev/video*; do
+        dev_name=$(basename "$dev")
+        if [ -f "/sys/class/video4linux/${dev_name}/name" ]; then
+            name=$(cat "/sys/class/video4linux/${dev_name}/name")
+            if [ "$name" = "armcb-01-vid-cap" ]; then
+                echo "$dev"
+                return 0
+            fi
+        fi
+    done
+    return 1
+}
+
+VIDEO_DEVICE=$(find_cam2_device)
+
+if [ -z "$VIDEO_DEVICE" ]; then
+    echo "Error: Cannot find video device for armcb-01-vid-cap"
+    exit 1
+fi
+
+echo "Using video device: $VIDEO_DEVICE for armcb-01-vid-cap"
+
+gst-launch-1.0 v4l2src device=$VIDEO_DEVICE ! videoconvert ! autovideosink
diff --git a/external/packages/bsp/overlays_cix/usr/bin/dual_cam_test.sh b/external/packages/bsp/overlays_cix/usr/bin/dual_cam_test.sh
index f34bd17eed96..300baeb7c6cf 100755
--- a/external/packages/bsp/overlays_cix/usr/bin/dual_cam_test.sh
+++ b/external/packages/bsp/overlays_cix/usr/bin/dual_cam_test.sh
@@ -1,6 +1,52 @@
-#gst-launch-1.0 v4l2src device=/dev/video1 ! videoconvert ! autovideosink &
-gst-launch-1.0 v4l2src device=/dev/video1 ! videoconvert ! autovideosink \
-			   v4l2src device=/dev/video3 ! videoconvert ! autovideosink
+#!/bin/bash
 
-#gst-launch-1.0 v4l2src device=/dev/video3 ! videoconvert ! autovideosink &
+# 通过 sysfs 查找 armcb-00-vid-cap 对应的视频设备
+find_cam1_device() {
+    for dev in /dev/video*; do
+        dev_name=$(basename "$dev")
+        if [ -f "/sys/class/video4linux/${dev_name}/name" ]; then
+            name=$(cat "/sys/class/video4linux/${dev_name}/name")
+            if [ "$name" = "armcb-00-vid-cap" ]; then
+                echo "$dev"
+                return 0
+            fi
+        fi
+    done
+    return 1
+}
 
+VIDEO_DEVICE1=$(find_cam1_device)
+
+if [ -z "$VIDEO_DEVICE1" ]; then
+    echo "Error: Cannot find video device for armcb-00-vid-cap"
+    exit 1
+fi
+
+echo "Using video device: $VIDEO_DEVICE1 for armcb-00-vid-cap"
+
+# 通过 sysfs 查找 armcb-01-vid-cap 对应的视频设备
+find_cam2_device() {
+    for dev in /dev/video*; do
+        dev_name=$(basename "$dev")
+        if [ -f "/sys/class/video4linux/${dev_name}/name" ]; then
+            name=$(cat "/sys/class/video4linux/${dev_name}/name")
+            if [ "$name" = "armcb-01-vid-cap" ]; then
+                echo "$dev"
+                return 0
+            fi
+        fi
+    done
+    return 1
+}
+
+VIDEO_DEVICE2=$(find_cam2_device)
+
+if [ -z "$VIDEO_DEVICE2" ]; then
+    echo "Error: Cannot find video device for armcb-01-vid-cap"
+    exit 1
+fi
+
+echo "Using video device: $VIDEO_DEVICE2 for armcb-01-vid-cap"
+
+gst-launch-1.0 v4l2src device=$VIDEO_DEVICE1 ! videoconvert ! autovideosink \
+               v4l2src device=$VIDEO_DEVICE2 ! videoconvert ! autovideosink
diff --git a/external/packages/bsp/overlays_cix_next/etc/modprobe.d/blacklist.conf b/external/packages/bsp/overlays_cix_next/etc/modprobe.d/blacklist.conf
new file mode 100755
index 000000000000..9a409b8770f0
--- /dev/null
+++ b/external/packages/bsp/overlays_cix_next/etc/modprobe.d/blacklist.conf
@@ -0,0 +1,616 @@
+blacklist r8125
+blacklist pgdrv
+blacklist amdgpu
+blacklist cuse
+blacklist fuse
+blacklist blocklayoutdriver
+blacklist overlay
+blacklist btrfs
+blacklist aes-neon-blk
+blacklist sha512-arm64
+blacklist aes-neon-bs
+blacklist sha3-ce
+blacklist sha512-ce
+blacklist chacha-neon
+blacklist crct10dif-ce
+blacklist sm3-ce
+blacklist xor-neon
+blacklist xxhash_generic
+blacklist sha256_generic
+blacklist xts
+blacklist af_alg
+blacklist cbc
+blacklist authenc
+blacklist des_generic
+blacklist blake2b_generic
+blacklist ecb
+blacklist ctr
+blacklist crypto_engine
+blacklist dh_generic
+blacklist sha3_generic
+blacklist sm3_generic
+blacklist ecdh_generic
+blacklist ecc
+blacklist sm3
+blacklist ghash-generic
+blacklist ccm
+blacklist algif_rng
+blacklist gcm
+blacklist authencesn
+blacklist md5
+blacklist cmac
+blacklist sm4_generic
+blacklist curve25519-generic
+blacklist xor
+blacklist michael_mic
+blacklist sm4
+blacklist ipmi_devintf
+blacklist ipmi_msghandler
+blacklist ipmi_si
+blacklist arm_smccc_trng
+blacklist npcm-rng
+blacklist bcm2835-rng
+blacklist cn10k-rng
+blacklist optee-rng
+blacklist rng-core
+blacklist xen-pciback
+blacklist tps65132-regulator
+blacklist vctrl-regulator
+blacklist bcm7038_wdt
+blacklist gpio-altera
+blacklist gpio-wcd934x
+blacklist gpio-bd9571mwv
+blacklist qcom-vadc-common
+blacklist max9611
+blacklist qcom-spmi-vadc
+blacklist ti-ads1015
+blacklist qcom-spmi-adc5
+blacklist st_magn_spi
+blacklist st_magn
+blacklist st_magn_i2c
+blacklist st_lsm6dsx_spi
+blacklist st_lsm6dsx_i2c
+blacklist st_lsm6dsx_i3c
+blacklist st_lsm6dsx
+blacklist kfifo_buf
+blacklist industrialio-triggered-buffer
+blacklist vcnl4000
+blacklist isl29018
+blacklist cros_ec_light_prox
+blacklist cros_ec_sensors_core
+blacklist cros_ec_sensors
+blacklist st_sensors_spi
+blacklist st_sensors
+blacklist st_sensors_i2c
+blacklist mpl3115
+blacklist cros_ec_baro
+blacklist arm-ccn
+blacklist arm-cci
+blacklist arm_dmc620_pmu
+blacklist arm_smmuv3_pmu
+blacklist arm-cmn
+blacklist arm_spe_pmu
+blacklist qmi_helpers
+blacklist stratix10-rsu
+blacklist clk-bd718x7
+blacklist lp855x_bl
+blacklist bq25980_charger
+blacklist max17042_battery
+blacklist bq25890_charger
+blacklist sbs-battery
+blacklist mt6360_charger
+blacklist cec
+blacklist ir-kbd-i2c
+blacklist lt7911uxc
+blacklist ov5640
+blacklist imx219
+blacklist ov5645
+blacklist rc-core
+blacklist rc-leadtek-y04g0051
+blacklist rc-dtt200u
+blacklist rc-cinergy-1400
+blacklist rc-delock-61959
+blacklist rc-khadas
+blacklist rc-it913x-v1
+blacklist rc-pixelview-new
+blacklist rc-imon-mce
+blacklist rc-tt-1500
+blacklist rc-dib0700-rc5
+blacklist rc-medion-x10
+blacklist rc-pinnacle-color
+blacklist rc-ati-tv-wonder-hd-600
+blacklist rc-behold
+blacklist rc-winfast-usbii-deluxe
+blacklist rc-su3000
+blacklist rc-hisi-poplar
+blacklist rc-digittrade
+blacklist rc-x96max
+blacklist rc-digitalnow-tinytwin
+blacklist rc-avermedia-rm-ks
+blacklist rc-kaiomy
+blacklist rc-terratec-slim-2
+blacklist rc-flyvideo
+blacklist rc-dntv-live-dvb-t
+blacklist rc-nebula
+blacklist rc-avermedia-dvbt
+blacklist rc-behold-columbus
+blacklist rc-zx-irdec
+blacklist rc-kworld-315u
+blacklist rc-imon-pad
+blacklist rc-avermedia-m135a
+blacklist rc-eztv
+blacklist rc-tevii-nec
+blacklist rc-em-terratec
+blacklist rc-avermedia
+blacklist rc-hauppauge
+blacklist rc-gadmei-rm008z
+blacklist rc-dib0700-nec
+blacklist rc-terratec-cinergy-c-pci
+blacklist rc-dm1105-nec
+blacklist rc-snapstream-firefly
+blacklist rc-asus-ps3-100
+blacklist rc-videostrong-kii-pro
+blacklist rc-dvbsky
+blacklist rc-real-audio-220-32-keys
+blacklist rc-cinergy
+blacklist rc-pixelview-mk12
+blacklist rc-avermedia-cardbus
+blacklist rc-streamzap
+blacklist rc-avermedia-a16d
+blacklist rc-encore-enltv
+blacklist rc-pine64
+blacklist rc-tbs-nec
+blacklist rc-beelink-gs1
+blacklist rc-twinhan-dtv-cab-ci
+blacklist rc-pv951
+blacklist rc-powercolor-real-angel
+blacklist rc-kworld-pc150u
+blacklist rc-pixelview-002t
+blacklist rc-pctv-sedna
+blacklist rc-encore-enltv2
+blacklist rc-ati-x10
+blacklist rc-purpletv
+blacklist rc-pinnacle-pctv-hd
+blacklist rc-iodata-bctv7e
+blacklist rc-medion-x10-or2x
+blacklist rc-encore-enltv-fm53
+blacklist rc-it913x-v2
+blacklist rc-wetek-hub
+blacklist rc-videomate-tv-pvr
+blacklist rc-nec-terratec-cinergy-xs
+blacklist rc-budget-ci-old
+blacklist rc-technisat-usb2
+blacklist rc-rc6-mce
+blacklist rc-minix-neo
+blacklist rc-tanix-tx3mini
+blacklist rc-medion-x10-digitainer
+blacklist rc-astrometa-t2hybrid
+blacklist rc-ct-90405
+blacklist rc-technisat-ts35
+blacklist rc-wetek-play2
+blacklist rc-videomate-s350
+blacklist rc-tivo
+blacklist rc-xbox-360
+blacklist rc-manli
+blacklist rc-videomate-m1f
+blacklist rc-norwood
+blacklist rc-vega-s9x
+blacklist rc-proteus-2309
+blacklist rc-alink-dtu-m
+blacklist rc-msi-tvanywhere-plus
+blacklist rc-dntv-live-dvbt-pro
+blacklist rc-evga-indtube
+blacklist rc-azurewave-ad-tu700
+blacklist rc-dvico-portable
+blacklist rc-adstech-dvb-t-pci
+blacklist rc-fusionhdtv-mce
+blacklist rc-imon-rsc
+blacklist rc-d680-dmb
+blacklist rc-khamsin
+blacklist rc-msi-tvanywhere
+blacklist rc-asus-pc39
+blacklist rc-twinhan1027
+blacklist rc-avertv-303
+blacklist rc-pinnacle-grey
+blacklist rc-mecool-kii-pro
+blacklist rc-total-media-in-hand-02
+blacklist rc-tanix-tx5max
+blacklist rc-msi-digivox-iii
+blacklist rc-reddo
+blacklist rc-terratec-cinergy-s2-hd
+blacklist rc-npgtech
+blacklist rc-msi-digivox-ii
+blacklist rc-total-media-in-hand
+blacklist rc-anysee
+blacklist rc-xbox-dvd
+blacklist rc-winfast
+blacklist rc-trekstor
+blacklist rc-avermedia-m733a-rm-k6
+blacklist rc-apac-viewcomp
+blacklist rc-kworld-plus-tv-analog
+blacklist rc-geekbox
+blacklist rc-pixelview
+blacklist rc-hisi-tv-demo
+blacklist rc-dvico-mce
+blacklist rc-terratec-cinergy-xs
+blacklist rc-lme2510
+blacklist rc-odroid
+blacklist rc-flydvb
+blacklist rc-gotview7135
+blacklist rc-mecool-kiii-pro
+blacklist rc-genius-tvgo-a11mce
+blacklist rc-terratec-slim
+blacklist csi_mipi_dphy_rx
+blacklist csi_dma_core
+blacklist csi_mipi_csi2
+blacklist csi_media_dev
+blacklist csi_dma_hw
+blacklist armcb_isp
+blacklist rtc-pcf85363
+blacklist rtc-ds1307
+blacklist rtc-pcf2127
+blacklist rtc-rv3028
+blacklist rtc-pcf85063
+blacklist rtc-rx8581
+blacklist rtc-mt6397
+blacklist rtc-rv8803
+blacklist rtc-m41t80
+blacklist rtc-rk808
+blacklist slimbus
+blacklist slim-qcom-ctrl
+blacklist gpio-fan
+blacklist lm90
+blacklist pwm-fan
+blacklist jc42
+blacklist ina2xx
+blacklist ina3221
+blacklist lm75
+blacklist hisi-trng-v2
+blacklist hisi_hpre
+blacklist hisi_qm
+blacklist hisi_zip
+blacklist hisi_sec2
+blacklist amlogic-gxl-crypto
+blacklist ccree
+blacklist cix_sfh_rproc
+blacklist xhci-pci
+blacklist xhci-pci-renesas
+blacklist cdns3
+blacklist cdns3-pci-wrap
+blacklist cdc-acm
+blacklist typec
+blacklist fusb302
+blacklist tcpci
+blacklist tcpm
+blacklist hd3ss3220
+blacklist tps6598x
+blacklist ftdi_sio
+blacklist usbserial
+blacklist cp210x
+blacklist usb_wwan
+blacklist option
+blacklist qcserial
+blacklist soundwire-qcom
+blacklist soundwire-bus
+blacklist nvmem-rmem
+blacklist uacce
+blacklist at24
+blacklist at25
+blacklist pci_endpoint_test
+blacklist hci_uart
+blacklist btintel
+blacklist btbcm
+blacklist btmrvl
+blacklist btmrvl_sdio
+blacklist btrtl
+blacklist btqca
+blacklist btusb
+blacklist rtk_btusb
+blacklist phy-cadence-torrent
+blacklist phy-cadence-sierra
+blacklist phy-qcom-usb-hs
+blacklist extcon-ptn5150
+blacklist i2c-hid-acpi
+blacklist i2c-hid
+blacklist wm8994
+blacklist wcd934x
+blacklist of-fpga-region
+blacklist fpga-region
+blacklist altera-freeze-bridge
+blacklist stratix10-soc
+blacklist fpga-bridge
+blacklist altera-cvp
+blacklist regmap-slimbus
+blacklist regmap-sdw
+blacklist regmap-spmi
+blacklist max96712
+blacklist spi-dw
+blacklist spi-dw-mmio
+blacklist gnss-serial
+blacklist gnss
+blacklist gnss-mtk
+blacklist bcm-sba-raid
+blacklist i2c-gpio
+blacklist raid_class
+blacklist mpt3sas
+blacklist pwm-cros-ec
+blacklist dm-zero
+blacklist dm-mirror
+blacklist dm-mod
+blacklist dm-log
+blacklist md-mod
+blacklist dm-region-hash
+blacklist s3fwrn5
+blacklist s3fwrn5_i2c
+blacklist can-dev
+blacklist flexcan
+blacklist mcp251xfd
+blacklist veth
+blacklist mwifiex
+blacklist mwifiex_pcie
+blacklist mwifiex_sdio
+blacklist brcmutil
+blacklist brcmfmac
+blacklist wcn36xx
+blacklist ath
+blacklist ath10k_pci
+blacklist ath10k_core
+blacklist ath11k_ahb
+blacklist ath11k_pci
+blacklist ath11k
+blacklist wlcore_sdio
+blacklist wlcore
+blacklist wl18xx
+blacklist mdio-bcm-unimac
+blacklist macvlan
+blacklist tap
+blacklist pegasus
+blacklist r8153_ecm
+blacklist cdc_ether
+blacklist net1080
+blacklist dm9601
+blacklist rtl8150
+blacklist plusb
+blacklist lan78xx
+blacklist mcs7830
+blacklist cdc_subset
+blacklist smsc75xx
+blacklist zaurus
+blacklist asix
+blacklist smsc95xx
+blacklist sr9800
+blacklist mdio
+blacklist bcm54140
+blacklist marvell10g
+blacklist bcm7xxx
+blacklist broadcom
+blacklist bcm-phy-lib
+blacklist microchip
+blacklist smsc
+blacklist marvell
+blacklist ax88796b
+blacklist macvtap
+blacklist r8169
+blacklist mlx4_core
+blacklist mlx4_en
+blacklist mlx5_core
+blacklist genet
+blacklist bcmsysport
+blacklist bnx2x
+blacklist atl1c
+blacklist stmmac-platform
+blacklist dwmac-altr-socfpga
+blacklist stmmac
+blacklist dwmac-generic
+blacklist qcom-emac
+blacklist rmnet
+blacklist pcs_xpcs
+blacklist b53_srab
+blacklist b53_common
+blacklist bcm-sf2
+blacklist nbd
+blacklist pcie-brcmstb
+blacklist pci-meson
+blacklist pci-epf-test
+blacklist governor_userspace
+blacklist cpufreq_powersave
+blacklist cpufreq_conservative
+blacklist led-class-multicolor
+blacklist leds-pca9532
+blacklist leds-qcom-lpg
+blacklist leds-lm3692x
+blacklist ahci_brcm
+blacklist mhi
+blacklist stm_core
+blacklist coresight
+blacklist coresight-etb10
+blacklist coresight-cpu-debug
+blacklist coresight-replicator
+blacklist coresight-stm
+blacklist coresight-cti
+blacklist coresight-catu
+blacklist coresight-funnel
+blacklist coresight-tmc
+blacklist coresight-tpiu
+blacklist drm_vram_helper
+blacklist panel-truly-nt35597
+blacklist panel-edp
+blacklist panel-lvds
+blacklist panel-simple
+blacklist panel-raydium-rm67191
+blacklist panel-boe-tv101wum-nl6
+blacklist panel-mantix-mlaf057we51
+blacklist panel-sitronix-st7703
+blacklist drm_shmem_helper
+blacklist rcar_dw_hdmi
+blacklist etnaviv
+blacklist panfrost
+blacklist v3d
+blacklist hibmc-drm
+blacklist kirin-drm
+blacklist dw_drm_dsi
+blacklist drm_ttm_helper
+blacklist parade-ps8640
+blacklist cdns-mhdp8546
+blacklist adv7511
+blacklist dw-hdmi-ahb-audio
+blacklist dw-hdmi-cec
+blacklist dw-hdmi
+blacklist dw-hdmi-i2s-audio
+blacklist nwl-dsi
+blacklist thc63lvd1024
+blacklist sii902x
+blacklist ti-sn65dsi86
+blacklist lontium-lt9611
+blacklist simple-bridge
+blacklist lontium-lt9611uxc
+blacklist display-connector
+blacklist lontium-lt8912b
+blacklist gpu-sched
+blacklist vkms
+blacklist pl111_drm
+blacklist mali-dp
+blacklist hdlcd
+blacklist komeda
+blacklist sil164
+blacklist tda998x
+blacklist ch7006
+blacklist ttm
+blacklist tidss
+blacklist lima
+blacklist nouveau
+blacklist slram
+blacklist brcmstb_nand
+blacklist brcmnand
+blacklist bcm63138_nand
+blacklist iproc_nand
+blacklist adc-keys
+blacklist pwm-vibra
+blacklist pwm-beeper
+blacklist atmel_mxt_ts
+blacklist goodix_ts
+blacklist edt-ft5x06
+blacklist cros_typec_switch
+blacklist cros_ec_typec
+blacklist cros_ec_chardev
+blacklist zstd_compress
+blacklist crc-ccitt
+blacklist libsha256
+blacklist libarc4
+blacklist libcurve25519-generic
+blacklist libchacha
+blacklist libdes
+blacklist raid6_pq
+blacklist snd-soc-fsl-ssi
+blacklist snd-soc-fsl-easrc
+blacklist snd-soc-fsl-esai
+blacklist snd-soc-fsl-micfil
+blacklist snd-soc-imx-audmux
+blacklist snd-soc-fsl-spdif
+blacklist snd-soc-fsl-sai
+blacklist snd-soc-fsl-audmix
+blacklist snd-soc-fsl-asrc
+blacklist snd-soc-fsl-utils
+blacklist snd-soc-es7134
+blacklist snd-soc-simple-amplifier
+blacklist snd-soc-tlv320aic31xx
+blacklist snd-soc-dmic
+blacklist snd-soc-wsa881x
+blacklist snd-soc-wcd-mbhc
+blacklist snd-soc-lpass-wsa-macro
+blacklist snd-soc-wcd9335
+blacklist snd-soc-adau7002
+blacklist snd-soc-tas571x
+blacklist snd-soc-cros-ec-codec
+blacklist snd-soc-wcd938x-sdw
+blacklist snd-soc-lpass-macro-common
+blacklist snd-soc-tlv320aic32x4
+blacklist snd-soc-max98357a
+blacklist snd-soc-wm8978
+blacklist snd-soc-lpass-tx-macro
+blacklist snd-soc-wm8904
+blacklist snd-soc-es7241
+blacklist snd-soc-msm8916-analog
+blacklist snd-soc-pcm3168a
+blacklist snd-soc-gtm601
+blacklist snd-soc-max98927
+blacklist snd-soc-rt5659
+blacklist snd-soc-wm8962
+blacklist snd-soc-lpass-va-macro
+blacklist snd-soc-ak4613
+blacklist snd-soc-wcd938x
+blacklist snd-soc-nau8822
+blacklist snd-soc-rl6231
+blacklist snd-soc-wm8960
+blacklist snd-soc-wm8524
+blacklist snd-soc-tlv320aic32x4-i2c
+blacklist snd-soc-wcd934x
+blacklist snd-soc-lpass-rx-macro
+blacklist snd-soc-spdif-rx
+blacklist snd-soc-simple-mux
+blacklist snd-soc-pcm3168a-i2c
+blacklist snd-soc-sgtl5000
+blacklist snd-soc-msm8916-digital
+blacklist snd-soc-spdif-tx
+blacklist can-gw
+blacklist can-bcm
+blacklist can-raw
+blacklist can
+blacklist tunnel4
+blacklist ip_tunnel
+blacklist ipt_REJECT
+blacklist nf_reject_ipv4
+blacklist iptable_filter
+blacklist iptable_mangle
+blacklist cfg80211
+blacklist sit
+blacklist ip6_tables
+blacklist ip6t_REJECT
+blacklist nf_reject_ipv6
+blacklist ip6table_mangle
+blacklist ip6table_filter
+blacklist ip6table_nat
+blacklist qrtr-tun
+blacklist qrtr-mhi
+blacklist qrtr-smd
+blacklist qrtr
+blacklist br_netfilter
+blacklist bridge
+blacklist bluetooth
+blacklist hidp
+blacklist garp
+blacklist stp
+blacklist mrp
+blacklist p8022
+blacklist psnap
+blacklist xt_mark
+blacklist xt_conntrack
+blacklist xt_addrtype
+blacklist xt_ipvs
+blacklist ip_vs
+blacklist xt_tcpudp
+blacklist xt_LOG
+blacklist xt_nat
+blacklist nf_log_syslog
+blacklist xt_CHECKSUM
+blacklist llc
+blacklist nfc
+blacklist nci
+blacklist act_gate
+blacklist act_gact
+blacklist cls_flower
+blacklist sch_ingress
+blacklist sch_mqprio
+blacklist sch_taprio
+blacklist sch_cbs
+blacklist sch_etf
+blacklist act_mirred
+blacklist cls_basic
+blacklist tag_ocelot_8021q
+blacklist tag_brcm
+blacklist dsa_core
+blacklist tag_ocelot
+blacklist csi_dma
+blacklist csi_mipi_dphy_hw
+blacklist csi_rcsu_hw
+blacklist panthor
diff --git a/scripts/build-cix-image.sh b/scripts/build-cix-image.sh
index 0b52d3ac7fe4..a253d997f992 100755
--- a/scripts/build-cix-image.sh
+++ b/scripts/build-cix-image.sh
@@ -35,7 +35,6 @@ function create_cix_rootfs()
     local ROOT_FREE_SIZE=4096000
     rootfs_ext4=${PATH_OUT}/images/rootfs.ext4
 
-    rm -rf ${PATH_OUT} > /dev/null 2>&1
     mkdir -p ${PATH_OUT}/images > /dev/null 2>&1
 
     mount --bind --make-private $SDCARD $MOUNT/
@@ -139,16 +138,16 @@ function create_cix_image()
     local dtb_args=()
     while IFS= read -r -d $'\0' dtb; do
         dtb_args+=("${dtb}" "/$(basename "${dtb}")")
-    done < <(find "${LINUXSOURCEDIR}/arch/arm64/boot/dts/cix/" -maxdepth 1 -name "*.dtb" -print0)
+    done < <(find "${SRC}/output/cix/" -maxdepth 1 -name "*.dtb" -print0)
 
-    sed -i '3cset default="0"' "${PATH_OUT}/images/grub.cfg"
+    #sed -i '3cset default="0"' "${PATH_OUT}/images/grub.cfg"
     "${SCRIPT_DIR}/tools/mk-part-fat" \
         -o "${PATH_OUT}/images/boot.img" \
         -s "${boot_size}" \
         -l "ESP" \
         "${SCRIPT_DIR}/grub.efi" "/EFI/BOOT/BOOTAA64.EFI" \
         "${PATH_OUT}/images/grub.cfg" "/grub/grub.cfg" \
-        "${LINUXSOURCEDIR}/arch/arm64/boot/Image" "/Image" \
+        "${SRC}/output/cix/Image" "/Image" \
         "${SCRIPT_DIR}/cix_binary/device/images/rootfs.cpio.gz" "/rootfs.cpio.gz" \
         "${dtb_args[@]}" > /dev/null 2>&1
 
diff --git a/scripts/compilation.sh b/scripts/compilation.sh
index 21e03083f669..273ddf3c5a38 100755
--- a/scripts/compilation.sh
+++ b/scripts/compilation.sh
@@ -506,6 +506,13 @@ CUSTOM_KERNEL_CONFIG
 		exit_with_error "Kernel was not built" "@host"
 	fi
 
+	if [[ ${BOARDFAMILY} == cix ]]; then
+		[[ -d ${SRC}/output/cix ]] && rm -rf ${SRC}/output/cix
+		mkdir -p ${SRC}/output/cix/ > /dev/null 2>&1
+		cp ${kerneldir}/arch/arm64/boot/Image ${SRC}/output/cix/
+		cp ${kerneldir}/arch/arm64/boot/dts/cix/sky1-*dtb ${SRC}/output/cix/
+	fi
+
 	# different packaging for 4.3+
 	if linux-version compare "${version}" ge 4.3; then
 		local kernel_packing="bindeb-pkg"