!374 设置qemu默认userfs大小/修改qemu驱动目录

Merge pull request !374 from MGY917/qemu_opti

!374 设置qemu默认userfs大小/修改qemu驱动目录
Merge pull request !374 from MGY917/qemu_opti
eb1900d4 · openharmony_ci · Gitee · 3cddcb9f · 1d952a25 · eb1900d4
Showing with 3 addition and 2 deletion

drivers/mtd/multi_partition/Makefile drivers/mtd/multi_partition/Makefile +1 -1

kernel/common/Makefile kernel/common/Makefile +1 -1

kernel/common/los_rootfs.c kernel/common/los_rootfs.c +1 -0

未找到文件。
--- 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)

--- 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)

--- 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