device: do not use BOARD_KERNEL_VERSION in o-amlogic [1/1]

PD# NONE

we just have one kernel dir now
use BOARD_OLD_PARTITION for 3.14 partition table

Change-Id: Ic3da70f9b0538100b7ddbd01c191e97e72f971ba

11 files changed, 13 insertions, 128 deletions

diff --git a/common/core_amlogic.mk b/common/core_amlogic.mk
index 0f53ccd..ea4dae1 100644
--- a/common/core_amlogic.mk
+++ b/common/core_amlogic.mk
@@ -390,12 +390,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.vndk.version=26
 
-# VTS can only be run for Treble enabled devices
-# if kernel version is 3.14 this property is false by default
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.treble.enabled=true
-endif
 
 PRODUCT_PACKAGES += \
     libxml2
diff --git a/common/factory.mk b/common/factory.mk
index b48d7ab..da386f2 100644
--- a/common/factory.mk
+++ b/common/factory.mk
@@ -14,7 +14,7 @@ endif#ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 
 BUILT_IMAGES += system.img userdata.img cache.img
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
+ifneq ($(BOARD_OLD_PARTITION),true)
 BUILT_IMAGES += vendor.img odm.img
 endif
 
@@ -39,15 +39,6 @@ ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 
 $(INSTALLED_BOARDDTB_TARGET) : $(KERNEL_DEVICETREE_SRC) $(INSTALLED_KERNEL_TARGET)
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
-	$(foreach aDts, $(KERNEL_DEVICETREE), \
-		if [ -f "$(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(aDts).dtd" ]; then \
-			$(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(strip $(aDts)).dtd; \
-		fi;\
-		$(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(strip $(aDts)).dtb; \
-	)
-endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
 ifeq ($(AB_OTA_UPDATER),true)
 	$(foreach aDts, $(KERNEL_DEVICETREE), \
 		sed -i 's/^#include \"partition_.*/#include \"$(TARGET_PARTITION_DTSI)\"/' $(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(strip $(aDts)).dts; \
@@ -65,7 +56,6 @@ else
 		$(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(strip $(aDts)).dtb; \
 	)
 endif
-endif
 ifneq ($(strip $(word 2, $(KERNEL_DEVICETREE)) ),)
 	$(hide) $(DTBTOOL) -o $@ -p $(KERNEL_OUT)/scripts/dtc/ $(KERNEL_OUT)/$(KERNEL_DEVICETREE_DIR)
 else# elif dts num == 1
@@ -110,11 +100,10 @@ endif # ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 PACKAGE_CONFIG_FILE := $(TARGET_DEVICE_DIR)/upgrade/$(PACKAGE_CONFIG_FILE).conf
 
 ifeq ($(wildcard $(PACKAGE_CONFIG_FILE)),)
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
-	PACKAGE_CONFIG_FILE := $(PRODUCT_COMMON_DIR)/upgrade_4.9/$(notdir $(PACKAGE_CONFIG_FILE))
-endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
+ifeq ($(BOARD_OLD_PARTITION),true)
 	PACKAGE_CONFIG_FILE := $(PRODUCT_COMMON_DIR)/upgrade_3.14/$(notdir $(PACKAGE_CONFIG_FILE))
+else
+	PACKAGE_CONFIG_FILE := $(PRODUCT_COMMON_DIR)/upgrade_4.9/$(notdir $(PACKAGE_CONFIG_FILE))
 endif
 endif ## ifeq ($(wildcard $(TARGET_DEVICE_DIR)/upgrade/$(PACKAGE_CONFIG_FILE)))
 UPGRADE_FILES += $(PACKAGE_CONFIG_FILE)
diff --git a/p212/BoardConfig.mk b/p212/BoardConfig.mk
index b577a27..fe08d82 100644
--- a/p212/BoardConfig.mk
+++ b/p212/BoardConfig.mk
@@ -67,7 +67,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 4096
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
+ifneq ($(BOARD_OLD_PARTITION),true)
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456
 BOARD_USES_VENDORIMAGE := true
diff --git a/p212/Kernel.mk b/p212/Kernel.mk
index 450f76f..2f905bc 100644
--- a/p212/Kernel.mk
+++ b/p212/Kernel.mk
@@ -35,7 +35,6 @@ INTERMEDIATES_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image.gz
 TARGET_AMLOGIC_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/uImage
 TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image_recovery
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/media_clock.ko \
@@ -58,19 +57,11 @@ BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/vh265.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/vmpeg12.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/vreal.ko
-endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
-BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/dhd.ko
-endif
+
 
 WIFI_OUT  := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 PREFIX_CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
-endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
-PREFIX_CROSS_COMPILE=aarch64-linux-gnu-
-endif
 
 KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor
 
@@ -93,9 +84,7 @@ $(KERNEL_CONFIG): $(KERNEL_OUT)
 
 BOARD_MKBOOTIMG_ARGS := --second $(PRODUCT_OUT)/dtb.img
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 BOARD_MKBOOTIMG_ARGS += --cmdline "otg_device=1"
-endif
 
 $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TARGET)
 	@echo "make Image"
@@ -106,7 +95,7 @@ $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TAR
 	$(MAKE) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) -f device/amlogic/common/wifi_driver.mk $(WIFI_MODULE)
 	$(cp-modules)
 	$(media-modules)
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
+ifeq ($(BOARD_OLD_PARTITION),true)
 	cp $(KERNEL_OUT)/net/wireless/cfg80211.ko $(KERNEL_KO_OUT)/
 	mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
 	cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
diff --git a/p212/device.mk b/p212/device.mk
index 0775a21..1ba07d9 100644
--- a/p212/device.mk
+++ b/p212/device.mk
@@ -17,7 +17,7 @@
 ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
 PRODUCT_COPY_FILES += \
     device/amlogic/common/products/mbox/init.amlogic.rc:root/init.amlogic.rc \
-    device/amlogic/p212/init.amlogic.usb.$(BOARD_KERNEL_VERSION).rc:root/init.amlogic.usb.rc \
+    device/amlogic/p212/init.amlogic.usb.rc:root/init.amlogic.usb.rc \
     device/amlogic/common/products/mbox/ueventd.amlogic.rc:root/ueventd.amlogic.rc \
     device/amlogic/p212/init.amlogic.board.rc:root/init.amlogic.board.rc
 else
diff --git a/p212/init.amlogic.usb.3.14.rc b/p212/init.amlogic.usb.3.14.rc
deleted file mode 100644
index 50ace6a..0000000
--- a/p212/init.amlogic.usb.3.14.rc
+++ b/dev/null
@@ -1,73 +0,0 @@
-on boot
-    insmod /vendor/lib/modules/dwc3.ko
-    insmod /vendor/lib/modules/dwc_otg.ko otg_device=1
-    mkdir /sys/kernel/config/usb_gadget/ffs 0770 shell shell
-    mkdir /sys/kernel/config/usb_gadget/ffs/functions/ffs.adb 0770 shell shell
-
-    mkdir /dev/usb-ffs 0770 shell shell
-    mkdir /dev/usb-ffs/adb 0770 shell shell
-    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
-    write /sys/class/android_usb/android0/f_ffs/aliases adb
-    setprop sys.usb.config ${sys.usb.state}
-    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
-    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
-    write /sys/class/android_usb/android0/f_mass_storage/vendor_string ${ro.usb.vendor.string}
-    write /sys/class/android_usb/android0/f_mass_storage/product_string ${ro.usb.product.string}
-
-on property:sys.usb.config=mass_storage
-    stop adbd
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 18d1
-    write /sys/class/android_usb/android0/idProduct 4e21
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mass_storage,adb
-    stop adbd
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 18d1
-    write /sys/class/android_usb/android0/idProduct 4e22
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mtp
-    stop adbd
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 18d1
-    write /sys/class/android_usb/android0/idProduct 4e41
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mtp,adb
-    stop adbd
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 18d1
-    write /sys/class/android_usb/android0/idProduct 4e12
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=ptp
-    stop adbd
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 18d1
-    write /sys/class/android_usb/android0/idProduct 4e43
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=ptp,adb
-    stop adbd
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 18d1
-    write /sys/class/android_usb/android0/idProduct 4e44
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
diff --git a/p212/init.amlogic.usb.4.9.rc b/p212/init.amlogic.usb.rc
index cbeec87..cbeec87 100644
--- a/p212/init.amlogic.usb.4.9.rc
+++ b/p212/init.amlogic.usb.rc
diff --git a/p212/p212.mk b/p212/p212.mk
index 7570a7e..e808929 100644
--- a/p212/p212.mk
+++ b/p212/p212.mk
@@ -53,8 +53,7 @@ PRODUCT_MANUFACTURER := Amlogic
 
 PRODUCT_TYPE := mbox
 
-#BOARD_KERNEL_VERSION can be 4.9 or 3.14
-BOARD_KERNEL_VERSION := 4.9
+#BOARD_OLD_PARTITION := true
 
 WITH_LIBPLAYER_MODULE := false
 
@@ -128,7 +127,7 @@ PRODUCT_PACKAGES += \
 	fs_mgr \
 	slideshow
 endif
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
+ifneq ($(BOARD_OLD_PARTITION),true)
 ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
 ifeq ($(AB_OTA_UPDATER),true)
 ifeq ($(BUILD_WITH_DM_VERITY), true)
@@ -167,7 +166,7 @@ endif
 endif
 endif
 endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
+ifeq ($(BOARD_OLD_PARTITION),true)
 PRODUCT_COPY_FILES += \
     device/amlogic/p212/fstab.3.14.amlogic:root/fstab.amlogic
 endif
diff --git a/p230/BoardConfig.mk b/p230/BoardConfig.mk
index affceb3..bdde261 100644
--- a/p230/BoardConfig.mk
+++ b/p230/BoardConfig.mk
@@ -68,7 +68,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 4096
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
+ifneq ($(BOARD_OLD_PARTITION),true)
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456
 BOARD_USES_VENDORIMAGE := true
diff --git a/p230/Kernel.mk b/p230/Kernel.mk
index 4692260..0ccb0c9 100644
--- a/p230/Kernel.mk
+++ b/p230/Kernel.mk
@@ -30,7 +30,6 @@ INTERMEDIATES_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image.gz
 TARGET_AMLOGIC_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/uImage
 TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image_recovery
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/media_clock.ko \
@@ -53,19 +52,10 @@ BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/vh265.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/vmpeg12.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/vreal.ko
-endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
-BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/dhd.ko
-endif
 
 WIFI_OUT  := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 PREFIX_CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
-endif
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
-PREFIX_CROSS_COMPILE=aarch64-linux-gnu-
-endif
 
 KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor
 
@@ -88,9 +78,7 @@ $(KERNEL_CONFIG): $(KERNEL_OUT)
 
 BOARD_MKBOOTIMG_ARGS := --second $(PRODUCT_OUT)/dtb.img
 
-ifeq ($(BOARD_KERNEL_VERSION),4.9)
 BOARD_MKBOOTIMG_ARGS += --cmdline "otg_device=1"
-endif
 
 $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TARGET)
 	@echo "make Image"
@@ -101,7 +89,7 @@ $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TAR
 	$(MAKE) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) -f device/amlogic/common/wifi_driver.mk $(WIFI_MODULE)
 	$(cp-modules)
 	$(media-modules)
-ifeq ($(BOARD_KERNEL_VERSION),3.14)
+ifeq ($(BOARD_OLD_PARTITION),true)
 	cp $(KERNEL_OUT)/net/wireless/cfg80211.ko $(KERNEL_KO_OUT)/
 	mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
 	cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
diff --git a/p230/p230.mk b/p230/p230.mk
index 3f63932..fbb37cb 100644
--- a/p230/p230.mk
+++ b/p230/p230.mk
@@ -51,9 +51,6 @@ PRODUCT_MANUFACTURER := Amlogic
 
 PRODUCT_TYPE := mbox
 
-#BOARD_KERNEL_VERSION can be 4.9 or 3.14
-BOARD_KERNEL_VERSION := 4.9
-
 WITH_LIBPLAYER_MODULE := false
 
 OTA_UP_PART_NUM_CHANGED := true