提交 437f2b8c 编写于 作者: C Christoph Hellwig 提交者: Masahiro Yamada

MIPS: remove the HT_PCI config option

This option is always selected from LOONGSON_MACH3X.  Switch to just
seleting PCI from that option and definining LOONGSON_PCIIO_BASE based
on CONFIG_LOONGSON_MACH3X.  PCI already selects PCI_DOMAINS.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Acked-by: NPaul Burton <paul.burton@mips.com>
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
上级 ccda4af0
...@@ -3040,17 +3040,6 @@ config PCI ...@@ -3040,17 +3040,6 @@ config PCI
your box. Other bus systems are ISA, EISA, or VESA. If you have PCI, your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
say Y, otherwise N. say Y, otherwise N.
config HT_PCI
bool "Support for HT-linked PCI"
default y
depends on CPU_LOONGSON3
select PCI
select PCI_DOMAINS
help
Loongson family machines use Hyper-Transport bus for inter-core
connection and device connection. The PCI bus is a subordinate
linked at HT. Choose Y for Loongson-3 based machines.
config PCI_DOMAINS config PCI_DOMAINS
bool bool
......
...@@ -113,7 +113,7 @@ static inline void do_perfcnt_IRQ(void) ...@@ -113,7 +113,7 @@ static inline void do_perfcnt_IRQ(void)
#define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */ #define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */
#define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1) #define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1)
#if defined(CONFIG_HT_PCI) #ifdef CONFIG_CPU_LOONGSON3
#define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base #define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base
#else #else
#define LOONGSON_PCIIO_BASE 0x1fd00000 #define LOONGSON_PCIIO_BASE 0x1fd00000
......
...@@ -76,7 +76,7 @@ config LOONGSON_MACH3X ...@@ -76,7 +76,7 @@ config LOONGSON_MACH3X
select CPU_HAS_WB select CPU_HAS_WB
select HW_HAS_PCI select HW_HAS_PCI
select ISA select ISA
select HT_PCI select PCI
select I8259 select I8259
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select NR_CPUS_DEFAULT_4 select NR_CPUS_DEFAULT_4
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册