[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.53,1.54 config.in,1.104,1.105

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips

Modified Files:
	Makefile config.in 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Makefile	25 Sep 2002 07:38:57 -0000	1.53
+++ Makefile	26 Sep 2002 05:39:38 -0000	1.54
@@ -16,7 +16,7 @@
 # Select the object file format to substitute into the linker script.
 #
 ifdef CONFIG_CPU_LITTLE_ENDIAN
-tool-prefix	= mipsel-linux-
+tool-prefix	= mips_fp_le-
 else
 tool-prefix	= mips-linux-
 endif

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- config.in	25 Sep 2002 07:38:57 -0000	1.104
+++ config.in	26 Sep 2002 05:39:38 -0000	1.105
@@ -24,13 +24,13 @@
 mainmenu_option next_comment
 comment 'Machine selection'
 dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
-bool 'Support for Alchemy Semi PB1000 board' CONFIG_MIPS_PB1000
+bool 'Support for Alchemy Pb1000 board' CONFIG_MIPS_PB1000
 if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
    bool '  Support for PCI AUTO Config' CONFIG_PCI_AUTO
 fi
-bool 'Support for Alchemy Semi PB1100 board' CONFIG_MIPS_PB1100
-bool 'Support for Alchemy Semi PB1500 board' CONFIG_MIPS_PB1500
-bool 'Support for Alchemy Semi HYD1100 board' CONFIG_MIPS_HYD1100
+bool 'Support for Alchemy Pb1100 board' CONFIG_MIPS_PB1100
+bool 'Support for Alchemy Pb1500 board' CONFIG_MIPS_PB1500
+bool 'Support for Alchemy HYD1100 board' CONFIG_MIPS_HYD1100
 dep_bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032 $CONFIG_EXPERIMENTAL
 dep_bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS $CONFIG_EXPERIMENTAL
 dep_bool 'Support for Cobalt Server (EXPERIMENTAL)' CONFIG_MIPS_COBALT $CONFIG_EXPERIMENTAL
@@ -142,7 +142,7 @@
    define_bool CONFIG_OLD_TIME_C y
 fi
 if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1000 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_NEW_PCI y
@@ -153,7 +153,7 @@
    define_bool CONFIG_AU1000_USB_DEVICE y
 fi
 if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1100 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_PCI_AUTO n
@@ -164,7 +164,7 @@
    define_bool CONFIG_AU1000_USB_DEVICE y
 fi
 if [ "$CONFIG_MIPS_PB1500" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1500 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_NEW_PCI y
@@ -174,7 +174,7 @@
    define_bool CONFIG_AU1000_USB_DEVICE y
 fi
 if [ "$CONFIG_MIPS_HYD1100" = "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 y
+   define_bool CONFIG_CPU_AU1100 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
    define_bool CONFIG_PCI_AUTO n
@@ -555,10 +555,6 @@
    define_bool CONFIG_SWAP_IO_SPACE y
    define_bool CONFIG_NONCOHERENT_IO y
 fi
-
-if [ "$CONFIG_MIPS_AU1000" != "y" ]; then
-   define_bool CONFIG_MIPS_AU1000 n
-fi
 endmenu
 
 mainmenu_option next_comment
@@ -584,6 +580,26 @@
 	 MIPS32	 CONFIG_CPU_MIPS32 \
 	 MIPS64	 CONFIG_CPU_MIPS64 \
 	 RC32300 CONFIG_CPU_RC32300" R4x00
+
+if [ "$CONFIG_CPU_MIPS32" = "y" ]; then
+   choice 'MIPS32 CPU type'  \
+   "Generic CONFIG_CPU_GENERIC \
+    Au1000 CONFIG_CPU_AU1000 \
+    Au1500 CONFIG_CPU_AU1500 \
+    Au1100 CONFIG_CPU_AU1100" Au1000
+fi
+
+if [ "$CONFIG_CPU_AU1000" = "y" -o \
+     "$CONFIG_CPU_AU1500" = "y" -o \
+     "$CONFIG_CPU_AU1100" = "y" ]; then
+   define_bool CONFIG_CPU_AU1X00 y
+   define_bool CONFIG_64BIT_PHYS_ADDR y
+   define_bool CONFIG_VTAG_ICACHE n
+   define_bool CONFIG_CPU_HAS_LLSC y
+   define_bool CONFIG_CPU_HAS_LLDSCD n
+   define_bool CONFIG_CPU_HAS_WB y
+   define_bool CONFIG_CPU_HAS_PREFETCH n
+fi
 
 if [ "$CONFIG_CPU_MIPS32" = "y" ]; then
    define_bool CONFIG_CPU_HAS_PREFETCH y