diff options
| author | Alistair Strachan <astrachan@google.com> | 2019-01-14 09:03:22 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-14 09:03:28 -0800 |
| commit | 770814998fa311785e055044e015dd4a4ef3f1b5 (patch) | |
| tree | fab5976b902e0721a23ae8fd5b963293530626f7 /hikey | |
| parent | d2e9b81df0fea6a95d910705ad2ff56179e2ce19 (diff) | |
| download | hikey-770814998fa311785e055044e015dd4a4ef3f1b5.tar.gz | |
hikey: Drop support for 3.18 kernel
There are no more kernel binaries for this kernel so it does not make
sense to handle TARGET_KERNEL_USE=3.18. Remove the code, and custom
fstab.
Change-Id: I15dd43d4e5fb4acfcc15a256d1a5555f57cbc1f6
Signed-off-by: Alistair Strachan <astrachan@google.com>
Diffstat (limited to 'hikey')
| -rw-r--r-- | hikey/BoardConfig.mk | 6 | ||||
| -rw-r--r-- | hikey/fstab.hikey-3.18 | 12 |
2 files changed, 1 insertions, 17 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index 90bbc6c7..13eed48f 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -6,16 +6,12 @@ TARGET_BOARD_PLATFORM := hikey TARGET_CPU_VARIANT := cortex-a53 TARGET_2ND_CPU_VARIANT := cortex-a53 -ifeq ($(TARGET_KERNEL_USE), 3.18) -BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime -else ifeq ($(TARGET_KERNEL_USE), 4.19) BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime else # FIQ debugger is deprecated and we'll remoeve this once kernel support in prebuilts are yanked BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime endif -endif ifneq ($(TARGET_ANDROID_VERITY),) # Enable dtb fstab for treble, with verity and system-as-root @@ -34,7 +30,7 @@ BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSO endif ## printk.devkmsg only has meaning for kernel 4.9 and later -## it would be ignored by kernel 3.18 and kernel 4.4 +## it would be ignored by kernel 4.4 BOARD_KERNEL_CMDLINE += printk.devkmsg=on TARGET_NO_DTIMAGE := true diff --git a/hikey/fstab.hikey-3.18 b/hikey/fstab.hikey-3.18 deleted file mode 100644 index 84fad078..00000000 --- a/hikey/fstab.hikey-3.18 +++ /dev/null @@ -1,12 +0,0 @@ -# Android fstab file. -#<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/platform/f723d000.dwmmc0/by-name/system /system ext4 ro wait -#/dev/block/platform/f723d000.dwmmc0/by-name/system /system squashfs ro wait -#/dev/block/platform/f723d000.dwmmc0/by-name/vendor /vendor ext4 ro wait -/dev/block/platform/f723d000.dwmmc0/by-name/userdata /data f2fs discard,noatime,nosuid,nodev wait,check,fileencryption=software,quota -/dev/block/platform/f723d000.dwmmc0/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable -/devices/platform/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata -/devices/platform/f72c0000.usb/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata |