fix(PLATFORM_QEMU_ARM_VIRT_CA7): remove all invasive code

arm-virt emulation rootfs change to vfat from jffs2,
root device change to eMMC from CFI flash

Signed-off-by: laokz <laokz@foxmail.com>
Change-Id: If284809b989918cf10f5d32803df42c8c57830b2

drivers/mtd/multi_partition/BUILD.gn

@@ -39,10 +39,6 @@ kernel_module(module_name) {
 
   include_dirs = [ "$LITEOSTOPDIR/fs/jffs2/include" ]
 
-  if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) {
-    include_dirs += [ "//device/qemu/drivers/cfiflash" ]
-  }
-
   public_configs = [ ":public" ]
 }
 

drivers/mtd/multi_partition/Makefile

@@ -36,10 +36,6 @@ LOCAL_SRCS :=  $(wildcard src/*.c)
 LOCAL_INCLUDE := \
     -I $(LITEOSTOPDIR)/fs/jffs2/include
 
-ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
-LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
-endif
-
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

drivers/mtd/multi_partition/src/mtd_partition.c

@@ -39,11 +39,6 @@
 #include "fs/driver.h"
 #include "mtd/mtd_legacy_lite.h"
 
-#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
-#include "cfiflash.h"
-#endif
-
-
 #define DRIVER_NAME_ADD_SIZE    3
 pthread_mutex_t g_mtdPartitionLock = PTHREAD_MUTEX_INITIALIZER;
 
@@ -134,17 +129,10 @@ static VOID MtdNorParamAssign(partition_param *spinorParam, const struct MtdDev
      * you can change the SPIBLK_NAME or SPICHR_NAME to NULL.
      */
     spinorParam->flash_mtd = (struct MtdDev *)spinorMtd;
-#ifndef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
     spinorParam->flash_ops = GetDevSpinorOps();
     spinorParam->char_ops = GetMtdCharFops();
     spinorParam->blockname = SPIBLK_NAME;
     spinorParam->charname = SPICHR_NAME;
-#else
-    spinorParam->flash_ops = GetCfiBlkOps();
-    spinorParam->char_ops = NULL;
-    spinorParam->blockname = CFI_DRIVER;
-    spinorParam->charname = NULL;
-#endif
     spinorParam->partition_head = g_spinorPartitionHead;
     spinorParam->block_size = spinorMtd->eraseSize;
 }
@@ -158,11 +146,7 @@ static VOID MtdDeinitSpinorParam(VOID)
 
 static partition_param *MtdInitSpinorParam(partition_param *spinorParam)
 {
-#ifndef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
     struct MtdDev *spinorMtd = GetMtd("spinor");
-#else
-    struct MtdDev *spinorMtd = GetCfiMtdDev();
-#endif
     if (spinorMtd == NULL) {
         return NULL;
     }