diff options
| -rwxr-xr-x | BoardConfig.mk | 6 | ||||
| -rw-r--r-- | mkbootimg.mk | 52 | ||||
| -rwxr-xr-x | prebuilt/zImage | bin | 0 -> 54588770 bytes |
3 files changed, 56 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index ddb97fa..f5bfb00 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -58,7 +58,8 @@ ENABLE_CPUSETS := true TARGET_USES_64_BIT_BINDER := true # Kernel -BOARD_KERNEL_CMDLINE := console=tty60,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=16M@0-0xffffffff androidboot.selinux=permissive +BOARD_CUSTOM_BOOTIMG_MK := $(PLATFORM_PATH)/mkbootimg.mk +BOARD_KERNEL_CMDLINE := console=tty60,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff androidboot.selinux=permissive BOARD_KERNEL_BASE := 0x80000000 BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x00000100 @@ -68,8 +69,9 @@ TARGET_KERNEL_APPEND_DTB := true TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_HEADER_ARCH := arm64 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android- -TARGET_KERNEL_CONFIG := cyanogenmod_z2_plus_defconfig +TARGET_KERNEL_CONFIG := msm_defconfig TARGET_KERNEL_SOURCE := kernel/zuk/msm8996 +TARGET_PREBUILT_KERNEL := $(PLATFORM_PATH)/prebuilt/zImage # QCOM hardware BOARD_USES_QCOM_HARDWARE := true diff --git a/mkbootimg.mk b/mkbootimg.mk new file mode 100644 index 0000000..999ddc6 --- /dev/null +++ b/mkbootimg.mk @@ -0,0 +1,52 @@ +LOCAL_PATH := $(call my-dir) + +## Use prebuilt kernel +INTERNAL_BOOTIMAGE_ARGS := \ + $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \ + --kernel $(TARGET_PREBUILT_KERNEL) + +ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) +INTERNAL_BOOTIMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET) +endif + +INTERNAL_BOOTIMAGE_FILES := $(filter-out --%,$(INTERNAL_BOOTIMAGE_ARGS)) + +INTERNAL_RECOVERYIMAGE_ARGS := \ + $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \ + --kernel $(TARGET_PREBUILT_KERNEL) \ + --ramdisk $(recovery_ramdisk) + +BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE)) +ifdef BOARD_KERNEL_CMDLINE + INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(BOARD_KERNEL_CMDLINE)" + INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(BOARD_KERNEL_CMDLINE)" +endif + +BOARD_KERNEL_BASE := $(strip $(BOARD_KERNEL_BASE)) +ifdef BOARD_KERNEL_BASE + INTERNAL_BOOTIMAGE_ARGS += --base $(BOARD_KERNEL_BASE) + INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE) +endif + +BOARD_KERNEL_PAGESIZE := $(strip $(BOARD_KERNEL_PAGESIZE)) +ifdef BOARD_KERNEL_PAGESIZE + INTERNAL_BOOTIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE) + INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE) +endif + +## Overload bootimg generation: Same as the original, using prebuilt kernel +$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) + $(call pretty,"Target boot image: $@") + $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) --output $@ + $(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw) + @echo -e ${CL_CYN}"Made boot image: $@"${CL_RST} + +## Overload recoveryimg generation: Same as the original, using prebuilt kernel +$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \ + $(recovery_ramdisk) \ + $(recovery_kernel) + $(call build-recoveryimage-target, $@) + @echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST} + $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) --output $@ + $(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw) +@echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST} diff --git a/prebuilt/zImage b/prebuilt/zImage Binary files differnew file mode 100755 index 0000000..65ac1a8 --- /dev/null +++ b/prebuilt/zImage |