BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8350-common: Add support for vendor_boot

Browse source 
This enables boot header v3 which creates a vendor_boot images that
holds the vendor kernel modules.

Signed-off-by: Will McVicker <willmcvicker@google.com>
Fixes: 151949371
Test: boot, verify vendor_boot ramdisk is loaded, check lsmod
Change-Id: Ia1b7df306d3a9f0e2f1f3ec8e7c2547da0b07596
This commit is contained in:
Will McVicker 2020-03-19 10:38:31 -07:00 committed by LuK1337
parent f9ba3937a7
commit f6f7e210d6
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
BoardConfigCommon.mk
View file

@ -42,7 +42,7 @@ TARGET_BOOTLOADER_BOARD_NAME := lahaina
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
# Kernel # Kernel
BOARD_BOOT_HEADER_VERSION := 2 BOARD_BOOT_HEADER_VERSION := 3
BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_BASE := 0x00000000
BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=2048 loop.max_part=7 cgroup.memory=nokmem,nosocket reboot=panic_warm BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=2048 loop.max_part=7 cgroup.memory=nokmem,nosocket reboot=panic_warm
BOARD_KERNEL_IMAGE_NAME := Image BOARD_KERNEL_IMAGE_NAME := Image
@ -77,7 +77,8 @@ AB_OTA_PARTITIONS += \
system_ext \ system_ext \
vbmeta \ vbmeta \
vbmeta_system \ vbmeta_system \
vendor vendor \
vendor_boot
# ANT+ # ANT+
BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
@ -136,10 +137,11 @@ DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
BOARD_USES_METADATA_PARTITION := true BOARD_USES_METADATA_PARTITION := true
# Partitions # Partitions
BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_BOOTIMAGE_PARTITION_SIZE := 201326592
BOARD_DTBOIMG_PARTITION_SIZE := 25165824 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296
BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744 BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744
BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 201326592
ifneq ($(WITH_GMS),true) ifneq ($(WITH_GMS),true)
BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1 BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1
BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1 BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1

2
gpt-utils/gpt-utils.h
View file

@ -81,7 +81,7 @@ extern "C" {
#define PTN_XBL "xbl" #define PTN_XBL "xbl"
#define PTN_XBL_CFG "xbl_config" #define PTN_XBL_CFG "xbl_config"
#define PTN_SWAP_LIST PTN_XBL, PTN_XBL_CFG, "sbl1", "rpm", "tz", "aboot", "abl", "hyp", "lksecapp", "keymaster", "cmnlib", "cmnlib32", "cmnlib64", "pmic", "apdp", "devcfg", "hosd", "keystore", "msadp", "mdtp", "mdtpsecapp", "dsp", "aop", "qupfw", "vbmeta", "dtbo", "imagefv", "ImageFv", "multiimgoem", "multiimgqti", "uefisecapp" #define PTN_SWAP_LIST PTN_XBL, PTN_XBL_CFG, "sbl1", "rpm", "tz", "aboot", "abl", "hyp", "lksecapp", "keymaster", "cmnlib", "cmnlib32", "cmnlib64", "pmic", "apdp", "devcfg", "hosd", "keystore", "msadp", "mdtp", "mdtpsecapp", "dsp", "aop", "qupfw", "vbmeta", "dtbo", "imagefv", "ImageFv", "multiimgoem", "multiimgqti", "uefisecapp"
#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "odm", "modem", "bluetooth" #define AB_PTN_LIST PTN_SWAP_LIST, "boot", "vendor_boot", "system", "vendor", "odm", "modem", "bluetooth"
#define BOOT_DEV_DIR "/dev/block/bootdevice/by-name" #define BOOT_DEV_DIR "/dev/block/bootdevice/by-name"
/****************************************************************************** /******************************************************************************

10
rootdir/Android.mk
View file

@ -5,9 +5,19 @@ LOCAL_MODULE := fstab.qcom
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/fstab.qcom LOCAL_SRC_FILES := etc/fstab.qcom
LOCAL_REQUIRED_MODULES := fstab.qcom.first_stage_ramdisk
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := fstab.qcom.first_stage_ramdisk
LOCAL_MODULE_STEM := fstab.qcom
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/fstab.qcom
LOCAL_MODULE_PATH := $(TARGET_VENDOR_RAMDISK_OUT)/first_stage_ramdisk
include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := init.class_main.sh LOCAL_MODULE := init.class_main.sh
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional