[ARM PATCH] 1502/1: rename IOP310 config vars to IOP3XX

Patch from Eli Carter

# Tue Apr 15 14:41:15 CDT 2003 ejc@rnd-linux-c84
# config-rename
#
# This patch renames the IOP310 config variables to IOP3XX in preparation for
# IOP321 support.
#
# Diff'ed against 2.5.65-rmk1+1472-4
# Applies to 2.5.67-rmk1 with an offset.
#
#  arch/arm/Kconfig                     |   14 +++++-----
#  arch/arm/Makefile                    |    2 -
#  arch/arm/def-configs/iq80310         |   15 +++++-----
#  arch/arm/kernel/debug.S              |    2 -
#  arch/arm/mach-iop3xx/Kconfig         |   49 ++++++++++++++++++++++-------------
#  arch/arm/mach-iop3xx/Makefile        |    8 ++---
#  include/asm-arm/arch-iop3xx/memory.h |    2 -
#  include/asm-arm/arch-iop3xx/timex.h  |    2 -
#  8 files changed, 54 insertions(+), 40 deletions(-)
#

arch/arm/Kconfig

@@ -138,8 +138,8 @@ config ARCH_FOOTBRIDGE
 config ARCH_INTEGRATOR
 	bool "Integrator"
 
-config ARCH_IOP310
-	bool "IOP310-based"
+config ARCH_IOP3XX
+	bool "IOP3xx-based"
 
 config ARCH_L7200
 	bool "LinkUp-L7200"
@@ -342,7 +342,7 @@ config CPU_SA1100
 # XScale
 config CPU_XSCALE
 	bool
-	depends on ARCH_IOP310 || ARCH_ADIFCC || ARCH_PXA
+	depends on ARCH_IOP3XX || ARCH_ADIFCC || ARCH_PXA
 	default y
 
 # Figure out what processor architecture version we should be using.
@@ -359,7 +359,7 @@ config CPU_32v4
 
 config CPU_32v5
 	bool
-	depends on ARCH_IOP310 || ARCH_ADIFCC || ARCH_PXA
+	depends on ARCH_IOP3XX || ARCH_ADIFCC || ARCH_PXA
 	default y
 
 comment "Processor Features"
@@ -436,8 +436,8 @@ config DISCONTIGMEM
 # Now handle the bus types
 config PCI
 	bool
-	default PCI_INTEGRATOR if !ARCH_FTVPCI && !ARCH_SHARK && !FOOTBRIDGE_HOST && !ARCH_IOP310 && ARCH_INTEGRATOR
-	default y if ARCH_FTVPCI || ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP310
+	default PCI_INTEGRATOR if !ARCH_FTVPCI && !ARCH_SHARK && !FOOTBRIDGE_HOST && !ARCH_IOP3XX && ARCH_INTEGRATOR
+	default y if ARCH_FTVPCI || ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX
 	help
 	  Find out whether you have a PCI motherboard. PCI is the name of a
 	  bus system, i.e. the way the CPU talks to the other stuff inside
@@ -451,7 +451,7 @@ config PCI
 
 config PCI_INTEGRATOR
 	bool "PCI support"
-	depends on !ARCH_FTVPCI && !ARCH_SHARK && !FOOTBRIDGE_HOST && !ARCH_IOP310 && ARCH_INTEGRATOR
+	depends on !ARCH_FTVPCI && !ARCH_SHARK && !FOOTBRIDGE_HOST && !ARCH_IOP3XX && ARCH_INTEGRATOR
 	help
 	  Find out whether you have a PCI motherboard. PCI is the name of a
 	  bus system, i.e. the way the CPU talks to the other stuff inside

arch/arm/Makefile

@@ -105,7 +105,7 @@ textaddr-$(CONFIG_ARCH_CLPS711X)   := 0xc0028000
  machine-$(CONFIG_ARCH_CLPS711X)   := clps711x
 textaddr-$(CONFIG_ARCH_FORTUNET)   := 0xc0008000
  machine-$(CONFIG_ARCH_ANAKIN)	   := anakin
- machine-$(CONFIG_ARCH_IOP310)	   := iop3xx
+ machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx
  machine-$(CONFIG_ARCH_ADIFCC)	   := adifcc
 
 MACHINE  := $(machine-y)

arch/arm/def-configs/iq80310

@@ -43,7 +43,7 @@ CONFIG_KMOD=y
 # CONFIG_ARCH_CAMELOT is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
-CONFIG_ARCH_IOP310=y
+CONFIG_ARCH_IOP3XX=y
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -70,17 +70,18 @@ CONFIG_ARCH_IOP310=y
 #
 
 #
-# IOP310 Implementation Options
+# IOP3xx Implementation Options
 #
 CONFIG_ARCH_IQ80310=y
