From 1d952a254a6e7ec2f70f7112eb27355cfd01ba4d Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Sat, 26 Jun 2021 15:11:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AEqemu=E9=BB=98=E8=AE=A4?= =?UTF-8?q?userfs=E5=A4=A7=E5=B0=8F/=E4=BF=AE=E6=94=B9qemu=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 驱动目录位置不合理，需要调整到/device/qemu/drivers下面 close #I3XW96 #I3XWXD Change-Id: Ied6b90d2d0631c99f2209f5b72bbd12cdff6b1d5 Signed-off-by: Guangyao Ma --- drivers/mtd/multi_partition/Makefile | 2 +- kernel/common/Makefile | 2 +- kernel/common/los_rootfs.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/multi_partition/Makefile b/drivers/mtd/multi_partition/Makefile index 79000fdf..e3c6f639 100644 --- a/drivers/mtd/multi_partition/Makefile +++ b/drivers/mtd/multi_partition/Makefile @@ -39,7 +39,7 @@ LOCAL_INCLUDE := \ -I $(LITEOSTOPDIR)/../../device/hisilicon/drivers/include/mtd/common/include ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/arm_virt/config/cfiflash +LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash endif LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) diff --git a/kernel/common/Makefile b/kernel/common/Makefile index 958e4024..662f496e 100644 --- a/kernel/common/Makefile +++ b/kernel/common/Makefile @@ -37,7 +37,7 @@ LOCAL_INCLUDE := \ -I $(LITEOSTOPDIR)/kernel/common \ ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/arm_virt/config/cfiflash +LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash endif LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) diff --git a/kernel/common/los_rootfs.c b/kernel/common/los_rootfs.c index 22992753..a1e442fe 100644 --- a/kernel/common/los_rootfs.c +++ b/kernel/common/los_rootfs.c @@ -49,6 +49,7 @@ #include "cfiflash.h" #define DEV_STORAGE_PATH "/dev/cfiflash1" #define SECOND_MTD_PART_NUM 1 +#define STORAGE_SIZE 0x1400000 #endif #ifdef LOSCFG_STORAGE_SPINOR -- GitLab