From 1fb6b63680fa68a237f3afb2eff4deaabda9e52b Mon Sep 17 00:00:00 2001 From: yang.xu Date: Tue, 06 Mar 2018 11:05:23 +0000 Subject: device_amlogic: delete code for supporting 3.14 kernel PD# 161250 delete code for supporting 3.14 kernel Change-Id: I9603caa7aea46b79715e7c27c6a2307ccce31218 --- diff --git a/BoardConfig.mk b/BoardConfig.mk index 6e11d3f..2743f46 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -67,8 +67,6 @@ TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1946157056 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_FLASH_BLOCK_SIZE := 4096 - -ifneq ($(BOARD_OLD_PARTITION),true) BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_VENDORIMAGE := true @@ -78,9 +76,6 @@ BOARD_ROOT_EXTRA_FOLDERS := odm BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_ODMIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_ODMIMAGE := true -else -GPU_MODS_OUT?=system/vendor/lib -endif TARGET_SUPPORT_USB_BURNING_V2 := true diff --git a/einstein.mk b/einstein.mk index 656dabb..556ce6c 100644 --- a/einstein.mk +++ b/einstein.mk @@ -52,8 +52,6 @@ TARGET_KERNEL_BUILT_FROM_SOURCE := false PRODUCT_TYPE := tv -#BOARD_OLD_PARTITION := true - WITH_LIBPLAYER_MODULE := false BOARD_AML_VENDOR_PATH := vendor/amlogic/ampere/ @@ -66,25 +64,16 @@ OTA_UP_PART_NUM_CHANGED := true ifeq ($(AB_OTA_UPDATER),true) AB_OTA_PARTITIONS := \ boot \ - system - -ifneq ($(BOARD_OLD_PARTITION),true) -AB_OTA_PARTITIONS += \ + system \ vendor \ odm -endif TARGET_BOOTLOADER_CONTROL_BLOCK := true TARGET_NO_RECOVERY := true TARGET_PARTITION_DTSI := partition_mbox_ab.dtsi else TARGET_NO_RECOVERY := false - -ifneq ($(BOARD_OLD_PARTITION),true) TARGET_PARTITION_DTSI := partition_mbox_normal.dtsi -else -TARGET_PARTITION_DTSI := partition_tv_old.dtsi -endif BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -150,7 +139,6 @@ PRODUCT_PACKAGES += \ fs_mgr \ slideshow endif -ifneq ($(BOARD_OLD_PARTITION),true) ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) ifeq ($(AB_OTA_UPDATER),true) ifeq ($(BUILD_WITH_DM_VERITY), true) @@ -188,11 +176,6 @@ PRODUCT_COPY_FILES += \ endif endif endif -endif -ifeq ($(BOARD_OLD_PARTITION),true) -PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.3.14.amlogic:root/fstab.amlogic -endif ######################################################################### # -- cgit