+CONFIG_ARCH_IOP310=y
 
 #
-# IOP310 Chipset Features
+# IOP3xx Chipset Features
 #
-# CONFIG_IOP310_AAU is not set
-# CONFIG_IOP310_DMA is not set
-# CONFIG_IOP310_MU is not set
-# CONFIG_IOP310_PMON is not set
+# CONFIG_IOP3XX_AAU is not set
+# CONFIG_IOP3XX_DMA is not set
+# CONFIG_IOP3XX_MU is not set
+# CONFIG_IOP3XX_PMON is not set
 
 #
 # Intel PXA250/210 Implementations

arch/arm/kernel/debug.S

@@ -410,7 +410,7 @@
 		bne	1001b
 		.endm
 
-#elif defined(CONFIG_ARCH_IQ80310)
+#elif defined(CONFIG_ARCH_IOP3XX)
 
 		.macro	addruart,rx
 		mov	\rx, #0xfe000000	@ physical

arch/arm/mach-iop3xx/Kconfig

 
-menu "IOP310 Implementation Options"
+menu "IOP3xx Implementation Options"
+
+choice
+	prompt "IOP3xx System Type"
+	default ARCH_IQ80310
 
 config ARCH_IQ80310
 	bool "IQ80310"
-	depends on ARCH_IOP310
+	depends on ARCH_IOP3XX
 	help
 	  Say Y here if you want to run your kernel on the Intel IQ80310
 	  evaluation kit for the IOP310 chipset.
 
-comment "IOP310 Chipset Features"
+endchoice
+
+# Which IOP variant are we running?
+config ARCH_IOP310
+	bool
+	default ARCH_IQ80310
+	help
+	  The IQ80310 uses the IOP310 variant.
+
+comment "IOP3xx Chipset Features"
 
-config IOP310_AAU
-	bool "Support Intel 80312 Application Accelerator Unit (EXPERIMENTAL)"
-	depends on ARCH_IOP310 && EXPERIMENTAL
+config IOP3XX_AAU
+	bool "Support Intel IOP3xx Application Accelerator Unit (EXPERIMENTAL)"
+	depends on ARCH_IOP3XX && EXPERIMENTAL
 
-config IOP310_DMA
-	bool "Support Intel 80312 DMA (EXPERIMENTAL)"
-	depends on ARCH_IOP310 && EXPERIMENTAL
+config IOP3XX_DMA
+	bool "Support Intel IOP3xx DMA (EXPERIMENTAL)"
+	depends on ARCH_IOP3XX && EXPERIMENTAL
 
-config IOP310_MU
-	bool "Support Intel 80312 Messaging Unit (EXPERIMENTAL)"
-	depends on ARCH_IOP310 && EXPERIMENTAL
+config IOP3XX_MU
+	bool "Support Intel IOP3xx Messaging Unit (EXPERIMENTAL)"
+	depends on ARCH_IOP3XX && EXPERIMENTAL
 
-config IOP310_PMON
-	bool "Support Intel 80312 Performance Monitor (EXPERIMENTAL)"
-	depends on ARCH_IOP310 && EXPERIMENTAL
+config IOP3XX_PMON
+	bool "Support Intel IOP3xx Performance Monitor (EXPERIMENTAL)"
+	depends on ARCH_IOP3XX && EXPERIMENTAL
 
 endmenu
 

arch/arm/mach-iop3xx/Makefile

@@ -16,7 +16,7 @@ ifneq ($(CONFIG_XSCALE_PMU_TIMER),y)
 obj-y			+= iq80310-time.o
 endif
 
-obj-$(CONFIG_IOP310_AAU) += aau.o
-obj-$(CONFIG_IOP310_DMA) += dma.o
-obj-$(CONFIG_IOP310_MU) += message.o
-obj-$(CONFIG_IOP310_PMON) += pmon.o
+obj-$(CONFIG_IOP3XX_AAU) += aau.o
+obj-$(CONFIG_IOP3XX_DMA) += dma.o
+obj-$(CONFIG_IOP3XX_MU) += message.o
+obj-$(CONFIG_IOP3XX_PMON) += pmon.o

include/asm-arm/arch-iop3xx/memory.h

@@ -51,7 +51,7 @@
 #define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP310_SIALR)) | ( *IOP310_SIATVR)))
 
 /* boot mem allocate global pointer for MU circular queues QBAR */
-#ifdef CONFIG_IOP310_MU
+#ifdef CONFIG_IOP3XX_MU
 extern void *mu_mem;
 #endif
 

include/asm-arm/arch-iop3xx/timex.h

@@ -18,6 +18,6 @@
 
 #else
 
-#error "No IOP310 timex information for this architecture"
+#error "No IOP3xx timex information for this architecture"
 
 #endif