Revert "ANDROID: kleaf: convert rockpi4 to mixed build."

This reverts commit 6100c90ef5.

Reason for revert: rockpi4 has DEVTMPFS enabled and GKI doesn't

Bug: 258841346
Change-Id: Icefb1bb4cf39004234513d307e385b04cb76e51d

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",

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

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="
+MAKE_GOALS="${MAKE_GOALS}
-modules
 rockchip/rk3399-rock-pi-4b.dtb
 "
 
-FILES="
+FILES="${FILES}
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dtb
 "

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