Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
8235703e
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8235703e
编写于
6月 01, 2013
作者:
V
Vineet Gupta
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ARC: Use kconfig helper IS_ENABLED() to get rid of defines.h
Signed-off-by:
N
Vineet Gupta
<
vgupta@synopsys.com
>
上级
ba5afadb
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
23 addition
and
68 deletion
+23
-68
arch/arc/Makefile
arch/arc/Makefile
+1
-3
arch/arc/include/asm/cache.h
arch/arc/include/asm/cache.h
+2
-0
arch/arc/include/asm/defines.h
arch/arc/include/asm/defines.h
+0
-56
arch/arc/include/asm/mmu.h
arch/arc/include/asm/mmu.h
+8
-0
arch/arc/include/asm/tlb-mmu1.h
arch/arc/include/asm/tlb-mmu1.h
+3
-2
arch/arc/kernel/setup.c
arch/arc/kernel/setup.c
+4
-4
arch/arc/mm/cache_arc700.c
arch/arc/mm/cache_arc700.c
+4
-2
arch/arc/mm/tlb.c
arch/arc/mm/tlb.c
+1
-1
未找到文件。
arch/arc/Makefile
浏览文件 @
8235703e
...
...
@@ -16,13 +16,11 @@ KBUILD_DEFCONFIG := fpga_defconfig
cflags-y
+=
-mA7
-fno-common
-pipe
-fno-builtin
-D__linux__
LINUXINCLUDE
+=
-include
${src}
/arch/arc/include/asm/defines.h
ifdef
CONFIG_ARC_CURR_IN_REG
# For a global register defintion, make sure it gets passed to every file
# We had a customer reported bug where some code built in kernel was NOT using
# any kernel headers, and missing the r25 global register
# Can't do unconditionally
(like above)
because of recursive include issues
# Can't do unconditionally because of recursive include issues
# due to <linux/thread_info.h>
LINUXINCLUDE
+=
-include
${src}
/arch/arc/include/asm/current.h
endif
...
...
arch/arc/include/asm/cache.h
浏览文件 @
8235703e
...
...
@@ -9,6 +9,8 @@
#ifndef __ARC_ASM_CACHE_H
#define __ARC_ASM_CACHE_H
#include <asm/mmu.h>
/* some of cache registers depend on MMU ver */
/* In case $$ not config, setup a dummy number for rest of kernel */
#ifndef CONFIG_ARC_CACHE_LINE_SHIFT
#define L1_CACHE_SHIFT 6
...
...
arch/arc/include/asm/defines.h
已删除
100644 → 0
浏览文件 @
ba5afadb
/*
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __ARC_ASM_DEFINES_H__
#define __ARC_ASM_DEFINES_H__
#if defined(CONFIG_ARC_MMU_V1)
#define CONFIG_ARC_MMU_VER 1
#elif defined(CONFIG_ARC_MMU_V2)
#define CONFIG_ARC_MMU_VER 2
#elif defined(CONFIG_ARC_MMU_V3)
#define CONFIG_ARC_MMU_VER 3
#endif
#ifdef CONFIG_ARC_HAS_LLSC
#define __CONFIG_ARC_HAS_LLSC_VAL 1
#else
#define __CONFIG_ARC_HAS_LLSC_VAL 0
#endif
#ifdef CONFIG_ARC_HAS_SWAPE
#define __CONFIG_ARC_HAS_SWAPE_VAL 1
#else
#define __CONFIG_ARC_HAS_SWAPE_VAL 0
#endif
#ifdef CONFIG_ARC_HAS_RTSC
#define __CONFIG_ARC_HAS_RTSC_VAL 1
#else
#define __CONFIG_ARC_HAS_RTSC_VAL 0
#endif
#ifdef CONFIG_ARC_MMU_SASID
#define __CONFIG_ARC_MMU_SASID_VAL 1
#else
#define __CONFIG_ARC_MMU_SASID_VAL 0
#endif
#ifdef CONFIG_ARC_HAS_ICACHE
#define __CONFIG_ARC_HAS_ICACHE 1
#else
#define __CONFIG_ARC_HAS_ICACHE 0
#endif
#ifdef CONFIG_ARC_HAS_DCACHE
#define __CONFIG_ARC_HAS_DCACHE 1
#else
#define __CONFIG_ARC_HAS_DCACHE 0
#endif
#endif
/* __ARC_ASM_DEFINES_H__ */
arch/arc/include/asm/mmu.h
浏览文件 @
8235703e
...
...
@@ -9,6 +9,14 @@
#ifndef _ASM_ARC_MMU_H
#define _ASM_ARC_MMU_H
#if defined(CONFIG_ARC_MMU_V1)
#define CONFIG_ARC_MMU_VER 1
#elif defined(CONFIG_ARC_MMU_V2)
#define CONFIG_ARC_MMU_VER 2
#elif defined(CONFIG_ARC_MMU_V3)
#define CONFIG_ARC_MMU_VER 3
#endif
#ifndef __ASSEMBLY__
typedef
struct
{
...
...
arch/arc/include/asm/tlb-mmu1.h
浏览文件 @
8235703e
...
...
@@ -9,10 +9,11 @@
#ifndef __ASM_TLB_MMU_V1_H__
#define __ASM_TLB_MMU_V1_H__
#if defined(__ASSEMBLY__) && defined(CONFIG_ARC_MMU_VER == 1)
#include <asm/mmu.h>
#include <asm/tlb.h>
#if defined(__ASSEMBLY__) && (CONFIG_ARC_MMU_VER == 1)
.
macro
TLB_WRITE_HEURISTICS
#define JH_HACK1
...
...
arch/arc/kernel/setup.c
浏览文件 @
8235703e
...
...
@@ -182,7 +182,7 @@ char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
FIX_PTR
(
cpu
);
#define IS_AVAIL1(var, str) ((var) ? str : "")
#define IS_AVAIL2(var, str) ((var == 0x2) ? str : "")
#define IS_USED(
var) ((var
) ? "(in-use)" : "(not used)")
#define IS_USED(
cfg) (IS_ENABLED(cfg
) ? "(in-use)" : "(not used)")
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [700-Base]
\t
: %s %s %s %s %s %s
\n
"
,
...
...
@@ -202,9 +202,9 @@ char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
if
(
cpu
->
core
.
family
==
0x34
)
{
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [700-4.10]
\t
: LLOCK/SCOND %s, SWAPE %s, RTSC %s
\n
"
,
IS_USED
(
__CONFIG_ARC_HAS_LLSC_VAL
),
IS_USED
(
__CONFIG_ARC_HAS_SWAPE_VAL
),
IS_USED
(
__CONFIG_ARC_HAS_RTSC_VAL
));
IS_USED
(
CONFIG_ARC_HAS_LLSC
),
IS_USED
(
CONFIG_ARC_HAS_SWAPE
),
IS_USED
(
CONFIG_ARC_HAS_RTSC
));
}
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [CCM]
\t
: %s"
,
...
...
arch/arc/mm/cache_arc700.c
浏览文件 @
8235703e
...
...
@@ -89,8 +89,10 @@ char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len)
enb ? "" : "DISABLED (kernel-build)"); \
}
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
icache
,
__CONFIG_ARC_HAS_ICACHE
,
"I-Cache"
);
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
dcache
,
__CONFIG_ARC_HAS_DCACHE
,
"D-Cache"
);
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
icache
,
IS_ENABLED
(
CONFIG_ARC_HAS_ICACHE
),
"I-Cache"
);
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
dcache
,
IS_ENABLED
(
CONFIG_ARC_HAS_DCACHE
),
"D-Cache"
);
return
buf
;
}
...
...
arch/arc/mm/tlb.c
浏览文件 @
8235703e
...
...
@@ -505,7 +505,7 @@ char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len)
"J-TLB %d (%dx%d), uDTLB %d, uITLB %d, %s
\n
"
,
p_mmu
->
num_tlb
,
p_mmu
->
sets
,
p_mmu
->
ways
,
p_mmu
->
u_dtlb
,
p_mmu
->
u_itlb
,
__CONFIG_ARC_MMU_SASID_VAL
?
"SASID"
:
""
);
IS_ENABLED
(
CONFIG_ARC_MMU_SASID
)
?
"SASID"
:
""
);
return
buf
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录