| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-09-29 12:06:15 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-09-29 12:06:15 (GMT) |
| commit | 599365cac66c1add0b3a9a4c635cec9207fb142f (patch) | |
| tree | e76e4a5f4c62d012c2cb88df2c9a41b486eb23af | |
| parent | 5d99b8d31f7227fa1d8cbdcb75547fbbdc60f2f4 (diff) | |
| parent | a16b41b4368fb6a04c83f9bb8abe39e019662ed5 (diff) | |
| download | einstein-p-amlogic.zip einstein-p-amlogic.tar.gz einstein-p-amlogic.tar.bz2 | |
Merge "vts: add boot image header_version field & dtbo.img [15/20]" into p-amlogic
| -rw-r--r-- | BoardConfig.mk | 8 | ||||
| -rw-r--r-- | Kernel.mk | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8d4dd92..63e3b96 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -102,6 +102,12 @@ BOARD_ODMIMAGE_PARTITION_SIZE := 134217728 BOARD_PRODUCTIMAGE_PARTITION_SIZE := 134217728 endif +# DTBO partition definitions +BOARD_PREBUILT_DTBOIMAGE := device/amlogic/einstein-kernel/dtbo.img +BOARD_DTBOIMG_PARTITION_SIZE := 8388608 + +BOARD_KERNEL_CMDLINE += androidboot.dtbo_idx=0 + ifneq ($(USE_USB_AS_HOST),true) BOARD_KERNEL_CMDLINE += --cmdline "otg_device=1" endif @@ -162,3 +168,5 @@ DEVICE_MANIFEST_FILE := device/amlogic/einstein/manifest.xml BOARD_HAS_ADTV := true BOARD_VNDK_VERSION := current +BOARD_BOOTIMG_HEADER_VERSION := 1 +BOARD_INCLUDE_RECOVERY_DTBO := true @@ -5,7 +5,7 @@ KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel -BOARD_MKBOOTIMG_ARGS := --kernel_offset $(BOARD_KERNEL_OFFSET) +BOARD_MKBOOTIMG_ARGS := --kernel_offset $(BOARD_KERNEL_OFFSET) --header_version $(BOARD_BOOTIMG_HEADER_VERSION) INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader @@ -60,6 +60,8 @@ KERNEL_DEVICETREE := txlx_t962x_r311_2g KERNEL_DEFCONFIG := meson64_defconfig KERNEL_ARCH := arm64 +DTBO_DEVICETREE := common_overlay_dt + WIFI_MODULE := multiwifi KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ |