summaryrefslogtreecommitdiff
authoryang.xu <yang.xu@amlogic.com>2018-03-06 10:54:39 (GMT)
committer yang.xu <yang.xu@amlogic.com>2018-03-06 10:54:39 (GMT)
commita6c1cdf65370e502995522e137b1a3af59ae7928 (patch)
treec3401ede2a07ef8f8b5851882d2e35d9a4d93c4b
parent1d2215b14738fbd5b62af155b1c3eafb2da8323f (diff)
downloadampere-a6c1cdf65370e502995522e137b1a3af59ae7928.zip
ampere-a6c1cdf65370e502995522e137b1a3af59ae7928.tar.gz
ampere-a6c1cdf65370e502995522e137b1a3af59ae7928.tar.bz2
device_amlogic: delete code for supporting 3.14 kernel
PD# 161250 delete code for supporting 3.14 kernel Change-Id: I8a7436a13f6de85980c37b9bd5c13de09082bcb1
Diffstat
-rw-r--r--BoardConfig.mk4
-rw-r--r--ampere.mk20
-rw-r--r--fstab.3.14.amlogic17
3 files changed, 1 insertions, 40 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c1cbe05..40596cd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -67,7 +67,6 @@ 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
@@ -77,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/ampere.mk b/ampere.mk
index f19d62b..5f65637 100644
--- a/ampere.mk
+++ b/ampere.mk
@@ -51,8 +51,6 @@ TARGET_KERNEL_BUILT_FROM_SOURCE := false
PRODUCT_TYPE := mbox
-#BOARD_OLD_PARTITION := true
-
WITH_LIBPLAYER_MODULE := false
OTA_UP_PART_NUM_CHANGED := true
@@ -66,26 +64,16 @@ BOARD_WIDEVINE_TA_PATH := vendor/amlogic/
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_mbox_old.dtsi
-endif
-
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
endif
@@ -143,7 +131,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)
@@ -181,11 +168,6 @@ PRODUCT_COPY_FILES += \
endif
endif
endif
-endif
-ifeq ($(BOARD_OLD_PARTITION),true)
-PRODUCT_COPY_FILES += \
- device/amlogic/ampere/fstab.3.14.amlogic:root/fstab.amlogic
-endif
#########################################################################
#
diff --git a/fstab.3.14.amlogic b/fstab.3.14.amlogic
deleted file mode 100644
index 89c7c64..0000000
--- a/fstab.3.14.amlogic
+++ b/dev/null
@@ -1,17 +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/misc /misc emmc defaults defaults
-/dev/block/system /system ext4 ro wait
-/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,formattable
-/dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
-/devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk1:auto
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr* auto vfat defaults voldmanaged=sr0:auto
-/dev/block/loop auto loop defaults voldmanaged=loop:auto
-# Add for zram. zramsize can be in numeric (byte) , in percent
-/dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000
-/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable \ No newline at end of file