Remove cache partition from db820c and use it as vendor partition on db410c

Remove cache partition usage. cache partition is deprecated in
AOSP, and we don't need it for Treble compatibility on db820c
going forward.

Also vendor partition is mandatory in AOSP now, even for
non-treble builds. So use cache partition on db410c as vendor
partition instead. Otherwise we run into following fsconfig
build failures:

---------->8----------
FAILED: out/target/product/db410c32_only/obj/ETC/fs_config_dirs_system_intermediates/fs_config_dirs_system
/bin/bash -c "build/make/tools/fs_config/fs_config_generator.py fsconfig --aid-header
system/core/include/private/android_filesystem_config.h --capability-header
bionic/libc/kernel/uapi/linux/capability.h --partition system --all-partitions --dirs --out_file
out/target/product/db410c32_only/obj/ETC/fs_config_dirs_system_intermediates/fs_config_dirs_system /dev/null"
usage: fs_config_generator.py fsconfig [-h] --aid-header AID_HEADER
                                       --capability-header CAPABILITY_HEADER
                                       --partition PARTITION
                                       [--all-partitions ALL_PARTITIONS]
                                       [--files] [--dirs] --out_file OUT_FILE
                                       fsconfig [fsconfig ...]
fs_config_generator.py fsconfig: error: argument --all-partitions: expected one argument
----------8<----------

Change-Id: I09806f103e6860d22f668d5194cb2f2573f12800
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

8 files changed, 10 insertions, 14 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 118ce06..cb67c8c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -35,7 +35,6 @@ TARGET_NO_RECOVERY := true
 
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE=ext4
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
 
 # Mesa DRM hwcomposer
diff --git a/db410c32_only/BoardConfig.mk b/db410c32_only/BoardConfig.mk
index 61e6a03..58db802 100644
--- a/db410c32_only/BoardConfig.mk
+++ b/db410c32_only/BoardConfig.mk
@@ -23,4 +23,6 @@ BOARD_KERNEL_CMDLINE := firmware_class.path=/system/vendor/firmware/ androidboot
 BOARD_KERNEL_CMDLINE += printk.devkmsg=on
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1288491008
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 5653544960
-BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+TARGET_COPY_OUT_VENDOR := vendor
+BOARD_VENDORIMAGE_PARTITION_SIZE := 69206016 #66M
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/db820c/BoardConfig.mk b/db820c/BoardConfig.mk
index 3738d52..b7232f2 100644
--- a/db820c/BoardConfig.mk
+++ b/db820c/BoardConfig.mk
@@ -14,7 +14,6 @@ BOARD_KERNEL_CMDLINE := firmware_class.path=/vendor/firmware/ androidboot.hardwa
 BOARD_KERNEL_CMDLINE += printk.devkmsg=on
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4294967296 #4G
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 12884901888 #12G
-BOARD_CACHEIMAGE_PARTITION_SIZE := 536870912 #512M
 TARGET_COPY_OUT_VENDOR := vendor
 BOARD_VENDORIMAGE_PARTITION_SIZE := 2147483648 #2G
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/factory-images/generate-factory-images-db410c32_only.sh b/factory-images/generate-factory-images-db410c32_only.sh
index 8feddbf..2c6dd10 100755
--- a/factory-images/generate-factory-images-db410c32_only.sh
+++ b/factory-images/generate-factory-images-db410c32_only.sh
@@ -50,11 +50,11 @@ cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/db410c/tz.mbn tmp/$PRODUCT-$VERSION/
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/db410c/emmc_appsboot.mbn tmp/$PRODUCT-$VERSION/
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/db410c/sbc_1.0_8016.bin tmp/$PRODUCT-$VERSION/
 
-# "fastboot update <zip>" is not flashing cache and userdata partitions
+# "fastboot update <zip>" is not flashing userdata partition
 # for some reason. So copy over AOSP images and flash them separately instead.
 cp $PRODUCT_OUT_DIR/boot.img tmp/$PRODUCT-$VERSION/
 cp $PRODUCT_OUT_DIR/system.img tmp/$PRODUCT-$VERSION/
-cp $PRODUCT_OUT_DIR/cache.img tmp/$PRODUCT-$VERSION/
+cp $PRODUCT_OUT_DIR/vendor.img tmp/$PRODUCT-$VERSION/
 cp $PRODUCT_OUT_DIR/userdata.img tmp/$PRODUCT-$VERSION/
 
 # Write flash-all.sh
