Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
a83860c2
cloud-kernel
项目概览
openanolis
/
cloud-kernel
12 个月 前同步成功
通知
152
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a83860c2
编写于
3月 13, 2009
作者:
R
Ralf Baechle
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MIPS: Mark Eins: Fix configuration.
Signed-off-by:
N
Ralf Baechle
<
ralf@linux-mips.org
>
上级
3b289d6e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
54 addition
and
52 deletion
+54
-52
arch/mips/Kconfig
arch/mips/Kconfig
+18
-8
arch/mips/Makefile
arch/mips/Makefile
+1
-1
arch/mips/configs/markeins_defconfig
arch/mips/configs/markeins_defconfig
+5
-5
arch/mips/emma/Kconfig
arch/mips/emma/Kconfig
+0
-29
arch/mips/emma/markeins/platform.c
arch/mips/emma/markeins/platform.c
+30
-9
未找到文件。
arch/mips/Kconfig
浏览文件 @
a83860c2
...
@@ -238,8 +238,12 @@ config MIPS_SIM
...
@@ -238,8 +238,12 @@ config MIPS_SIM
This option enables support for MIPS Technologies MIPSsim software
This option enables support for MIPS Technologies MIPSsim software
emulator.
emulator.
config MACH_EMMA
config NEC_MARKEINS
bool "NEC EMMA series based machines"
bool "NEC EMMA2RH Mark-eins board"
select SOC_EMMA2RH
select HW_HAS_PCI
help
This enables support for the NEC Electronics Mark-eins boards.
config MACH_VR41XX
config MACH_VR41XX
bool "NEC VR4100 series based machines"
bool "NEC VR4100 series based machines"
...
@@ -637,7 +641,6 @@ endchoice
...
@@ -637,7 +641,6 @@ endchoice
source "arch/mips/alchemy/Kconfig"
source "arch/mips/alchemy/Kconfig"
source "arch/mips/basler/excite/Kconfig"
source "arch/mips/basler/excite/Kconfig"
source "arch/mips/emma/Kconfig"
source "arch/mips/jazz/Kconfig"
source "arch/mips/jazz/Kconfig"
source "arch/mips/lasat/Kconfig"
source "arch/mips/lasat/Kconfig"
source "arch/mips/pmc-sierra/Kconfig"
source "arch/mips/pmc-sierra/Kconfig"
...
@@ -895,6 +898,18 @@ config MIPS_RM9122
...
@@ -895,6 +898,18 @@ config MIPS_RM9122
bool
bool
select SERIAL_RM9000
select SERIAL_RM9000
config SOC_EMMA2RH
bool
select CEVT_R4K
select CSRC_R4K
select DMA_NONCOHERENT
select IRQ_CPU
select SWAP_IO_SPACE
select SYS_HAS_CPU_R5500
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN
config SOC_PNX833X
config SOC_PNX833X
bool
bool
select CEVT_R4K
select CEVT_R4K
...
@@ -930,11 +945,6 @@ config SOC_PNX8550
...
@@ -930,11 +945,6 @@ config SOC_PNX8550
config SWAP_IO_SPACE
config SWAP_IO_SPACE
bool
bool
config EMMA2RH
bool
depends on MARKEINS
default y
config SERIAL_RM9000
config SERIAL_RM9000
bool
bool
...
...
arch/mips/Makefile
浏览文件 @
a83860c2
...
@@ -416,7 +416,7 @@ load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000
...
@@ -416,7 +416,7 @@ load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000
#
#
# Common NEC EMMAXXX
# Common NEC EMMAXXX
#
#
core-$(CONFIG_SOC_EMMA
)
+=
arch
/mips/emma/common/
core-$(CONFIG_SOC_EMMA
2RH)
+=
arch
/mips/emma/common/
cflags-$(CONFIG_SOC_EMMA2RH)
+=
-I
$(srctree)
/arch/mips/include/asm/mach-emma2rh
cflags-$(CONFIG_SOC_EMMA2RH)
+=
-I
$(srctree)
/arch/mips/include/asm/mach-emma2rh
#
#
...
...
arch/mips/configs/
emma2rh
_defconfig
→
arch/mips/configs/
markeins
_defconfig
浏览文件 @
a83860c2
...
@@ -35,7 +35,7 @@ CONFIG_ZONE_DMA=y
...
@@ -35,7 +35,7 @@ CONFIG_ZONE_DMA=y
# CONFIG_PNX8550_STB810 is not set
# CONFIG_PNX8550_STB810 is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_PMC_YOSEMITE is not set
# CONFIG_PMC_YOSEMITE is not set
CONFIG_MARKEINS=y
CONFIG_
NEC_
MARKEINS=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP32 is not set
# CONFIG_SGI_IP32 is not set
...
@@ -68,7 +68,7 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
...
@@ -68,7 +68,7 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_IRQ_CPU=y
CONFIG_IRQ_CPU=y
CONFIG_SWAP_IO_SPACE=y
CONFIG_SWAP_IO_SPACE=y
CONFIG_EMMA2RH=y
CONFIG_
SOC_
EMMA2RH=y
CONFIG_MIPS_L1_CACHE_SHIFT=5
CONFIG_MIPS_L1_CACHE_SHIFT=5
#
#
...
@@ -574,9 +574,9 @@ CONFIG_MTD_CFI_UTIL=y
...
@@ -574,9 +574,9 @@ CONFIG_MTD_CFI_UTIL=y
#
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0x
1e00000
0
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
2000000
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=
2
CONFIG_MTD_PHYSMAP_BANKWIDTH=
0
# CONFIG_MTD_PLATRAM is not set
# CONFIG_MTD_PLATRAM is not set
#
#
...
...
arch/mips/emma/Kconfig
已删除
100644 → 0
浏览文件 @
3b289d6e
choice
prompt "Machine type"
depends on MACH_EMMA
default NEC_MARKEINS
config NEC_MARKEINS
bool "NEC EMMA2RH Mark-eins board"
select SOC_EMMA2RH
select HW_HAS_PCI
help
This enables support for the NEC Electronics Mark-eins boards.
endchoice
config SOC_EMMA2RH
bool
select SOC_EMMA
select SYS_HAS_CPU_R5500
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL
config SOC_EMMA
bool
select CEVT_R4K
select CSRC_R4K
select DMA_NONCOHERENT
select IRQ_CPU
select SWAP_IO_SPACE
select SYS_SUPPORTS_BIG_ENDIAN
arch/mips/emma/markeins/platform.c
浏览文件 @
a83860c2
...
@@ -141,13 +141,6 @@ static struct platform_device serial_emma = {
...
@@ -141,13 +141,6 @@ static struct platform_device serial_emma = {
},
},
};
};
static
struct
platform_device
*
devices
[]
=
{
&
i2c_emma_devices
[
0
],
&
i2c_emma_devices
[
1
],
&
i2c_emma_devices
[
2
],
&
serial_emma
,
};
static
struct
mtd_partition
markeins_parts
[]
=
{
static
struct
mtd_partition
markeins_parts
[]
=
{
[
0
]
=
{
[
0
]
=
{
.
name
=
"RootFS"
,
.
name
=
"RootFS"
,
...
@@ -181,11 +174,39 @@ static struct mtd_partition markeins_parts[] = {
...
@@ -181,11 +174,39 @@ static struct mtd_partition markeins_parts[] = {
},
},
};
};
static
struct
physmap_flash_data
markeins_flash_data
=
{
.
width
=
2
,
.
nr_parts
=
ARRAY_SIZE
(
markeins_parts
),
.
parts
=
markeins_parts
};
static
struct
resource
markeins_flash_resource
=
{
.
start
=
0x1e000000
,
.
end
=
0x02000000
,
.
flags
=
IORESOURCE_MEM
};
static
struct
platform_device
markeins_flash_device
=
{
.
name
=
"physmap-flash"
,
.
id
=
0
,
.
dev
=
{
.
platform_data
=
&
markeins_flash_data
,
},
.
num_resources
=
1
,
.
resource
=
&
markeins_flash_resource
,
};
static
struct
platform_device
*
devices
[]
=
{
i2c_emma_devices
,
i2c_emma_devices
+
1
,
i2c_emma_devices
+
2
,
&
serial_emma
,
&
markeins_flash_device
,
};
static
int
__init
platform_devices_setup
(
void
)
static
int
__init
platform_devices_setup
(
void
)
{
{
physmap_set_partitions
(
markeins_parts
,
ARRAY_SIZE
(
markeins_parts
));
return
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
return
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
}
}
arch_initcall
(
platform_devices_setup
);
arch_initcall
(
platform_devices_setup
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录