commit df454bf83ce40dcf979a9616f84cbab24ee3f108
author Mark Salyzyn <salyzyn@google.com> Fri May 08 13:32:52 2020 -0700
committer Cyan_Hsieh <cyanhsieh@google.com> Tue Jun 02 18:49:33 2020 +0800
tree 1376c02af0c1593cb9aefc51c8bb5c3655df0994
parent 38205c0473c348bad8ee4db8416f16dc56b2b321

Refactor BoardConfig to simplify maintenance

Move common operations to redbull.

Uses TARGET_BOOTLOADER_BOARD_NAME set here where ever product or
device specific directories are referenced in stanzas move to redbull.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 151950334
Test: fastboot flashall & boot
Change-Id: I4df013924a7566807063bc410fb879d9546f9b6b

redfin/BoardConfig.mk

diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk
index a66480c..fd4bfbe 100644
--- a/redfin/BoardConfig.mk
+++ b/redfin/BoardConfig.mk
@@ -17,82 +17,11 @@
 TARGET_BOOTLOADER_BOARD_NAME := redfin
 TARGET_SCREEN_DENSITY := 440
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
-
-include device/google/redbull/BoardConfig-common.mk
-include device/google/redfin-sepolicy/redfin-sepolicy.mk
-
-TARGET_BOARD_INFO_FILE := device/google/redfin/board-info.txt
 USES_DEVICE_GOOGLE_REDFIN := true
 
-TARGET_BOARD_COMMON_PATH := device/google/redfin/sm7250
-
-# DTBO partition definitions
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-    BOARD_PREBUILT_DTBOIMAGE := device/google/redfin-kernel/dtbo.img
-else
-    BOARD_PREBUILT_DTBOIMAGE := device/google/redfin-kernel/vintf/dtbo.img
-endif
-TARGET_FS_CONFIG_GEN := device/google/redfin/config.fs
-
-# Kernel modules
-ifeq (,$(filter-out redfin_kasan, $(TARGET_PRODUCT)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/redfin-kernel/kasan/*.ko)
-else ifeq (,$(filter-out redfin_kernel_debug_memory, $(TARGET_PRODUCT)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/redfin-kernel/debug_memory/*.ko)
-else ifeq (,$(filter-out redfin_kernel_debug_locking, $(TARGET_PRODUCT)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/redfin-kernel/debug_locking/*.ko)
-else ifeq (,$(filter-out redfin_kernel_debug_hang, $(TARGET_PRODUCT)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/redfin-kernel/debug_hang/*.ko)
-else ifeq (,$(filter-out redfin_kernel_debug_api, $(TARGET_PRODUCT)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/redfin-kernel/debug_api/*.ko)
-else ifeq (,$(filter-out redfin_gki, $(TARGET_PRODUCT)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/redfin-kernel/gki/*.ko)
-else
-    ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-        BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-        $(wildcard device/google/redfin-kernel/*.ko)
-    else
-        BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-        $(wildcard device/google/redfin-kernel/vintf/*.ko)
-    endif
-endif
-
-ifeq (,$(filter-out redfin_gki, $(TARGET_PRODUCT)))
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/redfin-kernel/gki/modules.load)
-else ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/redfin-kernel/modules.load)
-else
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/redfin-kernel/vintf/modules.load)
-endif
-
-# DTB
-ifeq (,$(filter-out redfin_kasan, $(TARGET_PRODUCT)))
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/kasan
-else ifeq (,$(filter-out redfin_kernel_debug_memory, $(TARGET_PRODUCT)))
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/debug_memory
-else ifeq (,$(filter-out redfin_kernel_debug_locking, $(TARGET_PRODUCT)))
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/debug_locking
-else ifeq (,$(filter-out redfin_kernel_debug_hang, $(TARGET_PRODUCT)))
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/debug_hang
-else ifeq (,$(filter-out redfin_kernel_debug_api, $(TARGET_PRODUCT)))
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/debug_api
-else ifeq (,$(filter-out redfin_gki, $(TARGET_PRODUCT)))
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/gki
-else
-    ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-        BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel
-    else
-        BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/vintf
-    endif
-endif
+include device/google/redbull/BoardConfig-common.mk
 
 # Testing related defines
 #BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r3-setup.sh
 
--include vendor/google_devices/redfin/proprietary/BoardConfigVendor.mk
+-include vendor/google_devices/$(TARGET_BOOTLOADER_BOARD_NAME)/proprietary/BoardConfigVendor.mk