@@ -107,12 +107,12 @@ fastboot erase sec
 
 fastboot reboot-bootloader
 
-# "fastboot update <zip>" is not flashing cache and userdata partitions
+# "fastboot update <zip>" is not flashing userdata partition
 # for some reason. So don't do "fastboot update" and use "fastboot flash"
 # instructions instead. #FIXME
 fastboot flash boot boot.img
 fastboot flash system system.img
-fastboot flash cache cache.img
+fastboot flash cache vendor.img
 fastboot flash userdata userdata.img
 
 fastboot reboot
diff --git a/factory-images/generate-factory-images-db820c.sh b/factory-images/generate-factory-images-db820c.sh
index fe24c6c..5f723ad 100755
--- a/factory-images/generate-factory-images-db820c.sh
+++ b/factory-images/generate-factory-images-db820c.sh
@@ -59,12 +59,11 @@ cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/db820c/cmnlib64.mbn tmp/$PRODUCT-$VE
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/db820c/cmnlib.mbn tmp/$PRODUCT-$VERSION/
 cp $ANDROID_BUILD_TOP/$DEVICE_DIR/installer/db820c/keymaster.mbn tmp/$PRODUCT-$VERSION/
 
-# "fastboot update <zip>" is not flashing cache and userdata partitions
+# "fastboot update <zip>" is not flashing userdata partition
 # for some reason. So copy over AOSP images and flash them separately instead.
 cp $PRODUCT_OUT_DIR/boot.img tmp/$PRODUCT-$VERSION/
 cp $PRODUCT_OUT_DIR/system.img tmp/$PRODUCT-$VERSION/
 cp $PRODUCT_OUT_DIR/vendor.img tmp/$PRODUCT-$VERSION/
-cp $PRODUCT_OUT_DIR/cache.img tmp/$PRODUCT-$VERSION/
 cp $PRODUCT_OUT_DIR/userdata.img tmp/$PRODUCT-$VERSION/
 
 # Write flash-all.sh
@@ -109,13 +108,12 @@ fastboot flash keymaster keymaster.mbn
 
 fastboot reboot-bootloader
 
-# "fastboot update <zip>" is not flashing cache and userdata partitions
+# "fastboot update <zip>" is not flashing userdata partition
 # for some reason. So don't do "fastboot update" and use "fastboot flash"
 # instructions instead. #FIXME
 fastboot flash boot boot.img
 fastboot flash system system.img
 fastboot flash vendor vendor.img
-fastboot flash cache cache.img
 fastboot flash userdata userdata.img
 
 fastboot reboot
diff --git a/fstab.common b/fstab.common
index 5ae2220..47f626e 100644
--- a/fstab.common
+++ b/fstab.common
@@ -2,7 +2,6 @@
 #<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
-LABEL=cache        /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 LABEL=data         /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 # Ext sdcard on db820c
 /devices/platform/soc/74a4900.sdhci/mmc_host/mmc*    auto    auto    defaults    voldmanaged=sdcard1:auto,encryptable=userdata
diff --git a/installer/db410c/flash-all-aosp.sh b/installer/db410c/flash-all-aosp.sh
index 3319612..a6f8f11 100755
--- a/installer/db410c/flash-all-aosp.sh
+++ b/installer/db410c/flash-all-aosp.sh
@@ -46,6 +46,6 @@ fastboot erase sec
 fastboot reboot-bootloader
 fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
 fastboot flash system "${ANDROID_PRODUCT_OUT}"/system.img
-fastboot flash cache "${ANDROID_PRODUCT_OUT}"/cache.img
+fastboot flash cache "${ANDROID_PRODUCT_OUT}"/vendor.img
 fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
 fastboot reboot
diff --git a/installer/db820c/flash-all-aosp.sh b/installer/db820c/flash-all-aosp.sh
index cdf0dce..6fe6e7d 100755
--- a/installer/db820c/flash-all-aosp.sh
+++ b/installer/db820c/flash-all-aosp.sh
@@ -42,6 +42,5 @@ fastboot reboot-bootloader
 fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
 fastboot flash system "${ANDROID_PRODUCT_OUT}"/system.img
 fastboot flash vendor "${ANDROID_PRODUCT_OUT}"/vendor.img
-fastboot flash cache "${ANDROID_PRODUCT_OUT}"/cache.img
 fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
 fastboot reboot