diff --git a/Makefile b/Makefile index 84a46b47..a28c48e0 100644 --- a/Makefile +++ b/Makefile @@ -82,9 +82,6 @@ endif ifeq ($(LOSCFG_STORAGE_SPINAND), y) FSTYPE = yaffs2 endif -ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -FSTYPE = jffs2 -endif ROOTFS_DIR = $(OUT)/rootfs ROOTFS_ZIP = $(OUT)/rootfs.zip diff --git a/drivers/mtd/multi_partition/BUILD.gn b/drivers/mtd/multi_partition/BUILD.gn index 5278330a..f54c2424 100644 --- a/drivers/mtd/multi_partition/BUILD.gn +++ b/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" ] } diff --git a/drivers/mtd/multi_partition/Makefile b/drivers/mtd/multi_partition/Makefile index 76f8973f..46b5d78d 100644 --- a/drivers/mtd/multi_partition/Makefile +++ b/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) diff --git a/drivers/mtd/multi_partition/src/mtd_partition.c b/drivers/mtd/multi_partition/src/mtd_partition.c index e5414618..034bc551 100644 --- a/drivers/mtd/multi_partition/src/mtd_partition.c +++ b/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; } diff --git a/fs/rootfs/Makefile b/fs/rootfs/Makefile index a5e8213c..6c250fae 100644 --- a/fs/rootfs/Makefile +++ b/fs/rootfs/Makefile @@ -33,10 +33,6 @@ MODULE_NAME := rootfs LOCAL_SRCS := $(wildcard los_rootfs.c los_bootargs.c) -ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash -endif - LOCAL_FLAGS := $(LOCAL_INCLUDE) include $(MODULE) diff --git a/fs/rootfs/los_bootargs.c b/fs/rootfs/los_bootargs.c index c6e2a680..e1c30bdb 100644 --- a/fs/rootfs/los_bootargs.c +++ b/fs/rootfs/los_bootargs.c @@ -32,14 +32,10 @@ #include "los_base.h" #include "string.h" -#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) +#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) #include "mtd_list.h" #endif -#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 -#include "cfiflash.h" -#endif - #ifdef LOSCFG_STORAGE_EMMC #include "disk.h" #endif @@ -98,19 +94,6 @@ INT32 LOS_GetCmdLine(VOID) } #endif -#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 - struct MtdDev *mtd = GetCfiMtdDev(); - if (mtd == NULL) { - PRINT_ERR("Get CFI mtd failed!\n"); - goto ERROUT; - } - g_alignSize = mtd->eraseSize; - ret = mtd->read(mtd, CFIFLASH_BOOTARGS_ADDR, COMMAND_LINE_SIZE, g_cmdLine); - if (ret == COMMAND_LINE_SIZE) { - return LOS_OK; - } -#endif - PRINT_ERR("Read cmdline error!\n"); ERROUT: free(g_cmdLine); diff --git a/fs/rootfs/los_rootfs.c b/fs/rootfs/los_rootfs.c index a81c0163..81e809d2 100644 --- a/fs/rootfs/los_rootfs.c +++ b/fs/rootfs/los_rootfs.c @@ -37,15 +37,11 @@ #include "sys/stat.h" #include "sys/types.h" -#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) +#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) #include "mtd_list.h" #include "mtd_partition.h" #endif -#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 -#include "cfiflash.h" -#endif - #ifdef LOSCFG_STORAGE_EMMC #include "disk.h" #include "ff.h" @@ -128,14 +124,7 @@ STATIC INT32 AddEmmcParts(INT32 rootAddr, INT32 rootSize, INT32 userAddr, INT32 STATIC INT32 AddPartitions(CHAR *dev, UINT64 rootAddr, UINT64 rootSize, UINT64 userAddr, UINT64 userSize) { -#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 - if ((strcmp(dev, "cfi-flash") == 0) && (rootAddr != CFIFLASH_ROOT_ADDR)) { - PRINT_ERR("Error rootAddr, must be %#0x!\n", CFIFLASH_ROOT_ADDR); - return LOS_NOK; - } -#endif - -#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) +#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) INT32 ret; INT32 blk0 = 0; INT32 blk2 = 2; diff --git a/fs/rootfs/los_rootfs.h b/fs/rootfs/los_rootfs.h index f56ee340..826e437c 100644 --- a/fs/rootfs/los_rootfs.h +++ b/fs/rootfs/los_rootfs.h @@ -59,12 +59,6 @@ #define ROOTFS_ADDR 0x600000 #define ROOTFS_SIZE 0x800000 #define USERFS_SIZE 0x80000 -#elif defined (LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) -#define ROOT_DEV_NAME "/dev/cfiflash0" -#define USER_DEV_NAME "/dev/cfiflash2" -#define ROOTFS_ADDR CFIFLASH_ROOT_ADDR -#define ROOTFS_SIZE 0x1B00000 -#define USERFS_SIZE (CFIFLASH_CAPACITY - ROOTFS_ADDR - ROOTFS_SIZE) #elif defined (LOSCFG_STORAGE_EMMC) #define ROOT_DEV_NAME "/dev/mmcblk0p0" #ifdef LOSCFG_PLATFORM_PATCHFS