From: wdenk <wdenk>
Date: Wed, 28 Nov 2001 17:49:52 +0000 (+0000)
Subject: The Big Rename: renamed 8240 ==> 824x to allow for easier integration
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b4e9874b7145b6c2dbfd02cc44dd4810a254a4f3;p=users%2Frw%2Fppcboot.git

The Big Rename: renamed 8240 ==> 824x to allow for easier integration
of 8245 and other 824x CPU's
Patch by Greg Allen <gallen@arlut.utexas.edu>, 26 Nov 2001
---

diff --git a/CHANGELOG b/CHANGELOG
index 4ffa757..4472a48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -56,6 +56,10 @@ To do:
 Modifications for 1.1.2:
 ======================================================================
 
+* The Big Rename: renamed 8240 ==> 824x to allow for easier
+  integration of 8245 and other 824x CPU's
+  Patch by Greg Allen <gallen@arlut.utexas.edu>, 26 Nov 2001
+
 * Add "sleep" command
 
 * Add loop constructs (for, while, until) to hush command interpreter
diff --git a/MAKEALL b/MAKEALL
index 6ce0911..d138404 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -41,10 +41,10 @@ LIST_4xx="	\
 "
 
 #########################################################################
-## MPC8240 Systems
+## MPC824x Systems
 #########################################################################
 
-LIST_8240="	\
+LIST_824x="	\
 	CU824		\
 	MOUSSE		\
 	Sandpoint8240	\
@@ -81,7 +81,7 @@ LIST_7xx="	\
 	BAB750		\
 "
 
-LIST_all="${LIST_8xx} ${LIST_8240} ${LIST_8260} \
+LIST_all="${LIST_8xx} ${LIST_824x} ${LIST_8260} \
 	  ${LIST_4xx} ${LIST_74xx} ${LIST_7xx}"
 
 [ $# = 0 ] && set $LIST_all
@@ -103,7 +103,7 @@ build_target() {
 for arg in $@
 do
 	case "$arg" in
-	8xx|8240|8260|4xx|74xx)	for target in `eval echo '$LIST_'${arg}`
+	8xx|824x|8260|4xx|74xx)	for target in `eval echo '$LIST_'${arg}`
 				do
 					build_target ${target}
 				done
diff --git a/Makefile b/Makefile
index 4757198..5e19616 100644
--- a/Makefile
+++ b/Makefile
@@ -486,7 +486,7 @@ WALNUT405_config:unconfig
 	echo "#include <config_$(@:_config=).h>" >config.h
 
 #########################################################################
-## MPC8240 Systems
+## MPC824x Systems
 #########################################################################
 
 CU824_config: unconfig
@@ -494,7 +494,7 @@ CU824_config: unconfig
 	cd ./include ;				\
 	echo "ARCH  = ppc"	> config.mk ;	\
 	echo "BOARD = cu824"	>>config.mk ;	\
-	echo "CPU   = mpc8240"	>>config.mk ;	\
+	echo "CPU   = mpc824x"	>>config.mk ;	\
 	echo "#include <config_$(@:_config=).h>" >config.h
 
 MOUSSE_config: unconfig
@@ -502,7 +502,7 @@ MOUSSE_config: unconfig
 	cd ./include ;				\
 	echo "ARCH  = ppc"	> config.mk ;	\
 	echo "BOARD = mousse"	>>config.mk ;	\
-	echo "CPU   = mpc8240"	>>config.mk ;	\
+	echo "CPU   = mpc824x"	>>config.mk ;	\
 	echo "#include <config_$(@:_config=).h>" >config.h
 
 Sandpoint8240_config: unconfig
@@ -510,7 +510,7 @@ Sandpoint8240_config: unconfig
 	cd ./include ;				\
 	echo "ARCH  = ppc"	> config.mk ;	\
 	echo "BOARD = sandpoint"	>>config.mk ;	\
-	echo "CPU   = mpc8240"	>>config.mk ;	\
+	echo "CPU   = mpc824x"	>>config.mk ;	\
 	echo "#include <config_$(@:_config=).h>" >config.h
 
 #########################################################################
diff --git a/README b/README
index c28db45..8c951f8 100644
--- a/README
+++ b/README
@@ -95,7 +95,7 @@ Directory Hierarchy:
 - tools		Tools to build S-Record or PPCBoot images, etc.
 
 - cpu/mpc8xx	Files specific to Motorola MPC8xx  CPUs
-- cpu/mpc8240	Files specific to Motorola MPC8240 CPU
+- cpu/mpc824x	Files specific to Motorola MPC824x CPUs
 - cpu/mpc8260	Files specific to Motorola MPC8260 CPU
 - cpu/mpc74xx	Files specific to Motorola MPC74xx CPUs
 - cpu/ppc4xx	Files specific to IBM	   4xx	   CPUs
@@ -204,7 +204,7 @@ The following options need to be configured:
 
 - CPU Type:	Define exactly one of
 		CONFIG_MPC823,	CONFIG_MPC850,	CONFIG_MPC855,	CONFIG_MPC860
-	or	CONFIG_MPC8240, CONFIG_MPC8260
+	or	CONFIG_MPC824X, CONFIG_MPC8260
 	or	CONFIG_IOP480
 	or	CONFIG_405GP
 	or	CONFIG_MPC74xx
@@ -245,6 +245,10 @@ The following options need to be configured:
 					  the lcd display every second with
 					  a "rotator" |\-/|\-/
 
+- MPC824X Family Member (if CONFIG_MPC824X is defined)
+        Define exactly one of
+        CONFIG_MPC8240, CONFIG_MPC8245
+
 - 8xx CPU Options: (if using an 8xx cpu)
 		Define one or more of
 		CONFIG_8xx_GCLK_FREQ	- if get_gclk_freq() can not work e.g.
@@ -966,7 +970,7 @@ Low Level (hardware related) configuration options:
 
 		PPCBoot uses the following memory types:
                 - MPC8xx and MPC8260: IMMR (internal memory of the CPU)
-		- MPC8240: data cache
+                - MPC824X: data cache
 
 - CFG_INIT_DATA_OFFSET:
 
@@ -980,7 +984,7 @@ Low Level (hardware related) configuration options:
                 CFG_INIT_DATA_OFFSET) downward.
 
 	Note:
-                On the MPC8240 (or other systems that use the data
+                On the MPC824X (or other systems that use the data
                 cache for initial memory) the address chosen for
                 CFG_INIT_RAM_ADDR is basically arbitrary - it must
                 point to an otherwise UNUSED address space between
@@ -1071,7 +1075,7 @@ configurations; the following names are supported:
     FADS850SAR_config     SPD823TS_config       pcu_e_config
     FADS860T_config       SXNI855T_config       rsdproto_config
     FPS850L_config        Sandpoint8240_config  sbc8260_config
-    GENIETV_config        TQM823L_config	PIP405_config
+    GENIETV_config        TQM823L_config        PIP405_config
 
 Note: for some board special configuration names may exist; check  if
       additional  information is available from the board vendor; for
diff --git a/board/cu824/cu824.c b/board/cu824/cu824.c
index df18de9..6cdac49 100644
--- a/board/cu824/cu824.c
+++ b/board/cu824/cu824.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 
 #define BOARD_REV_REG 0xFE80002B
@@ -81,14 +81,14 @@ long int initdram(int board_type)
 		*addr = save[--i];
 		if (val != ~cnt) {
 			ulong new_bank0_end = cnt * sizeof(long) - 1;
-			ulong mear1  = mpc8240_mpc107_getreg(MEAR1);
-			ulong emear1 = mpc8240_mpc107_getreg(EMEAR1);
+			ulong mear1  = mpc824x_mpc107_getreg(MEAR1);
+			ulong emear1 = mpc824x_mpc107_getreg(EMEAR1);
 			mear1 =  (mear1  & 0xFFFFFF00) |
 			  ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT);
 			emear1 = (emear1 & 0xFFFFFF00) |
 			  ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT);
-			mpc8240_mpc107_setreg(MEAR1,  mear1);
-			mpc8240_mpc107_setreg(EMEAR1, emear1);
+			mpc824x_mpc107_setreg(MEAR1,  mear1);
+			mpc824x_mpc107_setreg(EMEAR1, emear1);
 
 			ret = cnt * sizeof(long);
 			goto Done;
diff --git a/board/cu824/dc2114x.c b/board/cu824/dc2114x.c
index 043af82..8f8277c 100644
--- a/board/cu824/dc2114x.c
+++ b/board/cu824/dc2114x.c
@@ -1,5 +1,5 @@
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <net.h>
 
 	/* PCI Registers.
diff --git a/board/cu824/flash.c b/board/cu824/flash.c
index 4c71a05..6b8769e 100644
--- a/board/cu824/flash.c
+++ b/board/cu824/flash.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 
 #if defined(CFG_ENV_IS_IN_FLASH)
diff --git a/board/cu824/ppcboot.lds b/board/cu824/ppcboot.lds
index 2d654a4..3241bed 100644
--- a/board/cu824/ppcboot.lds
+++ b/board/cu824/ppcboot.lds
@@ -53,7 +53,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8240/start.o	(.text)
+    cpu/mpc824x/start.o	(.text)
 		common/board.o (.text)
     ppc/ppcstring.o	(.text)
     ppc/vsprintf.o	(.text)
diff --git a/board/cu824/speed.c b/board/cu824/speed.c
index c122687..313462f 100644
--- a/board/cu824/speed.c
+++ b/board/cu824/speed.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 
 static char pll_to_bus_factor[] =
@@ -58,7 +58,7 @@ ulong get_bus_freq(ulong ignore)
 
 /* Table to convert pllratio to actual processor clock scaling factor (*10)
  */
-#ifdef CONFIG_MPC8240
+#ifdef CONFIG_MPC824X
 short pllratio_to_factor[] = {
     00, 00, 00, 10, 20, 20, 25, 00, 00, 00, 00, 00, 00, 00, 00, 00,
     00, 00, 00, 10, 00, 00, 00, 45, 30, 00, 40, 00, 00, 00, 35, 00,
@@ -69,9 +69,9 @@ ulong get_gclk_freq(void)
 {
 	uint hid1 = mfspr(HID1);
 
-#ifdef CONFIG_MPC8240
+#ifdef CONFIG_MPC824X
 
-		/* 5 bits for PLL ration on 8240
+		/* 5 bits for PLL ration on 824X
 		 */
 	hid1 = (hid1 >> (32-5)) & 0x1f;
 #else
diff --git a/board/mousse/dc2114x.c b/board/mousse/dc2114x.c
index 2a63c3e..bbf383d 100644
--- a/board/mousse/dc2114x.c
+++ b/board/mousse/dc2114x.c
@@ -29,7 +29,7 @@
  * DEC 21143 Ethernet driver.
  */
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <net.h>
 #include "pci.h"
 #include "mousse.h"
diff --git a/board/mousse/mousse.c b/board/mousse/mousse.c
index 9ef22fc..303e96c 100644
--- a/board/mousse/mousse.c
+++ b/board/mousse/mousse.c
@@ -27,7 +27,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 
 #include "mousse.h"
diff --git a/board/mousse/pci.c b/board/mousse/pci.c
index 7b3af19..adae1a8 100644
--- a/board/mousse/pci.c
+++ b/board/mousse/pci.c
@@ -26,10 +26,10 @@
  */
 
 /*
- * PCI Configuration space access support for MPC8240/MPC107 PCI Bridge
+ * PCI Configuration space access support for MPC824x/MPC107 PCI Bridge
  */
 #include <ppcboot.h>
-#include "mpc8240.h"
+#include "mpc824x.h"
 #include "pci.h"
 #include "mousse.h"
 
@@ -283,10 +283,10 @@ int pci_config_inb(int busNo,    /* bus number */
   uint8 retval = 0;
   int retStat = ERROR;
   
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR, 
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR, 
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  (offset & 0xfc) | 0x80000000);
-  retval = mpc8240_mpc107_read8 (CHRP_REG_DATA + (offset & 0x3));
+  retval = mpc824x_mpc107_read8 (CHRP_REG_DATA + (offset & 0x3));
   retStat = OK;
   
   *pData = retval;
@@ -314,10 +314,10 @@ int pci_config_inw(int busNo,      /* bus number */
     return (retStat);
   }
   
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR, 
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR, 
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  (offset & 0xfc) | 0x80000000);
-  retval = mpc8240_mpc107_read16 (CHRP_REG_DATA + (offset & 0x2));
+  retval = mpc824x_mpc107_read16 (CHRP_REG_DATA + (offset & 0x2));
   retStat = OK;
   *pData = retval;
   
@@ -343,10 +343,10 @@ int pci_config_inl(int	busNo,     /* bus number */
   if (((offset & (int)0x3) > 0) ) {
     return (retStat);
   }
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR, 
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR, 
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  (offset & 0xfc) | 0x80000000);
-  retval = mpc8240_mpc107_read32 (CHRP_REG_DATA);
+  retval = mpc824x_mpc107_read32 (CHRP_REG_DATA);
   asm volatile ("eieio");
   retStat = OK;
   *pData = retval;
@@ -366,10 +366,10 @@ int pci_config_outb(int busNo,    /* bus number */
 		    uint8 data)    /* data written to the offset */
 {
   
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR, 
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR, 
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  (offset & 0xfc) | 0x80000000);
-  mpc8240_mpc107_write8 ((CHRP_REG_DATA + (offset & 0x3)), data);
+  mpc824x_mpc107_write8 ((CHRP_REG_DATA + (offset & 0x3)), data);
   return OK;
 }
 
@@ -390,10 +390,10 @@ int pci_config_outw(int busNo,    /* bus number */
     return (ERROR);
   }
 
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR,
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR,
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  (offset & 0xfc) | 0x80000000);
-  mpc8240_mpc107_write16 ((CHRP_REG_DATA + (offset & 0x2)), data);
+  mpc824x_mpc107_write16 ((CHRP_REG_DATA + (offset & 0x2)), data);
   return OK;
 }
 
@@ -414,10 +414,10 @@ int pci_config_outl(int busNo,    /* bus number */
   if (((offset & (int)0x3) > 0) ){
     return (ERROR);
   }
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR,
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR,
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  (offset & 0xfc) | 0x80000000);
-  mpc8240_mpc107_write32 (CHRP_REG_DATA, data);
+  mpc824x_mpc107_write32 (CHRP_REG_DATA, data);
   asm volatile ("eieio");
   return OK;
 }
@@ -520,10 +520,10 @@ pci_special_cycle(int busNo,       /* bus number */
   int deviceNo	= 0x0000001f;	
   int funcNo	= 0x00000007;
   
-  mpc8240_mpc107_write32 (CHRP_REG_ADDR, 
+  mpc824x_mpc107_write32 (CHRP_REG_ADDR, 
 			  pci_config_bdf_pack (busNo, deviceNo, funcNo) |
 			  0x80000000);
-  mpc8240_mpc107_write32 (CHRP_REG_DATA, message);
+  mpc824x_mpc107_write32 (CHRP_REG_DATA, message);
   return OK;
 }
 
diff --git a/board/mousse/pci.h b/board/mousse/pci.h
index 60f770e..1490729 100644
--- a/board/mousse/pci.h
+++ b/board/mousse/pci.h
@@ -23,11 +23,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
-#ifndef __MPC8240_PCI
-#define __MPC8240_PCI
+#ifndef __MPC824X_PCI
+#define __MPC824X_PCI
 
 /*
- * PCI Configuration space Library and constants for MPC8240 based
+ * PCI Configuration space Library and constants for MPC824x based
  * systems.
  */
 
@@ -299,4 +299,4 @@ int pci_config_modb(int b, int d, int f, int offset,
 unsigned int pci_size_bar(unsigned int, unsigned long mask);
 #endif	/* _ASMLANGUAGE */
 
-#endif /* __MPC8240_PCI */
+#endif /* __MPC824X_PCI */
diff --git a/board/mousse/ppcboot.lds b/board/mousse/ppcboot.lds
index 3ab75dd..163e5fd 100644
--- a/board/mousse/ppcboot.lds
+++ b/board/mousse/ppcboot.lds
@@ -53,8 +53,8 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8240/start.o	(.text)
-	 common/board.o (.text)
+    cpu/mpc824x/start.o	(.text)
+    common/board.o (.text)
     ppc/ppcstring.o	(.text)
     ppc/vsprintf.o	(.text)
     ppc/crc32.o		(.text)
diff --git a/board/mousse/ppcboot.lds.ram b/board/mousse/ppcboot.lds.ram
index 1e4b417..9166c9c 100644
--- a/board/mousse/ppcboot.lds.ram
+++ b/board/mousse/ppcboot.lds.ram
@@ -38,7 +38,7 @@ SECTIONS
   PROVIDE(_f_init_rom = .);
 
   .init : {
-      cpu/mpc8240/start.o	(.text)
+      cpu/mpc824x/start.o	(.text)
       *(.init)
   } > ram
   _init_size = SIZEOF(.init);
diff --git a/board/mousse/ppcboot.lds.rom b/board/mousse/ppcboot.lds.rom
index 763a5d3..9d8187e 100644
--- a/board/mousse/ppcboot.lds.rom
+++ b/board/mousse/ppcboot.lds.rom
@@ -53,7 +53,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8240/start.o	(.text)
+    cpu/mpc824x/start.o	(.text)
 	 common/board.o (.text)
     ppc/ppcstring.o	(.text)
     ppc/vsprintf.o	(.text)
diff --git a/board/mousse/speed.c b/board/mousse/speed.c
index d482122..7cbd660 100644
--- a/board/mousse/speed.c
+++ b/board/mousse/speed.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 
 
@@ -39,7 +39,7 @@ ulong get_bus_freq(ulong ignore)
 
 /* Table to convert pllratio to actual processor clock scaling factor (*10)
  */
-#ifdef CONFIG_MPC8240
+#ifdef CONFIG_MPC824X
 short pllratio_to_factor[] = {
     00, 00, 00, 10, 20, 20, 25, 00, 00, 00, 00, 00, 00, 00, 00, 00,
     00, 00, 00, 10, 00, 00, 00, 45, 60, 00, 40, 00, 00, 00, 35, 00,
@@ -50,9 +50,9 @@ ulong get_gclk_freq(void)
 {
 	uint hid1 = mfspr(HID1);
 
-#ifdef CONFIG_MPC8240
+#ifdef CONFIG_MPC824X
 
-		/* 5 bits for PLL ration on 8240
+		/* 5 bits for PLL ration on 824x
 		 */
 	hid1 = (hid1 >> (32-5)) & 0x1f;
 #else
diff --git a/board/sandpoint/early_init.S b/board/sandpoint/early_init.S
index 1e31a54..127bd37 100644
--- a/board/sandpoint/early_init.S
+++ b/board/sandpoint/early_init.S
@@ -27,7 +27,7 @@
 
 #include <config.h>
 #include <asm/processor.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <ppc_asm.tmpl>
 
 #if defined(USE_DINK32)
diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c
index fca0183..a1272a3 100644
--- a/board/sandpoint/flash.c
+++ b/board/sandpoint/flash.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 #include <asm/pci_io.h>
 #include "w83c553f.h"
diff --git a/board/sandpoint/interrupts.c b/board/sandpoint/interrupts.c
index 8a3e8b1..b35bb9a 100644
--- a/board/sandpoint/interrupts.c
+++ b/board/sandpoint/interrupts.c
@@ -23,7 +23,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 
 
diff --git a/board/sandpoint/ns87308.c b/board/sandpoint/ns87308.c
index c822307..1da0f54 100644
--- a/board/sandpoint/ns87308.c
+++ b/board/sandpoint/ns87308.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include "ns87308.h"
 #include "ns16550.h"		/* to configure the 87308's internal 16550's */
 #include <asm/mc146818rtc.h>	/* to configure 87308's RTC */
diff --git a/board/sandpoint/ppcboot.lds b/board/sandpoint/ppcboot.lds
index 2d654a4..3241bed 100644
--- a/board/sandpoint/ppcboot.lds
+++ b/board/sandpoint/ppcboot.lds
@@ -53,7 +53,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8240/start.o	(.text)
+    cpu/mpc824x/start.o	(.text)
 		common/board.o (.text)
     ppc/ppcstring.o	(.text)
     ppc/vsprintf.o	(.text)
diff --git a/board/sandpoint/ppcboot.lds.mw.debug b/board/sandpoint/ppcboot.lds.mw.debug
index 59fc9a2..a0378cb 100644
--- a/board/sandpoint/ppcboot.lds.mw.debug
+++ b/board/sandpoint/ppcboot.lds.mw.debug
@@ -38,7 +38,7 @@ SECTIONS
   PROVIDE(_f_init_rom = .);
 
   .init : {
-      cpu/mpc8240/start.o	(.text)
+      cpu/mpc824x/start.o	(.text)
       *(.init)
   } > ram
   _init_size = SIZEOF(.init);
diff --git a/board/sandpoint/sandpoint.c b/board/sandpoint/sandpoint.c
index 9d5e57c..c20f7a4 100644
--- a/board/sandpoint/sandpoint.c
+++ b/board/sandpoint/sandpoint.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 
 int checkboard (void)
 {
diff --git a/board/sandpoint/speed.c b/board/sandpoint/speed.c
index 5549eb9..3a8aa8f 100644
--- a/board/sandpoint/speed.c
+++ b/board/sandpoint/speed.c
@@ -22,7 +22,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 #include "speed.h"
 
@@ -64,7 +64,7 @@ ulong get_bus_freq (ulong ignore)
  * figure it out from the hardware book
  */
 
-#ifdef CONFIG_MPC8240
+#ifdef CONFIG_MPC824X
 const unsigned char pllratio_to_factor[32] = {
     0, 0, 0, 2, 4, 4, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 2, 0, 0, 0, 9, 6, 0, 8, 0, 0, 0, 7, 0
@@ -77,8 +77,8 @@ ulong get_gclk_freq (void)
 {
    uint hid1;
    hid1 = mfspr(HID1);
-   #ifdef CONFIG_MPC8240
-   hid1 = (hid1 >> (32-5)) & 0x1f; /* 5 bits for PLL ration on 8240*/
+   #ifdef CONFIG_MPC824X
+   hid1 = (hid1 >> (32-5)) & 0x1f; /* 5 bits for PLL ration on 824x */
    #else
    hid1 = (hid1 >> (32-4)) & 0xf; /* 4 bits on everythings else*/
    #endif
diff --git a/common/board.c b/common/board.c
index 270f034..9b8f70e 100644
--- a/common/board.c
+++ b/common/board.c
@@ -579,7 +579,7 @@ void    board_init_r  (bd_t *bd, ulong dest_addr)
 
     WATCHDOG_RESET();
 
-#if defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || defined (CONFIG_FLAGADM))
+#if defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || defined (CONFIG_FLAGADM)
     icache_enable();	/* it's time to enable the instruction cache */
 #endif
 
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 2612453..19e98ee 100644
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -61,7 +61,7 @@ void bedbug_init( void )
   bedbug860_init();
 #endif
 
-#if defined(CONFIG_MPC8240) || defined(CONFIG_MPC8260)
+#if defined(CONFIG_MPC824X) || defined(CONFIG_MPC8260)
   /* Processors that are 603e core based */
   void bedbug603e_init( void );
   
diff --git a/cpu/mpc8240/Makefile b/cpu/mpc824x/Makefile
similarity index 100%
rename from cpu/mpc8240/Makefile
rename to cpu/mpc824x/Makefile
diff --git a/cpu/mpc8240/config.mk b/cpu/mpc824x/config.mk
similarity index 93%
rename from cpu/mpc8240/config.mk
rename to cpu/mpc824x/config.mk
index a4b18cd..f3087ec 100644
--- a/cpu/mpc8240/config.mk
+++ b/cpu/mpc824x/config.mk
@@ -23,4 +23,4 @@
 
 PLATFORM_RELFLAGS += -mrelocatable -ffixed-r14 -meabi
 
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8240 -ffixed-r2 -mstring -mcpu=603e -msoft-float
+PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
diff --git a/cpu/mpc8240/cpu.c b/cpu/mpc824x/cpu.c
similarity index 90%
rename from cpu/mpc8240/cpu.c
rename to cpu/mpc824x/cpu.c
index 035ad82..5d59b32 100644
--- a/cpu/mpc8240/cpu.c
+++ b/cpu/mpc824x/cpu.c
@@ -21,7 +21,8 @@
  * MA 02111-1307 USA
  */
 
-#include <mpc8240.h>
+#include <config.h>
+#include <mpc824x.h>
 #include <ppcboot.h>
 #include <command.h>
 
@@ -38,6 +39,10 @@ int checkcpu(long clock)
       printf("MPC8240");
       break;
 
+    case CPU_TYPE_8245:
+      printf("MPC8245");
+      break;
+
     default:
       return -1; /*not valid for this source*/
   }
@@ -135,7 +140,7 @@ unsigned long get_tbclk (void)
 /* ------------------------------------------------------------------------- */
 
 /*
- * The MPC8240 has an integrated PCI controller known as the MPC107.
+ * The MPC824x has an integrated PCI controller known as the MPC107.
  * The following are MPC107 Bridge Controller and PCI Support functions
  *
  */
@@ -147,7 +152,7 @@ unsigned long get_tbclk (void)
  *  before returning to the caller.     
  */
 unsigned int
-mpc8240_mpc107_getreg(unsigned int regNum)
+mpc824x_mpc107_getreg(unsigned int regNum)
 {
   unsigned int temp;
   /* swap the addr. to little endian */
@@ -162,7 +167,7 @@ mpc8240_mpc107_getreg(unsigned int regNum)
  */
 
 void
-mpc8240_mpc107_setreg(unsigned int regNum, unsigned int regVal)
+mpc824x_mpc107_setreg(unsigned int regNum, unsigned int regVal)
 {
     /* swap the addr. to little endian */
     *(volatile unsigned int *)CHRP_REG_ADDR = PCISWAP(regNum);
@@ -175,7 +180,7 @@ mpc8240_mpc107_setreg(unsigned int regNum, unsigned int regVal)
  *  Write a byte (8 bits) to a memory location.
  */
 void
-mpc8240_mpc107_write8(unsigned int addr, unsigned char data)
+mpc824x_mpc107_write8(unsigned int addr, unsigned char data)
 {
   *(unsigned char*)addr = data;
   __asm__("sync");
@@ -186,7 +191,7 @@ mpc8240_mpc107_write8(unsigned int addr, unsigned char data)
  */
 
 void
-mpc8240_mpc107_write16(unsigned int address, unsigned short data)
+mpc824x_mpc107_write16(unsigned int address, unsigned short data)
 {
   *(volatile unsigned short *)address = BYTE_SWAP_16_BIT(data);  
   __asm__("sync");
@@ -198,7 +203,7 @@ mpc8240_mpc107_write16(unsigned int address, unsigned short data)
  */
 
 void
-mpc8240_mpc107_write32(unsigned int address, unsigned int data)
+mpc824x_mpc107_write32(unsigned int address, unsigned int data)
 {
   *(volatile unsigned int *)address = LONGSWAP(data); 
   __asm__("sync");
@@ -208,7 +213,7 @@ mpc8240_mpc107_write32(unsigned int address, unsigned int data)
  *  Read a byte (8 bits) from a memory location.
  */
 unsigned char
-mpc8240_mpc107_read8(unsigned int addr)
+mpc824x_mpc107_read8(unsigned int addr)
 {
   return *(volatile unsigned char*)addr;
 }
@@ -219,7 +224,7 @@ mpc8240_mpc107_read8(unsigned int addr)
  *  value before returning to the caller.
  */
 unsigned short
-mpc8240_mpc107_read16(unsigned int address)
+mpc824x_mpc107_read16(unsigned int address)
 {
   unsigned short retVal;
   retVal = BYTE_SWAP_16_BIT(*(unsigned short*)address);
@@ -232,7 +237,7 @@ mpc8240_mpc107_read16(unsigned int address)
  *  swap the value before returning to the caller.     
  */
 unsigned int
-mpc8240_mpc107_read32(unsigned int address)
+mpc824x_mpc107_read32(unsigned int address)
 {
     unsigned int retVal;
     retVal = LONGSWAP(*(unsigned int *)address);
@@ -251,7 +256,7 @@ mpc8240_mpc107_read32(unsigned int address)
  */
 
 unsigned int
-mpc8240_eummbar_read(unsigned int regNum)
+mpc824x_eummbar_read(unsigned int regNum)
 {
     unsigned int temp;
     temp = *(volatile unsigned int *) (EUMBBAR_VAL + regNum) ;
@@ -271,7 +276,7 @@ mpc8240_eummbar_read(unsigned int regNum)
  */
 
 void
-mpc8240_eummbar_write(unsigned int regNum, unsigned int regVal)
+mpc824x_eummbar_write(unsigned int regNum, unsigned int regVal)
 {
     *(volatile unsigned int *) (EUMBBAR_VAL + regNum) = PCISWAP(regVal);
     return;
diff --git a/cpu/mpc8240/cpu_init.c b/cpu/mpc824x/cpu_init.c
similarity index 75%
rename from cpu/mpc8240/cpu_init.c
rename to cpu/mpc824x/cpu_init.c
index ac6d6fc..26b314b 100644
--- a/cpu/mpc8240/cpu_init.c
+++ b/cpu/mpc824x/cpu_init.c
@@ -23,7 +23,7 @@
 
 #include <ppcboot.h>
 #include <asm/processor.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 
 /*
  * Breath some life into the CPU...
@@ -40,13 +40,34 @@ cpu_init_f (void)
     CONFIG_WRITE_HALFWORD(PCICR, 0x06); /* Bus Master, respond to PCI memory space acesses*/
 /*    CONFIG_WRITE_HALFWORD(PCISR, 0xffff); */ /*reset PCISR*/
 
+#if defined(CONFIG_MPC8245)
+    CONFIG_WRITE_BYTE(PCLSR, 0x8);	/* set cache line size */
+    /* clear then set then clear the memory DLL */
+    CONFIG_READ_BYTE (AMBOR, val);
+    CONFIG_WRITE_BYTE(AMBOR, val & 0xDF);
+    CONFIG_WRITE_BYTE(AMBOR, val | 0x20);
+    CONFIG_WRITE_BYTE(AMBOR, val & 0xDF);
+#endif
+
     CONFIG_READ_WORD(PICR1, val);
+#if defined(CONFIG_MPC8240)
     CONFIG_WRITE_WORD( PICR1,
        (val & (PICR1_ADDRESS_MAP | PICR1_RCS0)) |
 	       PIRC1_MSK | PICR1_PROC_TYPE_603E |
 	       PICR1_FLASH_WR_EN | PICR1_MCP_EN |
 	       PICR1_CF_DPARK | PICR1_EN_PCS |
 	       PICR1_CF_APARK );
+#elif defined(CONFIG_MPC8245)
+    CONFIG_WRITE_WORD( PICR1,
+       (val & (PICR1_RCS0)) |
+	       PICR1_PROC_TYPE_603E |
+	       PICR1_FLASH_WR_EN | PICR1_MCP_EN |
+	       PICR1_CF_DPARK | PICR1_NO_BUSW_CK |
+	       PICR1_DEC| PICR1_CF_APARK );
+#else
+#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
+#endif
+
     CONFIG_READ_WORD(PICR2, val);
     val= val & ~ (PICR2_CF_SNOOP_WS_MASK | PICR2_CF_APHASE_WS_MASK); /*mask off waitstate bits*/
     CONFIG_WRITE_WORD(PICR2, val | PICR2_CF_SNOOP_WS_1WS | PICR2_CF_APHASE_WS_1WS); /*1 wait state*/
@@ -57,33 +78,57 @@ cpu_init_f (void)
 #endif
 
     CONFIG_WRITE_WORD(MCCR2, CFG_REFINT << MCCR2_REFINT_SHIFT);
-
+#if defined(CONFIG_MPC8240)
     CONFIG_WRITE_WORD(MCCR3,
 	(((CFG_BSTOPRE & 0x003c) >> 2) << MCCR3_BSTOPRE2TO5_SHIFT) |
 	(CFG_REFREC << MCCR3_REFREC_SHIFT) |
 	(CFG_RDLAT  << MCCR3_RDLAT_SHIFT));
+#elif defined(CONFIG_MPC8245)
+    CONFIG_WRITE_WORD(MCCR3,
+	(((CFG_BSTOPRE & 0x003c) >> 2) << MCCR3_BSTOPRE2TO5_SHIFT) |
+	(CFG_REFREC << MCCR3_REFREC_SHIFT));
+#else
+#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
+#endif
 
-#ifdef CONFIG_CU824
-    CONFIG_WRITE_WORD(MCCR4,
+/* this is gross.  We think these should all be the same, and various boards
+ *  should define CFG_ACTORW to 0 if they don't want to set it, or even, if
+ *  its not set, we define it to zero in this file
+ */
+#if defined(CONFIG_CU824)
+	CONFIG_WRITE_WORD(MCCR4,
 	(CFG_PRETOACT << MCCR4_PRETOACT_SHIFT) |
 	(CFG_ACTTOPRE << MCCR4_ACTTOPRE_SHIFT) |
 	MCCR4_BIT21 |
 	(CFG_REGISTERD_TYPE_BUFFER ? MCCR4_REGISTERED: 0) |
 	((CFG_BSTOPRE & 0x0003) <<MCCR4_BSTOPRE0TO1_SHIFT ) |
 	(((CFG_SDMODE_CAS_LAT <<4) | (CFG_SDMODE_WRAP <<3) |
-	      CFG_SDMODE_BURSTLEN) << MCCR4_SDMODE_SHIFT) |
+		  CFG_SDMODE_BURSTLEN) << MCCR4_SDMODE_SHIFT) |
 	(CFG_ACTORW << MCCR4_ACTTORW_SHIFT) |
 	(((CFG_BSTOPRE & 0x03c0) >> 6) << MCCR4_BSTOPRE6TO9_SHIFT));
-#else
-    CONFIG_WRITE_WORD(MCCR4,
+#elif defined(CONFIG_MPC8240)
+	CONFIG_WRITE_WORD(MCCR4,
 	(CFG_PRETOACT << MCCR4_PRETOACT_SHIFT) |
 	(CFG_ACTTOPRE << MCCR4_ACTTOPRE_SHIFT) |
 	MCCR4_BIT21 |
 	(CFG_REGISTERD_TYPE_BUFFER ? MCCR4_REGISTERED: 0) |
 	((CFG_BSTOPRE & 0x0003) <<MCCR4_BSTOPRE0TO1_SHIFT ) |
-	(((CFG_SDMODE_CAS_LAT <<4) | (CFG_SDMODE_WRAP <<3) | (CFG_SDMODE_BURSTLEN))
-		<<MCCR4_SDMODE_SHIFT) |
-	((CFG_BSTOPRE & 0x03c0) <<MCCR4_BSTOPRE6TO9_SHIFT ));
+	(((CFG_SDMODE_CAS_LAT <<4) | (CFG_SDMODE_WRAP <<3) | 
+		  (CFG_SDMODE_BURSTLEN)) <<MCCR4_SDMODE_SHIFT) |
+	(((CFG_BSTOPRE & 0x03c0) >> 6) <<MCCR4_BSTOPRE6TO9_SHIFT ));
+#elif defined(CONFIG_MPC8245)
+    CONFIG_WRITE_WORD(MCCR4,
+	(CFG_PRETOACT << MCCR4_PRETOACT_SHIFT) |
+	(CFG_ACTTOPRE << MCCR4_ACTTOPRE_SHIFT) |
+	MCCR4_EXTROM | MCCR4_REGDIMM |
+	(CFG_REGISTERD_TYPE_BUFFER ? MCCR4_REGISTERED: 0) |
+	((CFG_BSTOPRE & 0x0003) <<MCCR4_BSTOPRE0TO1_SHIFT ) |
+	(((CFG_SDMODE_CAS_LAT <<4) | (CFG_SDMODE_WRAP <<3) | 
+	      (CFG_SDMODE_BURSTLEN)) <<MCCR4_SDMODE_SHIFT) |
+	(CFG_ACTORW << MCCR4_ACTTORW_SHIFT) |
+	(((CFG_BSTOPRE & 0x03c0) >> 6) <<MCCR4_BSTOPRE6TO9_SHIFT ));
+#else
+#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
 #endif
 
     CONFIG_WRITE_WORD(MSAR1,
@@ -138,6 +183,10 @@ cpu_init_f (void)
 	(CFG_BANK6_ENABLE << 6) |
 	(CFG_BANK7_ENABLE << 7));
 
+#ifdef CONFIG_MPC8245
+    CONFIG_WRITE_BYTE(MPMR, CFG_PGMAX)
+#endif
+
     /* ! Wait 200us before initialize other registers */
     /*FIXME: write a decent udelay wait */
     __asm__ __volatile__(
@@ -165,13 +214,13 @@ struct MPC107_s{
     {BMC_BASE+0x8,  "MPC107 Revision"},
     {BMC_BASE+0xC,  "MPC107 Cache Line Size"},
     {BMC_BASE+0x10, "MPC107 LMBAR"},
-    {BMC_BASE+0x14, "MPC8240 PCSR"},
-    {BMC_BASE+0xA8, "MPC8240 PICR1"},
-    {BMC_BASE+0xAC, "MPC8240 PICR2"},
-    {BMC_BASE+0x46, "MPC8240 PACR"},
-    {BMC_BASE+0x310, "MPC8240 ITWR"},
-    {BMC_BASE+0x300, "MPC8240 OMBAR"},
-    {BMC_BASE+0x308, "MPC8240 OTWR"},
+    {BMC_BASE+0x14, "MPC824x PCSR"},
+    {BMC_BASE+0xA8, "MPC824x PICR1"},
+    {BMC_BASE+0xAC, "MPC824x PICR2"},
+    {BMC_BASE+0x46, "MPC824x PACR"},
+    {BMC_BASE+0x310, "MPC824x ITWR"},
+    {BMC_BASE+0x300, "MPC824x OMBAR"},
+    {BMC_BASE+0x308, "MPC824x OTWR"},
     {BMC_BASE+0x14, "MPC107 Peripheral Control and Status Register"},
     {BMC_BASE+0x78, "MPC107 EUMBAR"},
     {BMC_BASE+0xC0, "MPC107 Processor Bus Error Status"},
@@ -202,21 +251,23 @@ cpu_init_r  (bd_t *bd)
    * This is necessary before the EPIC, DMA ctlr, I2C ctlr, etc. can
    * be accessed.
    */
-  mpc8240_mpc107_setreg(EUMBBAR, EUMBBAR_VAL);
 
+#ifdef CONFIG_MPC8240	/* only on MPC8240 */
+  mpc824x_mpc107_setreg(EUMBBAR, EUMBBAR_VAL);
   /* MOT/SPS: Issue #10002, PCI (FD Alias enable)*/
-  mpc8240_mpc107_setreg(AMBOR, 0x000000C0);
+  mpc824x_mpc107_setreg(AMBOR, 0x000000C0);
+#endif
 
 
 #ifdef INCLUDE_MPC107_REPORT
-  /* Check MPC8240 PCI Device and Vendor ID */
-  while((tmp = mpc8240_mpc107_getreg(BMC_BASE)) != 0x31057){
+  /* Check MPC824x PCI Device and Vendor ID */
+  while((tmp = mpc824x_mpc107_getreg(BMC_BASE)) != 0x31057){
       printf("	MPC107: offset=0x%x, val = 0x%x\n", BMC_BASE, tmp);
   }
 
   for( i = 0; i < N_MPC107_Regs; i++){
       printf("	0x%x/%s = 0x%x\n", MPC107Regs[i].iobase,
-	     MPC107Regs[i].desc, mpc8240_mpc107_getreg(MPC107Regs[i].iobase));
+	     MPC107Regs[i].desc, mpc824x_mpc107_getreg(MPC107Regs[i].iobase));
   }
 
   printf("IBAT0L = 0x%08X\n", mfspr(IBAT0L));
diff --git a/cpu/mpc8240/drivers/dma/Makefile b/cpu/mpc824x/drivers/dma/Makefile
similarity index 100%
rename from cpu/mpc8240/drivers/dma/Makefile
rename to cpu/mpc824x/drivers/dma/Makefile
diff --git a/cpu/mpc8240/drivers/dma/Makefile_pc b/cpu/mpc824x/drivers/dma/Makefile_pc
similarity index 100%
rename from cpu/mpc8240/drivers/dma/Makefile_pc
rename to cpu/mpc824x/drivers/dma/Makefile_pc
diff --git a/cpu/mpc8240/drivers/dma/README b/cpu/mpc824x/drivers/dma/README
similarity index 100%
rename from cpu/mpc8240/drivers/dma/README
rename to cpu/mpc824x/drivers/dma/README
diff --git a/cpu/mpc8240/drivers/dma/dma.h b/cpu/mpc824x/drivers/dma/dma.h
similarity index 100%
rename from cpu/mpc8240/drivers/dma/dma.h
rename to cpu/mpc824x/drivers/dma/dma.h
diff --git a/cpu/mpc8240/drivers/dma/dma1.c b/cpu/mpc824x/drivers/dma/dma1.c
similarity index 100%
rename from cpu/mpc8240/drivers/dma/dma1.c
rename to cpu/mpc824x/drivers/dma/dma1.c
diff --git a/cpu/mpc8240/drivers/dma/dma2.S b/cpu/mpc824x/drivers/dma/dma2.S
similarity index 100%
rename from cpu/mpc8240/drivers/dma/dma2.S
rename to cpu/mpc824x/drivers/dma/dma2.S
diff --git a/cpu/mpc8240/drivers/dma/dma_export.h b/cpu/mpc824x/drivers/dma/dma_export.h
similarity index 100%
rename from cpu/mpc8240/drivers/dma/dma_export.h
rename to cpu/mpc824x/drivers/dma/dma_export.h
diff --git a/cpu/mpc8240/drivers/dma_export.h b/cpu/mpc824x/drivers/dma_export.h
similarity index 100%
rename from cpu/mpc8240/drivers/dma_export.h
rename to cpu/mpc824x/drivers/dma_export.h
diff --git a/cpu/mpc8240/drivers/epic.h b/cpu/mpc824x/drivers/epic.h
similarity index 100%
rename from cpu/mpc8240/drivers/epic.h
rename to cpu/mpc824x/drivers/epic.h
diff --git a/cpu/mpc8240/drivers/epic/README b/cpu/mpc824x/drivers/epic/README
similarity index 100%
rename from cpu/mpc8240/drivers/epic/README
rename to cpu/mpc824x/drivers/epic/README
diff --git a/cpu/mpc8240/drivers/epic/epic.h b/cpu/mpc824x/drivers/epic/epic.h
similarity index 100%
rename from cpu/mpc8240/drivers/epic/epic.h
rename to cpu/mpc824x/drivers/epic/epic.h
diff --git a/cpu/mpc8240/drivers/epic/epic1.c b/cpu/mpc824x/drivers/epic/epic1.c
similarity index 99%
rename from cpu/mpc8240/drivers/epic/epic1.c
rename to cpu/mpc824x/drivers/epic/epic1.c
index c5333d5..2050bb8 100644
--- a/cpu/mpc8240/drivers/epic/epic1.c
+++ b/cpu/mpc824x/drivers/epic/epic1.c
@@ -3,7 +3,7 @@
  * copyright @ motorola, 1999
  *
  *************************************************/
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <ppcboot.h>
 #include "epic.h"
 
diff --git a/cpu/mpc8240/drivers/epic/epic2.S b/cpu/mpc824x/drivers/epic/epic2.S
similarity index 100%
rename from cpu/mpc8240/drivers/epic/epic2.S
rename to cpu/mpc824x/drivers/epic/epic2.S
diff --git a/cpu/mpc8240/drivers/epic/epicutil.S b/cpu/mpc824x/drivers/epic/epicutil.S
similarity index 100%
rename from cpu/mpc8240/drivers/epic/epicutil.S
rename to cpu/mpc824x/drivers/epic/epicutil.S
diff --git a/cpu/mpc8240/drivers/errors.h b/cpu/mpc824x/drivers/errors.h
similarity index 100%
rename from cpu/mpc8240/drivers/errors.h
rename to cpu/mpc824x/drivers/errors.h
diff --git a/cpu/mpc8240/drivers/i2c/Makefile b/cpu/mpc824x/drivers/i2c/Makefile
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/Makefile
rename to cpu/mpc824x/drivers/i2c/Makefile
diff --git a/cpu/mpc8240/drivers/i2c/Makefile_pc b/cpu/mpc824x/drivers/i2c/Makefile_pc
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/Makefile_pc
rename to cpu/mpc824x/drivers/i2c/Makefile_pc
diff --git a/cpu/mpc8240/drivers/i2c/README b/cpu/mpc824x/drivers/i2c/README
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/README
rename to cpu/mpc824x/drivers/i2c/README
diff --git a/cpu/mpc8240/drivers/i2c/i2c.h b/cpu/mpc824x/drivers/i2c/i2c.h
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/i2c.h
rename to cpu/mpc824x/drivers/i2c/i2c.h
diff --git a/cpu/mpc8240/drivers/i2c/i2c1.c b/cpu/mpc824x/drivers/i2c/i2c1.c
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/i2c1.c
rename to cpu/mpc824x/drivers/i2c/i2c1.c
diff --git a/cpu/mpc8240/drivers/i2c/i2c2.S b/cpu/mpc824x/drivers/i2c/i2c2.S
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/i2c2.S
rename to cpu/mpc824x/drivers/i2c/i2c2.S
diff --git a/cpu/mpc8240/drivers/i2c/i2c_export.h b/cpu/mpc824x/drivers/i2c/i2c_export.h
similarity index 100%
rename from cpu/mpc8240/drivers/i2c/i2c_export.h
rename to cpu/mpc824x/drivers/i2c/i2c_export.h
diff --git a/cpu/mpc8240/drivers/i2c_export.h b/cpu/mpc824x/drivers/i2c_export.h
similarity index 100%
rename from cpu/mpc8240/drivers/i2c_export.h
rename to cpu/mpc824x/drivers/i2c_export.h
diff --git a/cpu/mpc8240/drivers/i2o.h b/cpu/mpc824x/drivers/i2o.h
similarity index 100%
rename from cpu/mpc8240/drivers/i2o.h
rename to cpu/mpc824x/drivers/i2o.h
diff --git a/cpu/mpc8240/drivers/i2o/Makefile b/cpu/mpc824x/drivers/i2o/Makefile
similarity index 100%
rename from cpu/mpc8240/drivers/i2o/Makefile
rename to cpu/mpc824x/drivers/i2o/Makefile
diff --git a/cpu/mpc8240/drivers/i2o/Makefile_pc b/cpu/mpc824x/drivers/i2o/Makefile_pc
similarity index 100%
rename from cpu/mpc8240/drivers/i2o/Makefile_pc
rename to cpu/mpc824x/drivers/i2o/Makefile_pc
diff --git a/cpu/mpc8240/drivers/i2o/i2o.h b/cpu/mpc824x/drivers/i2o/i2o.h
similarity index 100%
rename from cpu/mpc8240/drivers/i2o/i2o.h
rename to cpu/mpc824x/drivers/i2o/i2o.h
diff --git a/cpu/mpc8240/drivers/i2o/i2o1.c b/cpu/mpc824x/drivers/i2o/i2o1.c
similarity index 100%
rename from cpu/mpc8240/drivers/i2o/i2o1.c
rename to cpu/mpc824x/drivers/i2o/i2o1.c
diff --git a/cpu/mpc8240/drivers/i2o/i2o2.S b/cpu/mpc824x/drivers/i2o/i2o2.S
similarity index 100%
rename from cpu/mpc8240/drivers/i2o/i2o2.S
rename to cpu/mpc824x/drivers/i2o/i2o2.S
diff --git a/cpu/mpc8240/interrupts.c b/cpu/mpc824x/interrupts.c
similarity index 99%
rename from cpu/mpc8240/interrupts.c
rename to cpu/mpc824x/interrupts.c
index f405461..b78c0c3 100644
--- a/cpu/mpc8240/interrupts.c
+++ b/cpu/mpc824x/interrupts.c
@@ -23,7 +23,7 @@
  */
 
 #include <ppcboot.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include <asm/processor.h>
 #include <asm/pci_io.h>
 #include <commproc.h>
diff --git a/cpu/mpc8240/start.S b/cpu/mpc824x/start.S
similarity index 99%
rename from cpu/mpc8240/start.S
rename to cpu/mpc824x/start.S
index 9c0ed09..4fdca68 100644
--- a/cpu/mpc8240/start.S
+++ b/cpu/mpc824x/start.S
@@ -38,7 +38,7 @@
  * address and (s)dram will be positioned at address 0
  */
 #include <config.h>
-#include <mpc8240.h>
+#include <mpc824x.h>
 #include "version.h"
 
 #define _LINUX_CONFIG_H 1	/* avoid reading Linux autoconf.h file	*/
diff --git a/cpu/mpc8240/traps.c b/cpu/mpc824x/traps.c
similarity index 100%
rename from cpu/mpc8240/traps.c
rename to cpu/mpc824x/traps.c
diff --git a/cpu/mpc8260/bedbug_603e.c b/cpu/mpc8260/bedbug_603e.c
index 20be210..2c026b9 100644
--- a/cpu/mpc8260/bedbug_603e.c
+++ b/cpu/mpc8260/bedbug_603e.c
@@ -11,7 +11,7 @@
 #include <bedbug/regs.h>
 #include <bedbug/ppc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) && (defined(CONFIG_MPC8240) || defined(CONFIG_MPC8260))
+#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) && (defined(CONFIG_MPC824X) || defined(CONFIG_MPC8260))
 
 #define MAX_BREAK_POINTS 1
 
diff --git a/include/config_CU824.h b/include/config_CU824.h
index 7f02619..2b9782f 100644
--- a/include/config_CU824.h
+++ b/include/config_CU824.h
@@ -41,6 +41,7 @@
  * (easy to change)
  */
 
+#define CONFIG_MPC824X		1
 #define CONFIG_MPC8240		1
 #define CONFIG_CU824		1
 
diff --git a/include/config_MOUSSE.h b/include/config_MOUSSE.h
index 0c2619c..8ffccd8 100644
--- a/include/config_MOUSSE.h
+++ b/include/config_MOUSSE.h
@@ -45,6 +45,7 @@
  * (easy to change)
  */
 
+#define CONFIG_MPC824X      1
 #define CONFIG_MPC8240      1
 #define CONFIG_MOUSSE       1
 #define CFG_ADDR_MAP_B      1
diff --git a/include/config_Sandpoint8240.h b/include/config_Sandpoint8240.h
index 44a79c0..f49c468 100644
--- a/include/config_Sandpoint8240.h
+++ b/include/config_Sandpoint8240.h
@@ -35,6 +35,7 @@
  * (easy to change)
  */
 
+#define CONFIG_MPC824X		1
 #define CONFIG_MPC8240		1
 #define CONFIG_SANDPOINT	1
 #define USE_DINK32		1
diff --git a/include/mpc8240.h b/include/mpc824x.h
old mode 100755
new mode 100644
similarity index 91%
rename from include/mpc8240.h
rename to include/mpc824x.h
index 2500617..dc52bef
--- a/include/mpc8240.h
+++ b/include/mpc824x.h
@@ -21,9 +21,10 @@
  * MA 02111-1307 USA
  */
 
-#ifndef __MPC8240_H__
-#define __MPC8240_H__
+#ifndef __MPC824X_H__
+#define __MPC824X_H__
 
+#include <config.h>
 
 /* CPU Types */
 #define CPU_TYPE_601		0x01		/* PPC 601 CPU */
@@ -36,7 +37,8 @@
 #define CPU_TYPE_604R		0x0a		/* PPC 604r CPU */
 #define CPU_TYPE_750		0x08		/* PPC 750  CPU */
 #define CPU_TYPE_8240		0x81		/* PPC 8240 CPU */
-#define _CACHE_ALIGN_SIZE	32	/* cache line size */
+#define CPU_TYPE_8245		0x8081		/* PPC 8245 CPU */
+#define _CACHE_ALIGN_SIZE	32			/* cache line size */
 
 /* spr976 - DMISS data tlb miss address register 
  * spr977 - DCMP data tlb miss compare register 
@@ -235,6 +237,10 @@
 #define PMCR2		0x80000072  /* Power management config. 2 */
 #define ODCR		0x80000073  /* Output Driver Control Register */
 #define CLKDCR		0x80000074  /* CLK Driver Control Register */
+#ifdef CONFIG_MPC8245
+#define MIOCR1		0x80000076  /* Miscellaneous I/O Control Register 1 */
+#define MIOCR2		0x80000077  /* Miscellaneous I/O Control Register 2 */
+#endif
 #define EUMBBAR		0x80000078  /* Embedded Utilities Memory Block Base Address Register */
 #define EUMBBAR_VAL	0x80500000  /* PCI Relocation offset for EUMB region */
 #define EUMBSIZE	0x00100000  /* Size of EUMB region */
@@ -271,15 +277,24 @@
 #define PICR1_CF_APARK		0x00000008
 #define PICR1_LE_MODE		0x00000020
 #define PICR1_ST_GATH_EN	0x00000040
+#if defined(CONFIG_MPC8240)
 #define PICR1_EN_PCS		0x00000080 /* according to dink code, sets the 8240 to handle pci config space */
+#elif defined(CONFIG_MPC8241) || defined(CONFIG_MPC8245)
+#define PICR1_NO_BUSW_CK	0x00000080 /* no bus width check for flash writes */
+#define PICR1_DEC			0x00000100 /* Time Base enable on 8245/8241 */
+#else
+#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
+#endif
 #define PICR1_CF_DPARK		0x00000200
 #define PICR1_MCP_EN		0x00000800
 #define PICR1_FLASH_WR_EN	0x00001000
+#ifdef CONFIG_MPC8240
 #define PICR1_ADDRESS_MAP	0x00010000
+#define PIRC1_MSK		0xff000000
+#endif
 #define PICR1_PROC_TYPE_MSK	0x00060000
 #define PICR1_PROC_TYPE_603E	0x00040000
 #define PICR1_RCS0		0x00100000
-#define PIRC1_MSK		0xff000000
 
 #define PICR2_CF_SNOOP_WS_MASK	0x000c0000
 #define PICR2_CF_SNOOP_WS_0WS	0x00000000
@@ -296,10 +311,17 @@
 #define MCCR1_ROMNAL_MSK	0xf0000000
 #define MCCR1_ROMFAL_SHIFT	23
 #define MCCR1_ROMFAL_MSK	0x0f800000
+#define MCCR1_DBUS_SIZE0TO1_SHIFT  21
 #define MCCR1_BURST		0x00100000
 #define MCCR1_MEMGO		0x00080000
 #define MCCR1_SREN		0x00040000
+#if defined(CONFIG_MPC8240)
 #define MCCR1_RAM_TYPE		0x00020000
+#elif defined(CONFIG_MPC8245)
+#define MCCR1_SDRAM_EN		0x00020000
+#else
+#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
+#endif
 #define MCCR1_PCKEN		0x00010000
 
 #define MCCR2_TS_WAIT_TIMER_MSK 0xe0000000
@@ -312,8 +334,10 @@
 #define MCCR2_INLINE_PAR_NOT_ECC    0x00100000
 #define MCCR2_WRITE_PARITY_CHK	0x00080000
 #define MCCR2_INLFRD_PARECC_CHK_EN  0x00040000
+#ifdef CONFIG_MPC8240
 #define MCCR2_ECC_EN		0x00020000
 #define MCCR2_EDO		0x00010000
+#endif
 #define MCCR2_REFINT_MSK	0x0000fffc
 #define MCCR2_REFINT_SHIFT	2
 #define MCCR2_RSV_PG		0x00000002
@@ -323,6 +347,7 @@
 #define MCCR3_BSTOPRE2TO5_SHIFT 28
 #define MCCR3_REFREC_MSK	0x0f000000
 #define MCCR3_REFREC_SHIFT	24
+#ifdef CONFIG_MPC8240
 #define MCCR3_RDLAT_MSK		0x00f00000
 #define MCCR3_RDLAT_SHIFT	20
 #define MCCR3_CPX		0x00010000
@@ -338,6 +363,7 @@
 #define MCCR3_RCD2_SHIFT	3
 #define MCCR3_RP1_MSK		0x00000007
 #define MCCR3_RP1_SHIFT		0
+#endif 
 
 #define MCCR4_PRETOACT_MSK	0xf0000000
 #define MCCR4_PRETOACT_SHIFT	28
@@ -345,7 +371,13 @@
 #define MCCR4_ACTTOPRE_SHIFT	24
 #define MCCR4_WMODE		0x00800000
 #define MCCR4_INLINE		0x00400000
+#if defined(CONFIG_MPC8240)
 #define MCCR4_BIT21		0x00200000 /* this include cos DINK code sets it- unknown function*/
+#elif defined(CONFIG_MPC8245)
+#define MCCR4_EXTROM		0x00200000 /* enables Extended ROM space */
+#else
+#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
+#endif
 #define MCCR4_REGISTERED	0x00100000
 #define MCCR4_BSTOPRE0TO1_MSK	0x000c0000 /*BSTOPRE[0-1]*/
 #define MCCR4_BSTOPRE0TO1_SHIFT 18
@@ -356,6 +388,7 @@
 #define MCCR4_ACTTORW_SHIFT	4
 #define MCCR4_BSTOPRE6TO9_MSK	0x0000000f /*BSTOPRE[6-9]*/
 #define MCCR4_BSTOPRE6TO9_SHIFT 0
+#define MCCR4_DBUS_SIZE2_SHIFT	17
 
 #define MICR_ADDR_MASK		0x0ff00000
 #define MICR_ADDR_SHIFT		20
@@ -470,18 +503,18 @@
  * MPC107 Support
  *
  */
-unsigned int mpc8240_mpc107_getreg(unsigned int regNum);
-void mpc8240_mpc107_setreg(unsigned int regNum, unsigned int regVal);
-void mpc8240_mpc107_write8(unsigned int address, unsigned char data);
-void mpc8240_mpc107_write16(unsigned int address, unsigned short data);
-void mpc8240_mpc107_write32(unsigned int address, unsigned int data);
-unsigned char mpc8240_mpc107_read8(unsigned int address);
-unsigned short mpc8240_mpc107_read16(unsigned int address);
-unsigned int mpc8240_mpc107_read32(unsigned int address);
-unsigned int mpc8240_eummbar_read(unsigned int regNum);
-void mpc8240_eummbar_write(unsigned int regNum, unsigned int regVal);
+unsigned int mpc824x_mpc107_getreg(unsigned int regNum);
+void mpc824x_mpc107_setreg(unsigned int regNum, unsigned int regVal);
+void mpc824x_mpc107_write8(unsigned int address, unsigned char data);
+void mpc824x_mpc107_write16(unsigned int address, unsigned short data);
+void mpc824x_mpc107_write32(unsigned int address, unsigned int data);
+unsigned char mpc824x_mpc107_read8(unsigned int address);
+unsigned short mpc824x_mpc107_read16(unsigned int address);
+unsigned int mpc824x_mpc107_read32(unsigned int address);
+unsigned int mpc824x_eummbar_read(unsigned int regNum);
+void mpc824x_eummbar_write(unsigned int regNum, unsigned int regVal);
 unsigned long get_gclk_freq(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __MPC8240_H__ */
+#endif /* __MPC824X_H__ */
diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 29b1cda..0d9be0a 100644
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -96,7 +96,7 @@
 #define	r31	31
 
 
-#if defined(CONFIG_8xx) || defined(CONFIG_MPC8240)
+#if defined(CONFIG_8xx) || defined(CONFIG_MPC824X)
 
 /* Some special registers */
 
@@ -108,7 +108,7 @@
 #define LCTRL2	157	/* Load/Store Support	    (37-41) */
 #define ICTRL	158
 
-#endif	/* CONFIG_8xx, CONFIG_MPC8240 */
+#endif	/* CONFIG_8xx, CONFIG_MPC824X */
 
 #if defined(CONFIG_8xx)