summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Ramírez <juan1999l@gmail.com>2019-01-24 09:28:04 +0000
committerJuan Ramírez <juan1999l@gmail.com>2019-01-26 17:11:16 +0000
commit575e3974fda889d291cc6d4da12d08e49f1ce971 (patch)
tree3e0e32e6c326da570664487307b0d9561562fa49
parentefd3ce3aa5f5ec3bccd25a986f95da0fa70ebf98 (diff)
Revert "kirin970-common: Setup inline kernel build"
This reverts commit 95b1126be0a6eb8db3df193b028085dfe54c318b.
-rw-r--r--BoardConfigCommon.mk14
-rw-r--r--rootdir/etc/fstab.kirin9702
2 files changed, 3 insertions, 13 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 929d82f..ff989de 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -35,17 +35,8 @@ TARGET_USES_64_BIT_BINDER := true
TARGET_NO_BOOTLOADER := true
# Kernel
-BOARD_KERNEL_BASE := 0x00078000
-BOARD_KERNEL_CMDLINE := loglevel=4 initcall_debug=n page_tracker=on unmovable_isolate1=2:192M,3:224M,4:256M printktimer=0xfff0a000,0x534,0x538
-BOARD_KERNEL_IMAGE_NAME := Image.gz
-BOARD_KERNEL_PAGESIZE := 2048
-BOARD_KERNEL_TAGS_OFFSET := 0x07988000
-BOARD_RAMDISK_OFFSET := 0x07B88000
-BOARD_MKBOOTIMG_ARGS := --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
-TARGET_KERNEL_ARCH := arm64
-TARGET_KERNEL_SOURCE := kernel/huawei/kirin970
-TARGET_KERNEL_CONFIG := merge_kirin970_defconfig
-TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
+BOARD_KERNEL_IMAGE_NAME := Image
+TARGET_PREBUILT_KERNEL := /dev/null
# Properties
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
@@ -76,7 +67,6 @@ JAVA_SOURCE_OVERLAYS := \
# Partitions
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-BOARD_BOOTIMAGE_PARTITION_SIZE := 25165824
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3707764736
diff --git a/rootdir/etc/fstab.kirin970 b/rootdir/etc/fstab.kirin970
index 563596b..bd7adb9 100644
--- a/rootdir/etc/fstab.kirin970
+++ b/rootdir/etc/fstab.kirin970
@@ -2,7 +2,7 @@
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# The filesystem that contains the filesystem checker binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/block/bootdevice/by-name/kernel /boot emmc defaults recoveryonly
+/dev/null /boot emmc defaults recoveryonly
/dev/block/bootdevice/by-name/system / ext4 ro wait,avb
/dev/block/bootdevice/by-name/vendor /vendor ext4 ro wait,avb
/dev/block/bootdevice/by-name/product /product ext4 ro wait