diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2020-05-08 13:32:52 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2020-06-01 05:28:53 -0700 |
| commit | 04a1a55b9f15d3df20c205165b8b76cecb7dcafc (patch) | |
| tree | a10437edd12952eb3340cfee648294f1d10a8bbf /bramble | |
| parent | 167bf0f8f9695785cf8caf980591068c769c046f (diff) | |
| download | bramble-04a1a55b9f15d3df20c205165b8b76cecb7dcafc.tar.gz | |
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
Diffstat (limited to 'bramble')
| -rw-r--r-- | bramble/BoardConfig.mk | 76 |
1 files changed, 2 insertions, 74 deletions
diff --git a/bramble/BoardConfig.mk b/bramble/BoardConfig.mk index eb89384..ddfde7c 100644 --- a/bramble/BoardConfig.mk +++ b/bramble/BoardConfig.mk @@ -17,81 +17,9 @@ TARGET_BOOTLOADER_BOARD_NAME := bramble TARGET_SCREEN_DENSITY := 420 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 - -include device/google/redbull/BoardConfig-common.mk -include device/google/bramble-sepolicy/bramble-sepolicy.mk - -TARGET_BOARD_INFO_FILE := device/google/bramble/board-info.txt USES_DEVICE_GOOGLE_BRAMBLE := true -TARGET_BOARD_COMMON_PATH := device/google/bramble/sm7250 - -# DTBO partition definitions -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - BOARD_PREBUILT_DTBOIMAGE := device/google/bramble-kernel/dtbo.img -else - BOARD_PREBUILT_DTBOIMAGE := device/google/bramble-kernel/vintf/dtbo.img -endif - -TARGET_FS_CONFIG_GEN := device/google/bramble/config.fs - -# Kernel modules -ifeq (,$(filter-out bramble_kasan, $(TARGET_PRODUCT))) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/kasan/*.ko) -else ifeq (,$(filter-out bramble_kernel_debug_memory, $(TARGET_PRODUCT))) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/debug_memory/*.ko) -else ifeq (,$(filter-out bramble_kernel_debug_locking, $(TARGET_PRODUCT))) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/debug_locking/*.ko) -else ifeq (,$(filter-out bramble_kernel_debug_hang, $(TARGET_PRODUCT))) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/debug_hang/*.ko) -else ifeq (,$(filter-out bramble_kernel_debug_api, $(TARGET_PRODUCT))) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/debug_api/*.ko) -else ifeq (,$(filter-out bramble_gki, $(TARGET_PRODUCT))) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/gki/*.ko) -else - ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/*.ko) - else - BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ - $(wildcard device/google/bramble-kernel/vintf/*.ko) - endif -endif - -ifeq (,$(filter-out bramble_gki, $(TARGET_PRODUCT))) - BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/bramble-kernel/gki/modules.load) -else ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/bramble-kernel/modules.load) -else - BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/bramble-kernel/vintf/modules.load) -endif - -# DTB -ifeq (,$(filter-out bramble_kasan, $(TARGET_PRODUCT))) -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/kasan -else ifeq (,$(filter-out bramble_kernel_debug_memory, $(TARGET_PRODUCT))) -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/debug_memory -else ifeq (,$(filter-out bramble_kernel_debug_locking, $(TARGET_PRODUCT))) -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/debug_locking -else ifeq (,$(filter-out bramble_kernel_debug_hang, $(TARGET_PRODUCT))) -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/debug_hang -else ifeq (,$(filter-out bramble_kernel_debug_api, $(TARGET_PRODUCT))) -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/debug_api -else ifeq (,$(filter-out bramble_gki, $(TARGET_PRODUCT))) -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/gki -else - ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel - else - BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bramble-kernel/vintf - endif -endif +include device/google/redbull/BoardConfig-common.mk # Allow LZ4 compression BOARD_RAMDISK_USE_LZ4 := true @@ -99,4 +27,4 @@ BOARD_RAMDISK_USE_LZ4 := true # Testing related defines #BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/b5-setup.sh --include vendor/google_devices/bramble/proprietary/BoardConfigVendor.mk +-include vendor/google_devices/$(TARGET_BOOTLOADER_BOARD_NAME)/proprietary/BoardConfigVendor.mk |