Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
8235703e
Commit
8235703e
authored
Jun 01, 2013
by
Vineet Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARC: Use kconfig helper IS_ENABLED() to get rid of defines.h
Signed-off-by:
Vineet Gupta
<
vgupta@synopsys.com
>
parent
ba5afadb
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
68 deletions
+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
No files found.
arch/arc/Makefile
View file @
8235703e
...
@@ -16,13 +16,11 @@ KBUILD_DEFCONFIG := fpga_defconfig
...
@@ -16,13 +16,11 @@ KBUILD_DEFCONFIG := fpga_defconfig
cflags-y
+=
-mA7
-fno-common
-pipe
-fno-builtin
-D__linux__
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
ifdef
CONFIG_ARC_CURR_IN_REG
# For a global register defintion, make sure it gets passed to every file
# 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
# We had a customer reported bug where some code built in kernel was NOT using
# any kernel headers, and missing the r25 global register
# 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>
# due to <linux/thread_info.h>
LINUXINCLUDE
+=
-include
${src}
/arch/arc/include/asm/current.h
LINUXINCLUDE
+=
-include
${src}
/arch/arc/include/asm/current.h
endif
endif
...
...
arch/arc/include/asm/cache.h
View file @
8235703e
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
#ifndef __ARC_ASM_CACHE_H
#ifndef __ARC_ASM_CACHE_H
#define __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 */
/* In case $$ not config, setup a dummy number for rest of kernel */
#ifndef CONFIG_ARC_CACHE_LINE_SHIFT
#ifndef CONFIG_ARC_CACHE_LINE_SHIFT
#define L1_CACHE_SHIFT 6
#define L1_CACHE_SHIFT 6
...
...
arch/arc/include/asm/defines.h
deleted
100644 → 0
View file @
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
View file @
8235703e
...
@@ -9,6 +9,14 @@
...
@@ -9,6 +9,14 @@
#ifndef _ASM_ARC_MMU_H
#ifndef _ASM_ARC_MMU_H
#define _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__
#ifndef __ASSEMBLY__
typedef
struct
{
typedef
struct
{
...
...
arch/arc/include/asm/tlb-mmu1.h
View file @
8235703e
...
@@ -9,10 +9,11 @@
...
@@ -9,10 +9,11 @@
#ifndef __ASM_TLB_MMU_V1_H__
#ifndef __ASM_TLB_MMU_V1_H__
#define __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>
#include <asm/tlb.h>
#if defined(__ASSEMBLY__) && (CONFIG_ARC_MMU_VER == 1)
.
macro
TLB_WRITE_HEURISTICS
.
macro
TLB_WRITE_HEURISTICS
#define JH_HACK1
#define JH_HACK1
...
...
arch/arc/kernel/setup.c
View file @
8235703e
...
@@ -182,7 +182,7 @@ char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
...
@@ -182,7 +182,7 @@ char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
FIX_PTR
(
cpu
);
FIX_PTR
(
cpu
);
#define IS_AVAIL1(var, str) ((var) ? str : "")
#define IS_AVAIL1(var, str) ((var) ? str : "")
#define IS_AVAIL2(var, str) ((var == 0x2) ? 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
,
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [700-Base]
\t
: %s %s %s %s %s %s
\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)
...
@@ -202,9 +202,9 @@ char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
if
(
cpu
->
core
.
family
==
0x34
)
{
if
(
cpu
->
core
.
family
==
0x34
)
{
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [700-4.10]
\t
: LLOCK/SCOND %s, SWAPE %s, RTSC %s
\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_LLSC
),
IS_USED
(
__CONFIG_ARC_HAS_SWAPE_VAL
),
IS_USED
(
CONFIG_ARC_HAS_SWAPE
),
IS_USED
(
__CONFIG_ARC_HAS_RTSC_VAL
));
IS_USED
(
CONFIG_ARC_HAS_RTSC
));
}
}
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [CCM]
\t
: %s"
,
n
+=
scnprintf
(
buf
+
n
,
len
-
n
,
"Extn [CCM]
\t
: %s"
,
...
...
arch/arc/mm/cache_arc700.c
View file @
8235703e
...
@@ -89,8 +89,10 @@ char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len)
...
@@ -89,8 +89,10 @@ char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len)
enb ? "" : "DISABLED (kernel-build)"); \
enb ? "" : "DISABLED (kernel-build)"); \
}
}
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
icache
,
__CONFIG_ARC_HAS_ICACHE
,
"I-Cache"
);
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
icache
,
IS_ENABLED
(
CONFIG_ARC_HAS_ICACHE
),
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
dcache
,
__CONFIG_ARC_HAS_DCACHE
,
"D-Cache"
);
"I-Cache"
);
PR_CACHE
(
&
cpuinfo_arc700
[
c
].
dcache
,
IS_ENABLED
(
CONFIG_ARC_HAS_DCACHE
),
"D-Cache"
);
return
buf
;
return
buf
;
}
}
...
...
arch/arc/mm/tlb.c
View file @
8235703e
...
@@ -505,7 +505,7 @@ char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len)
...
@@ -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
"
,
"J-TLB %d (%dx%d), uDTLB %d, uITLB %d, %s
\n
"
,
p_mmu
->
num_tlb
,
p_mmu
->
sets
,
p_mmu
->
ways
,
p_mmu
->
num_tlb
,
p_mmu
->
sets
,
p_mmu
->
ways
,
p_mmu
->
u_dtlb
,
p_mmu
->
u_itlb
,
p_mmu
->
u_dtlb
,
p_mmu
->
u_itlb
,
__CONFIG_ARC_MMU_SASID_VAL
?
"SASID"
:
""
);
IS_ENABLED
(
CONFIG_ARC_MMU_SASID
)
?
"SASID"
:
""
);
return
buf
;
return
buf
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment