diff --git a/BUILD.bazel b/BUILD.bazel
index 78502ea612ee..bdd9830f6270 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -244,14 +244,20 @@ define_db845c(
     ],
 )
 
+# TODO(b/258259749): Convert rockpi4 to mixed build
 kernel_build(
     name = "rockpi4",
     outs = [
+        "Image",
+        "System.map",
+        "modules.builtin",
+        "modules.builtin.modinfo",
         "rk3399-rock-pi-4b.dtb",
+        "vmlinux",
+        "vmlinux.symvers",
     ],
-    base_kernel = "//common:kernel_aarch64",
     build_config = "build.config.rockpi4",
-    module_outs = [
+    module_outs = COMMON_GKI_MODULES_LIST + [
         # keep sorted
         "drivers/block/virtio_blk.ko",
         "drivers/char/hw_random/virtio-rng.ko",
diff --git a/arch/arm64/configs/rockpi4_gki.fragment b/arch/arm64/configs/rockpi4_gki.fragment
index 84aecea1614e..2af01b890c59 100644
--- a/arch/arm64/configs/rockpi4_gki.fragment
+++ b/arch/arm64/configs/rockpi4_gki.fragment
@@ -80,6 +80,3 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
-
-# Do not sign non-GKI modules
-# CONFIG_MODULE_SIG_ALL is not set
diff --git a/build.config.rockpi4 b/build.config.rockpi4
index 04da72b63a39..424e568f018c 100644
--- a/build.config.rockpi4
+++ b/build.config.rockpi4
@@ -10,11 +10,10 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/rockpi4_gki.fragment
 PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
-MAKE_GOALS="
-modules
+MAKE_GOALS="${MAKE_GOALS}
 rockchip/rk3399-rock-pi-4b.dtb
 "
 
-FILES="
+FILES="${FILES}
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dtb
 "
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index 42233f24758f..ce622014516e 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -227,13 +227,6 @@ config GKI_HIDDEN_DMA_CONFIGS
 	  Dummy config option used to enable the hidden DMA configs,
 	  required by various SoC platforms.
 
-config GKI_HIDDEN_PCIE_ROCKCHIP_CONFIGS
-    bool "Hidden PCIE rockchip configuration needed for GKI"
-    select PCIE_ROCKCHIP
-    help
-      Dummy config option used to enable the hidden PCIE rockchip configs,
-      required by rockchip.
-
 # Atrocities needed for
 # a) building GKI modules in separate tree, or
 # b) building drivers that are not modularizable
@@ -265,7 +258,6 @@ config GKI_HACKS_TO_FIX
 	select GKI_HIDDEN_MM_CONFIGS
 	select GKI_HIDDEN_ETHERNET_CONFIGS
 	select GKI_HIDDEN_DMA_CONFIGS
-	select GKI_HIDDEN_PCIE_ROCKCHIP_CONFIGS
 
 	help
 	  Dummy config option used to enable core functionality used by