aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig11
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig10
3 files changed, 13 insertions, 10 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0097a0d53b3b..e380a8322a94 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -958,7 +958,7 @@ config SOC_PNX8550
958 bool 958 bool
959 select DMA_NONCOHERENT 959 select DMA_NONCOHERENT
960 select HW_HAS_PCI 960 select HW_HAS_PCI
961 select SYS_HAS_CPU_R4X00 961 select SYS_HAS_CPU_MIPS32_R1
962 select SYS_SUPPORTS_32BIT_KERNEL 962 select SYS_SUPPORTS_32BIT_KERNEL
963 963
964config SWAP_IO_SPACE 964config SWAP_IO_SPACE
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 95f84d711912..555837e4c06f 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -129,7 +129,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
129# 129#
130# CPU selection 130# CPU selection
131# 131#
132# CONFIG_CPU_MIPS32_R1 is not set 132CONFIG_CPU_MIPS32_R1=y
133# CONFIG_CPU_MIPS32_R2 is not set 133# CONFIG_CPU_MIPS32_R2 is not set
134# CONFIG_CPU_MIPS64_R1 is not set 134# CONFIG_CPU_MIPS64_R1 is not set
135# CONFIG_CPU_MIPS64_R2 is not set 135# CONFIG_CPU_MIPS64_R2 is not set
@@ -137,7 +137,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
137# CONFIG_CPU_TX39XX is not set 137# CONFIG_CPU_TX39XX is not set
138# CONFIG_CPU_VR41XX is not set 138# CONFIG_CPU_VR41XX is not set
139# CONFIG_CPU_R4300 is not set 139# CONFIG_CPU_R4300 is not set
140CONFIG_CPU_R4X00=y 140# CONFIG_CPU_R4X00 is not set
141# CONFIG_CPU_TX49XX is not set 141# CONFIG_CPU_TX49XX is not set
142# CONFIG_CPU_R5000 is not set 142# CONFIG_CPU_R5000 is not set
143# CONFIG_CPU_R5432 is not set 143# CONFIG_CPU_R5432 is not set
@@ -148,10 +148,11 @@ CONFIG_CPU_R4X00=y
148# CONFIG_CPU_RM7000 is not set 148# CONFIG_CPU_RM7000 is not set
149# CONFIG_CPU_RM9000 is not set 149# CONFIG_CPU_RM9000 is not set
150# CONFIG_CPU_SB1 is not set 150# CONFIG_CPU_SB1 is not set
151CONFIG_SYS_HAS_CPU_R4X00=y 151CONFIG_SYS_HAS_CPU_MIPS32_R1=y
152CONFIG_CPU_MIPS32=y
153CONFIG_CPU_MIPSR1=y
152CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 154CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
153CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 155CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
154CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
155 156
156# 157#
157# Kernel type 158# Kernel type
@@ -162,11 +163,11 @@ CONFIG_PAGE_SIZE_4KB=y
162# CONFIG_PAGE_SIZE_8KB is not set 163# CONFIG_PAGE_SIZE_8KB is not set
163# CONFIG_PAGE_SIZE_16KB is not set 164# CONFIG_PAGE_SIZE_16KB is not set
164# CONFIG_PAGE_SIZE_64KB is not set 165# CONFIG_PAGE_SIZE_64KB is not set
166CONFIG_CPU_HAS_PREFETCH=y
165# CONFIG_MIPS_MT is not set 167# CONFIG_MIPS_MT is not set
166# CONFIG_64BIT_PHYS_ADDR is not set 168# CONFIG_64BIT_PHYS_ADDR is not set
167# CONFIG_CPU_ADVANCED is not set 169# CONFIG_CPU_ADVANCED is not set
168CONFIG_CPU_HAS_LLSC=y 170CONFIG_CPU_HAS_LLSC=y
169CONFIG_CPU_HAS_LLDSCD=y
170CONFIG_CPU_HAS_SYNC=y 171CONFIG_CPU_HAS_SYNC=y
171CONFIG_GENERIC_HARDIRQS=y 172CONFIG_GENERIC_HARDIRQS=y
172CONFIG_GENERIC_IRQ_PROBE=y 173CONFIG_GENERIC_IRQ_PROBE=y
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index deb24c29ac0a..05e65206a7b4 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -128,7 +128,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
128# 128#
129# CPU selection 129# CPU selection
130# 130#
131# CONFIG_CPU_MIPS32_R1 is not set 131CONFIG_CPU_MIPS32_R1=y
132# CONFIG_CPU_MIPS32_R2 is not set 132# CONFIG_CPU_MIPS32_R2 is not set
133# CONFIG_CPU_MIPS64_R1 is not set 133# CONFIG_CPU_MIPS64_R1 is not set
134# CONFIG_CPU_MIPS64_R2 is not set 134# CONFIG_CPU_MIPS64_R2 is not set
@@ -136,7 +136,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
136# CONFIG_CPU_TX39XX is not set 136# CONFIG_CPU_TX39XX is not set
137# CONFIG_CPU_VR41XX is not set 137# CONFIG_CPU_VR41XX is not set
138# CONFIG_CPU_R4300 is not set 138# CONFIG_CPU_R4300 is not set
139CONFIG_CPU_R4X00=y 139# CONFIG_CPU_R4X00 is not set
140# CONFIG_CPU_TX49XX is not set 140# CONFIG_CPU_TX49XX is not set
141# CONFIG_CPU_R5000 is not set 141# CONFIG_CPU_R5000 is not set
142# CONFIG_CPU_R5432 is not set 142# CONFIG_CPU_R5432 is not set
@@ -147,10 +147,11 @@ CONFIG_CPU_R4X00=y
147# CONFIG_CPU_RM7000 is not set 147# CONFIG_CPU_RM7000 is not set
148# CONFIG_CPU_RM9000 is not set 148# CONFIG_CPU_RM9000 is not set
149# CONFIG_CPU_SB1 is not set 149# CONFIG_CPU_SB1 is not set
150CONFIG_SYS_HAS_CPU_R4X00=y 150CONFIG_SYS_HAS_CPU_MIPS32_R1=y
151CONFIG_CPU_MIPS32=y
152CONFIG_CPU_MIPSR1=y
151CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 153CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
152CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 154CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
153CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
154 155
155# 156#
156# Kernel type 157# Kernel type
@@ -161,6 +162,7 @@ CONFIG_PAGE_SIZE_4KB=y
161# CONFIG_PAGE_SIZE_8KB is not set 162# CONFIG_PAGE_SIZE_8KB is not set
162# CONFIG_PAGE_SIZE_16KB is not set 163# CONFIG_PAGE_SIZE_16KB is not set
163# CONFIG_PAGE_SIZE_64KB is not set 164# CONFIG_PAGE_SIZE_64KB is not set
165CONFIG_CPU_HAS_PREFETCH=y
164# CONFIG_MIPS_MT is not set 166# CONFIG_MIPS_MT is not set
165# CONFIG_64BIT_PHYS_ADDR is not set 167# CONFIG_64BIT_PHYS_ADDR is not set
166CONFIG_CPU_ADVANCED=y 168CONFIG_CPU_ADVANCED=y