diff --git a/buildroot b/buildroot
index 516b837..8025cfa 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 516b837002e21db6730928e8cad60b75146e099b
+Subproject commit 8025cfad1055ad23a5935b7a69580ebc2b003e1e
diff --git a/external_tree/configs/system_agent_orangepi_pc_defconfig b/external_tree/configs/system_agent_orangepi_pc_defconfig
index 0df41ce..28b39d0 100644
--- a/external_tree/configs/system_agent_orangepi_pc_defconfig
+++ b/external_tree/configs/system_agent_orangepi_pc_defconfig
@@ -1,18 +1,16 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ENABLE_DEBUG=y
-BR2_OPTIMIZE_G=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_GLIBC_UTILS=y
-BR2_BINUTILS_VERSION_2_36_X=y
-BR2_GCC_VERSION_10_X=y
+BR2_BINUTILS_VERSION_2_39_X=y
+BR2_GCC_VERSION_12_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GCC_ENABLE_LTO=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
 BR2_PACKAGE_HOST_GDB_PYTHON3=y
-BR2_GDB_VERSION_10=y
+BR2_GDB_VERSION_12=y
+BR2_ENABLE_DEBUG=y
+BR2_OPTIMIZE_G=y
 BR2_TARGET_GENERIC_HOSTNAME="system-agent-opi-pc"
 BR2_TARGET_GENERIC_ISSUE="ARE U OKAY ?"
 BR2_INIT_SYSTEMD=y
@@ -27,7 +25,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_system_agent_PATH)/board/iminc/orangepi-pc-system-agent/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.29"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/orangepi-pc-system-agent/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -85,10 +83,9 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"