Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
cbd03bd7
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
大约 1 年 前同步成功
通知
452
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
cbd03bd7
编写于
10月 26, 2022
作者:
O
openharmony_ci
提交者:
Gitee
10月 26, 2022
浏览文件
操作
浏览文件
下载
差异文件
!913 删除PLATFORM_QEMU_ARM_VIRT_CA7侵入内核的所有代码
Merge pull request !913 from laokz/jffs2fat
上级
e7daa282
059c1c22
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
3 addition
and
68 deletion
+3
-68
Makefile
Makefile
+0
-3
drivers/mtd/multi_partition/BUILD.gn
drivers/mtd/multi_partition/BUILD.gn
+0
-4
drivers/mtd/multi_partition/Makefile
drivers/mtd/multi_partition/Makefile
+0
-4
drivers/mtd/multi_partition/src/mtd_partition.c
drivers/mtd/multi_partition/src/mtd_partition.c
+0
-16
fs/rootfs/Makefile
fs/rootfs/Makefile
+0
-4
fs/rootfs/los_bootargs.c
fs/rootfs/los_bootargs.c
+1
-18
fs/rootfs/los_rootfs.c
fs/rootfs/los_rootfs.c
+2
-13
fs/rootfs/los_rootfs.h
fs/rootfs/los_rootfs.h
+0
-6
未找到文件。
Makefile
浏览文件 @
cbd03bd7
...
...
@@ -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
...
...
drivers/mtd/multi_partition/BUILD.gn
浏览文件 @
cbd03bd7
...
...
@@ -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
浏览文件 @
cbd03bd7
...
...
@@ -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
浏览文件 @
cbd03bd7
...
...
@@ -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
;
}
...
...
fs/rootfs/Makefile
浏览文件 @
cbd03bd7
...
...
@@ -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)
...
...
fs/rootfs/los_bootargs.c
浏览文件 @
cbd03bd7
...
...
@@ -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
);
...
...
fs/rootfs/los_rootfs.c
浏览文件 @
cbd03bd7
...
...
@@ -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
;
...
...
fs/rootfs/los_rootfs.h
浏览文件 @
cbd03bd7
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录