diff --git a/config/Config-images.in b/config/Config-images.in
index 06a7dc0f3..781739a30 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -298,13 +298,13 @@ menu "Target Images"
 		depends on USES_BOOT_PART
 		default 8 if TARGET_apm821xx_sata
 		default 64 if TARGET_bcm27xx
-		default 32 if TARGET_rockchip
+		default 64 if TARGET_rockchip
 		default 16
 
 	config TARGET_ROOTFS_PARTSIZE
 		int "Root filesystem partition size (in MB)"
 		depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_sunxi || TARGET_uml
-		default 480
+		default 400
 		help
 		  Select the root filesystem partition size.
 
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5ac93217f..9c203b5e6 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,7 +2,7 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_8
+	default GCC_USE_VERSION_11
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 8592b91d5..5c1aadc3b 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,6 +1,10 @@
 config GCC_VERSION_7
 	default y if GCC_USE_VERSION_7
 	bool
+	
+config GCC_VERSION_8
+	default y if GCC_USE_VERSION_8
+	bool
 
 config GCC_VERSION_9
 	default y if GCC_USE_VERSION_9
@@ -10,10 +14,6 @@ config GCC_VERSION_10
 	default y if GCC_USE_VERSION_10
 	bool
 
-config GCC_VERSION_11
-	default y if GCC_USE_VERSION_11
-	bool
-	
 config GCC_VERSION_12
 	default y if GCC_USE_VERSION_12
 	bool
@@ -21,11 +21,11 @@ config GCC_VERSION_12
 config GCC_VERSION
 	string
 	default "7.5.0"		if GCC_VERSION_7
+	default "8.4.0"		if GCC_VERSION_8
 	default "9.3.0"		if GCC_VERSION_9
 	default "10.3.0"	if GCC_VERSION_10
-	default "11.3.0"	if GCC_VERSION_11
 	default "12.2.0"	if GCC_VERSION_12
-	default "8.4.0"
+	default "11.3.0"
 
 config GCC_USE_IREMAP
 	bool