Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8c2a77c authored by Ralf Baechle's avatar Ralf Baechle
Browse files

PNX8550 uses a MIPS32-like processor core, not R4xx0. 


    
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 08eaabfc

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ config SOC_PNX8550 
	bool

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL



config SWAP_IO_SPACE

arch/mips/configs/pnx8550-jbs_defconfig

+6 −5
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
#

# CPU selection

#

# CONFIG_CPU_MIPS32_R1 is not set

CONFIG_CPU_MIPS32_R1=y

# CONFIG_CPU_MIPS32_R2 is not set

# CONFIG_CPU_MIPS64_R1 is not set

# CONFIG_CPU_MIPS64_R2 is not set
@@ -137,7 +137,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
# CONFIG_CPU_TX39XX is not set

# CONFIG_CPU_VR41XX is not set

# CONFIG_CPU_R4300 is not set

CONFIG_CPU_R4X00=y

# CONFIG_CPU_R4X00 is not set

# CONFIG_CPU_TX49XX is not set

# CONFIG_CPU_R5000 is not set

# CONFIG_CPU_R5432 is not set
@@ -148,10 +148,11 @@ CONFIG_CPU_R4X00=y 
# CONFIG_CPU_RM7000 is not set

# CONFIG_CPU_RM9000 is not set

# CONFIG_CPU_SB1 is not set

CONFIG_SYS_HAS_CPU_R4X00=y

CONFIG_SYS_HAS_CPU_MIPS32_R1=y

CONFIG_CPU_MIPS32=y

CONFIG_CPU_MIPSR1=y

CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y



#

# Kernel type
@@ -162,11 +163,11 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_16KB is not set

# CONFIG_PAGE_SIZE_64KB is not set

CONFIG_CPU_HAS_PREFETCH=y

# CONFIG_MIPS_MT is not set

# CONFIG_64BIT_PHYS_ADDR is not set

# CONFIG_CPU_ADVANCED is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_LLDSCD=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/pnx8550-v2pci_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
#

# CPU selection

#

# CONFIG_CPU_MIPS32_R1 is not set

CONFIG_CPU_MIPS32_R1=y

# CONFIG_CPU_MIPS32_R2 is not set

# CONFIG_CPU_MIPS64_R1 is not set

# CONFIG_CPU_MIPS64_R2 is not set
@@ -136,7 +136,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
# CONFIG_CPU_TX39XX is not set

# CONFIG_CPU_VR41XX is not set

# CONFIG_CPU_R4300 is not set

CONFIG_CPU_R4X00=y

# CONFIG_CPU_R4X00 is not set

# CONFIG_CPU_TX49XX is not set

# CONFIG_CPU_R5000 is not set

# CONFIG_CPU_R5432 is not set
@@ -147,10 +147,11 @@ CONFIG_CPU_R4X00=y 
# CONFIG_CPU_RM7000 is not set

# CONFIG_CPU_RM9000 is not set

# CONFIG_CPU_SB1 is not set

CONFIG_SYS_HAS_CPU_R4X00=y

CONFIG_SYS_HAS_CPU_MIPS32_R1=y

CONFIG_CPU_MIPS32=y

CONFIG_CPU_MIPSR1=y

CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y



#

# Kernel type
@@ -161,6 +162,7 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_16KB is not set

# CONFIG_PAGE_SIZE_64KB is not set

CONFIG_CPU_HAS_PREFETCH=y

# CONFIG_MIPS_MT is not set

# CONFIG_64BIT_PHYS_ADDR is not set

CONFIG_CPU_ADVANCED=y