]> git.sur5r.net Git - u-boot/commitdiff
Add support for CATcenter board (based on PPChameleon ME module)
authorwdenk <wdenk>
Thu, 13 May 2004 13:23:58 +0000 (13:23 +0000)
committerwdenk <wdenk>
Thu, 13 May 2004 13:23:58 +0000 (13:23 +0000)
CHANGELOG
Makefile
include/configs/CATcenter.h [new file with mode: 0644]
include/configs/PPChameleonEVB.h

index 9de853a2382f77ca48960b2fb348e62c5f2a4ce2..4360146caa8d83a3e8d8a845517a6e9b60b3734d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Add support for CATcenter board (based on PPChameleon ME module)
+
 * Patch by Klaus Heydeck, 12 May 2004:
   Using external watchdog for KUP4 boards in mpc8xx/cpu.c;
   load_sernum_ethaddr() for KUP4 boards in lib_ppc/board.c;
index 57caddfbf4aa6900427f123093e9eba9442beeac..8674eb80d3e661fccf6d8e24fbbfe10939743f23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -548,6 +548,11 @@ BUBINGA405EP_config:       unconfig
 CANBT_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx canbt esd
 
+CATcenter_config:      unconfig
+       @ echo "/* CATcenter uses PPChameleon Model ME */"  > include/config.h
+       @ echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> include/config.h
+       @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
+
 CPCI405_config \
 CPCI4052_config        \
 CPCI405AB_config:      unconfig
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
new file mode 100644 (file)
index 0000000..4f81cde
--- /dev/null
@@ -0,0 +1,703 @@
+/*
+ * (C) Copyright 2004 DENX Software Engineering,
+ *     Wolfgang Grandegger <wg@denx.de>
+ * (C) Copyright 2003
+ *     DAVE Srl
+ *
+ * http://www.dave-tech.it
+ * http://www.wawnet.biz
+ * mailto:info@wawnet.biz
+ *
+ * Credits: Stefan Roese, Wolfgang Denk
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * board/config.h - configuration options, board specific
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_PPCHAMELEON_MODULE_BA   0       /* Basic    Model */
+#define CONFIG_PPCHAMELEON_MODULE_ME   1       /* Medium   Model */
+#define CONFIG_PPCHAMELEON_MODULE_HI   2       /* High-End Model */
+#ifndef CONFIG_PPCHAMELEON_MODULE_MODEL
+#define CONFIG_PPCHAMELEON_MODULE_MODEL CONFIG_PPCHAMELEON_MODULE_BA
+#endif
+
+/*
+ * Debug stuff
+ */
+#undef __DEBUG_START_FROM_SRAM__
+#define __DISABLE_MACHINE_EXCEPTION__
+
+#ifdef __DEBUG_START_FROM_SRAM__
+#define CFG_DUMMY_FLASH_SIZE           1024*1024*4
+#endif
+
+/*
+ * High Level Configuration Options
+ * (easy to change)
+ */
+
+#define CONFIG_405EP           1       /* This is a PPC405 CPU         */
+#define CONFIG_4xx             1       /* ...member of PPC4xx family   */
+#define CONFIG_PPCHAMELEONEVB  1       /* ...on a PPChameleonEVB board */
+
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
+#define CONFIG_MISC_INIT_R     1       /* call misc_init_r()           */
+
+#define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
+
+#define CONFIG_UART1_CONSOLE   1       /* Use second UART      */
+#define CONFIG_BAUDRATE                115200
+#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
+
+#undef CONFIG_BOOTARGS
+
+/* Ethernet stuff */
+#define CONFIG_ENV_OVERWRITE /* Let the user to change the Ethernet MAC addresses */
+#define CONFIG_ETHADDR 00:50:C2:1E:AF:FC
+#define CONFIG_ETH1ADDR 00:50:C2:1E:AF:FB
+
+#define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
+#define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
+
+
+#undef CONFIG_EXT_PHY
+
+#define CONFIG_MII             1       /* MII PHY management           */
+#ifndef         CONFIG_EXT_PHY
+#define CONFIG_PHY_ADDR                1       /* PHY address                  */
+#else
+#define CONFIG_PHY_ADDR                2       /* PHY address                  */
+#endif
+#define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ
+
+#define CONFIG_COMMANDS              ( CONFIG_CMD_DFL  | \
+                               CFG_CMD_DATE    | \
+                               CFG_CMD_ELF     | \
+                               CFG_CMD_EEPROM  | \
+                               CFG_CMD_I2C     | \
+                               CFG_CMD_IRQ     | \
+                               CFG_CMD_MII     | \
+                               CFG_CMD_NAND    | \
+                               CFG_CMD_JFFS2)
+
+#define CONFIG_MAC_PARTITION
+#define CONFIG_DOS_PARTITION
+
+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
+#include <cmd_confdefs.h>
+
+#undef CONFIG_WATCHDOG                 /* watchdog disabled            */
+
+#define CONFIG_RTC_MC146818            /* DS1685 is MC146818 compatible*/
+#define CFG_RTC_REG_BASE_ADDR   0xF0000500 /* RTC Base Address         */
+
+#define CONFIG_SDRAM_BANK0     1       /* init onboard SDRAM bank 0    */
+
+/*
+ * Miscellaneous configurable options
+ */
+#define CFG_LONGHELP                   /* undef to save memory         */
+#define CFG_PROMPT             "=> "   /* Monitor Command Prompt       */
+
+#undef CFG_HUSH_PARSER                 /* use "hush" command parser    */
+#ifdef CFG_HUSH_PARSER
+#define CFG_PROMPT_HUSH_PS2    "> "
+#endif
+
+#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#define CFG_CBSIZE     1024            /* Console I/O Buffer Size      */
+#else
+#define CFG_CBSIZE     256             /* Console I/O Buffer Size      */
+#endif
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
+#define CFG_MAXARGS    16              /* max number of command args   */
+#define CFG_BARGSIZE   CFG_CBSIZE      /* Boot Argument Buffer Size    */
+
+#define CFG_DEVICE_NULLDEV     1       /* include nulldev device       */
+
+#define CFG_CONSOLE_INFO_QUIET 1       /* don't print console @ startup*/
+
+#define CFG_MEMTEST_START      0x0400000       /* memtest works on     */
+#define CFG_MEMTEST_END                0x0C00000       /* 4 ... 12 MB in DRAM  */
+
+#undef CFG_EXT_SERIAL_CLOCK            /* no external serial clock used */
+#define CFG_IGNORE_405_UART_ERRATA_59  /* ignore ppc405gp errata #59   */
+#define CFG_BASE_BAUD          691200
+
+/* The following table includes the supported baudrates */
+#define CFG_BAUDRATE_TABLE     \
+       { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
+        57600, 115200, 230400, 460800, 921600 }
+
+#define CFG_LOAD_ADDR  0x100000        /* default load address */
+#define CFG_EXTBDINFO  1               /* To use extended board_into (bd_t) */
+
+#define CFG_HZ         1000            /* decrementer freq: 1 ms ticks */
+
+#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
+
+/*-----------------------------------------------------------------------
+ * NAND-FLASH stuff
+ *-----------------------------------------------------------------------
+ */
+#define CFG_NAND0_BASE 0xFF400000
+#define CFG_NAND1_BASE 0xFF000000
+
+/* For CATcenter there is only NAND on the module */
+#define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices           */
+#define SECTORSIZE 512
+#define NAND_NO_RB
+
+#define ADDR_COLUMN 1
+#define ADDR_PAGE 2
+#define ADDR_COLUMN_PAGE 3
+
+#define NAND_ChipID_UNKNOWN    0x00
+#define NAND_MAX_FLOORS 1
+#define NAND_MAX_CHIPS 1
+
+#define CFG_NAND0_CE  (0x80000000 >> 1)         /* our CE is GPIO1 */
+#define CFG_NAND0_CLE (0x80000000 >> 2)         /* our CLE is GPIO2 */
+#define CFG_NAND0_ALE (0x80000000 >> 3)         /* our ALE is GPIO3 */
+#define CFG_NAND0_RDY (0x80000000 >> 4)         /* our RDY is GPIO4 */
+
+#define CFG_NAND1_CE  (0x80000000 >> 14)  /* our CE is GPIO14 */
+#define CFG_NAND1_CLE (0x80000000 >> 15)  /* our CLE is GPIO15 */
+#define CFG_NAND1_ALE (0x80000000 >> 16)  /* our ALE is GPIO16 */
+#define CFG_NAND1_RDY (0x80000000 >> 31)  /* our RDY is GPIO31 */
+
+
+#define NAND_DISABLE_CE(nand) do \
+{ \
+       switch((unsigned long)(((struct nand_chip *)nand)->IO_ADDR)) \
+       { \
+           case CFG_NAND0_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND0_CE); \
+               break; \
+           case CFG_NAND1_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND1_CE); \
+               break; \
+       } \
+} while(0)
+
+#define NAND_ENABLE_CE(nand) do \
+{ \
+       switch((unsigned long)(((struct nand_chip *)nand)->IO_ADDR)) \
+       { \
+           case CFG_NAND0_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_NAND0_CE); \
+               break; \
+           case CFG_NAND1_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_NAND1_CE); \
+               break; \
+       } \
+} while(0)
+
+
+#define NAND_CTL_CLRALE(nandptr) do \
+{ \
+       switch((unsigned long)nandptr) \
+       { \
+           case CFG_NAND0_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_NAND0_ALE); \
+               break; \
+           case CFG_NAND1_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_NAND1_ALE); \
+               break; \
+       } \
+} while(0)
+
+#define NAND_CTL_SETALE(nandptr) do \
+{ \
+       switch((unsigned long)nandptr) \
+       { \
+           case CFG_NAND0_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND0_ALE); \
+               break; \
+           case CFG_NAND1_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND1_ALE); \
+               break; \
+       } \
+} while(0)
+
+#define NAND_CTL_CLRCLE(nandptr) do \
+{ \
+       switch((unsigned long)nandptr) \
+       { \
+           case CFG_NAND0_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_NAND0_CLE); \
+               break; \
+           case CFG_NAND1_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_NAND1_CLE); \
+               break; \
+       } \
+} while(0)
+
+#define NAND_CTL_SETCLE(nandptr) do { \
+       switch((unsigned long)nandptr) { \
+       case CFG_NAND0_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND0_CLE); \
+               break; \
+       case CFG_NAND1_BASE: \
+               out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND1_CLE); \
+               break; \
+       } \
+} while(0)
+
+#ifdef NAND_NO_RB
+/* constant delay (see also tR in the datasheet) */
+#define NAND_WAIT_READY(nand) do { \
+       udelay(12); \
+} while (0)
+#else
+/* use the R/B pin */
+/* TBD */
+#endif
+
+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)(d); } while(0)
+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)(d); } while(0)
+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0)
+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr))
+
+/*-----------------------------------------------------------------------
+ * PCI stuff
+ *-----------------------------------------------------------------------
+ */
+#if 0  /* No PCI on CATcenter */
+#define PCI_HOST_ADAPTER 0             /* configure as pci adapter     */
+#define PCI_HOST_FORCE 1               /* configure as pci host        */
+#define PCI_HOST_AUTO  2               /* detected via arbiter enable  */
+
+#define CONFIG_PCI                     /* include pci support          */
+#define CONFIG_PCI_HOST PCI_HOST_FORCE  /* select pci host function     */
+#undef CONFIG_PCI_PNP                  /* do pci plug-and-play         */
+                                       /* resource configuration       */
+
+#define CONFIG_PCI_SCAN_SHOW           /* print pci devices @ startup  */
+
+#define CFG_PCI_SUBSYS_VENDORID 0x12FE /* PCI Vendor ID: esd gmbh      */
+#define CFG_PCI_SUBSYS_DEVICEID 0x0405 /* PCI Device ID: CPCI-405      */
+#define CFG_PCI_CLASSCODE      0x0b20  /* PCI Class Code: Processor/PPC*/
+#define CFG_PCI_PTM1LA 0x00000000      /* point to sdram               */
+#define CFG_PCI_PTM1MS 0xfc000001      /* 64MB, enable hard-wired to 1 */
+#define CFG_PCI_PTM1PCI 0x00000000     /* Host: use this pci address   */
+#define CFG_PCI_PTM2LA 0xffc00000      /* point to flash               */
+#define CFG_PCI_PTM2MS 0xffc00001      /* 4MB, enable                  */
+#define CFG_PCI_PTM2PCI 0x04000000     /* Host: use this pci address   */
+#endif /* No PCI */
+
+/*-----------------------------------------------------------------------
+ * Start addresses for the final memory configuration
+ * (Set up by the startup code)
+ * Please note that CFG_SDRAM_BASE _must_ start at 0
+ */
+#define CFG_SDRAM_BASE         0x00000000
+#define CFG_FLASH_BASE         0xFFFC0000
+#define CFG_MONITOR_BASE       CFG_FLASH_BASE
+#define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Monitor   */
+#define CFG_MALLOC_LEN         (256 * 1024)    /* Reserve 256 kB for malloc()  */
+
+/*
+ * For booting Linux, the board info and command line data
+ * have to be in the first 8 MB of memory, since this is
+ * the maximum mapped by the Linux kernel during initialization.
+ */
+#define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
+/*-----------------------------------------------------------------------
+ * FLASH organization
+ */
+#define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
+#define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip    */
+
+#define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
+#define CFG_FLASH_WRITE_TOUT   1000    /* Timeout for Flash Write (in ms)      */
+
+#define CFG_FLASH_WORD_SIZE    unsigned short  /* flash word size (width)      */
+#define CFG_FLASH_ADDR0                0x5555  /* 1st address for flash config cycles  */
+#define CFG_FLASH_ADDR1                0x2AAA  /* 2nd address for flash config cycles  */
+/*
+ * The following defines are added for buggy IOP480 byte interface.
+ * All other boards should use the standard values (CPCI405 etc.)
+ */
+#define CFG_FLASH_READ0                0x0000  /* 0 is standard                        */
+#define CFG_FLASH_READ1                0x0001  /* 1 is standard                        */
+#define CFG_FLASH_READ2                0x0002  /* 2 is standard                        */
+
+#define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
+
+#if 0 /* test-only */
+#define CFG_JFFS2_FIRST_BANK   0       /* use for JFFS2                        */
+#define CFG_JFFS2_NUM_BANKS    1       /* ! second bank contains U-Boot        */
+#endif
+
+/*-----------------------------------------------------------------------
+ * Environment Variable setup
+ */
+#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environment vars */
+#define CFG_ENV_ADDR           0xFFFF8000      /* environment starts at the first small sector */
+#define CFG_ENV_SECT_SIZE      0x2000  /* 8196 bytes may be used for env vars*/
+#define CFG_ENV_ADDR_REDUND    0xFFFFA000
+#define CFG_ENV_SIZE_REDUND    0x2000
+
+#define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
+#define CFG_NVRAM_SIZE         242                     /* NVRAM size           */
+
+/*-----------------------------------------------------------------------
+ * I2C EEPROM (CAT24WC16) for environment
+ */
+#define CONFIG_HARD_I2C                        /* I2c with hardware support */
+#define CFG_I2C_SPEED          400000  /* I2C speed and slave address */
+#define CFG_I2C_SLAVE          0x7F
+
+#define CFG_I2C_EEPROM_ADDR    0x50    /* EEPROM CAT28WC08             */
+#define CFG_I2C_EEPROM_ADDR_LEN 1      /* Bytes of address             */
+/* mask of address bits that overflow into the "EEPROM chip address"   */
+/*#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07*/
+#define CFG_EEPROM_PAGE_WRITE_BITS 4   /* The Catalyst CAT24WC08 has   */
+                                       /* 16 byte page write mode using*/
+                                       /* last 4 bits of the address   */
+#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10   /* and takes up to 10 msec */
+#define CFG_EEPROM_PAGE_WRITE_ENABLE
+
+/*-----------------------------------------------------------------------
+ * Cache Configuration
+ */
+#define CFG_DCACHE_SIZE                16384   /* For IBM 405 CPUs, older 405 ppc's    */
+                                       /* have only 8kB, 16kB is save here     */
+#define CFG_CACHELINE_SIZE     32      /* ...                  */
+#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#define CFG_CACHELINE_SHIFT    5       /* log base 2 of the above value        */
+#endif
+
+/*
+ * Init Memory Controller:
+ *
+ * BR0/1 and OR0/1 (FLASH)
+ */
+
+#define FLASH_BASE0_PRELIM     0xFFC00000      /* FLASH bank #0        */
+
+/*-----------------------------------------------------------------------
+ * External Bus Controller (EBC) Setup
+ */
+
+/* Memory Bank 0 (Flash Bank 0, NOR-FLASH) initialization                      */
+#define CFG_EBC_PB0AP          0x92015480
+#define CFG_EBC_PB0CR          0xFFC5A000  /* BAS=0xFFC,BS=4MB,BU=R/W,BW=16bit */
+
+/* Memory Bank 1 (External SRAM) initialization                                        */
+/* Since this must replace NOR Flash, we use the same settings for CS0         */
+#define CFG_EBC_PB1AP          0x92015480
+#define CFG_EBC_PB1CR          0xFF85A000  /* BAS=0xFF8,BS=4MB,BU=R/W,BW=8bit  */
+
+/* Memory Bank 2 (Flash Bank 1, NAND-FLASH) initialization                     */
+#define CFG_EBC_PB2AP          0x92015480
+#define CFG_EBC_PB2CR          0xFF458000  /* BAS=0xFF4,BS=4MB,BU=R/W,BW=8bit  */
+
+/* Memory Bank 3 (Flash Bank 2, NAND-FLASH) initialization                     */
+#define CFG_EBC_PB3AP          0x92015480
+#define CFG_EBC_PB3CR          0xFF058000  /* BAS=0xFF0,BS=4MB,BU=R/W,BW=8bit  */
+
+
+#if 0 /* Roese */
+/* Memory Bank 1 (Flash Bank 1, NAND-FLASH) initialization                     */
+#define CFG_EBC_PB1AP          0x92015480
+#define CFG_EBC_PB1CR          0xFF858000  /* BAS=0xFF8,BS=4MB,BU=R/W,BW=8bit  */
+
+/* Memory Bank 2 (CAN0, 1) initialization                                      */
+#define CFG_EBC_PB2AP          0x010053C0  /* BWT=2,WBN=1,WBF=1,TH=1,RE=1,SOR=1,BEM=1 */
+#define CFG_EBC_PB2CR          0xF0018000  /* BAS=0xF00,BS=1MB,BU=R/W,BW=8bit  */
+
+/* Memory Bank 3 (CompactFlash IDE) initialization                             */
+#define CFG_EBC_PB3AP          0x010053C0  /* BWT=2,WBN=1,WBF=1,TH=1,RE=1,SOR=1,BEM=1 */
+#define CFG_EBC_PB3CR          0xF011A000  /* BAS=0xF01,BS=1MB,BU=R/W,BW=16bit */
+
+/* Memory Bank 4 (NVRAM/RTC) initialization                                    */
+#define CFG_EBC_PB4AP          0x01005280  /* TWT=2,WBN=1,WBF=1,TH=1,SOR=1     */
+#define CFG_EBC_PB4CR          0xF0218000  /* BAS=0xF02,BS=1MB,BU=R/W,BW=8bit  */
+#endif
+
+/*-----------------------------------------------------------------------
+ * FPGA stuff
+ */
+/* FPGA internal regs */
+#define CFG_FPGA_MODE          0x00
+#define CFG_FPGA_STATUS                0x02
+#define CFG_FPGA_TS            0x04
+#define CFG_FPGA_TS_LOW                0x06
+#define CFG_FPGA_TS_CAP0       0x10
+#define CFG_FPGA_TS_CAP0_LOW   0x12
+#define CFG_FPGA_TS_CAP1       0x14
+#define CFG_FPGA_TS_CAP1_LOW   0x16
+#define CFG_FPGA_TS_CAP2       0x18
+#define CFG_FPGA_TS_CAP2_LOW   0x1a
+#define CFG_FPGA_TS_CAP3       0x1c
+#define CFG_FPGA_TS_CAP3_LOW   0x1e
+
+/* FPGA Mode Reg */
+#define CFG_FPGA_MODE_CF_RESET 0x0001
+#define CFG_FPGA_MODE_TS_IRQ_ENABLE 0x0100
+#define CFG_FPGA_MODE_TS_IRQ_CLEAR  0x1000
+#define CFG_FPGA_MODE_TS_CLEAR 0x2000
+
+/* FPGA Status Reg */
+#define CFG_FPGA_STATUS_DIP0   0x0001
+#define CFG_FPGA_STATUS_DIP1   0x0002
+#define CFG_FPGA_STATUS_DIP2   0x0004
+#define CFG_FPGA_STATUS_FLASH  0x0008
+#define CFG_FPGA_STATUS_TS_IRQ 0x1000
+
+#define CFG_FPGA_SPARTAN2      1               /* using Xilinx Spartan 2 now   */
+#define CFG_FPGA_MAX_SIZE      128*1024        /* 128kByte is enough for XC2S50E*/
+
+/* FPGA program pin configuration */
+#define CFG_FPGA_PRG           0x04000000      /* FPGA program pin (ppc output) */
+#define CFG_FPGA_CLK           0x02000000      /* FPGA clk pin (ppc output)    */
+#define CFG_FPGA_DATA          0x01000000      /* FPGA data pin (ppc output)   */
+#define CFG_FPGA_INIT          0x00010000      /* FPGA init pin (ppc input)    */
+#define CFG_FPGA_DONE          0x00008000      /* FPGA done pin (ppc input)    */
+
+/*-----------------------------------------------------------------------
+ * Definitions for initial stack pointer and data area (in data cache)
+ */
+/* use on chip memory ( OCM ) for temperary stack until sdram is tested */
+#define CFG_TEMP_STACK_OCM       1
+
+/* On Chip Memory location */
+#define CFG_OCM_DATA_ADDR      0xF8000000
+#define CFG_OCM_DATA_SIZE      0x1000
+#define CFG_INIT_RAM_ADDR      CFG_OCM_DATA_ADDR /* inside of SDRAM            */
+#define CFG_INIT_RAM_END       CFG_OCM_DATA_SIZE /* End of used area in RAM    */
+
+#define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
+#define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
+#define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
+
+/*-----------------------------------------------------------------------
+ * Definitions for GPIO setup (PPC405EP specific)
+ *
+ * GPIO0[0]    - External Bus Controller BLAST output
+ * GPIO0[1-9]  - Instruction trace outputs -> GPIO
+ * GPIO0[10-13] - External Bus Controller CS_1 - CS_4 outputs
+ * GPIO0[14-16] - External Bus Controller ABUS3-ABUS5 outputs -> GPIO
+ * GPIO0[17-23] - External Interrupts IRQ0 - IRQ6 inputs
+ * GPIO0[24-27] - UART0 control signal inputs/outputs
+ * GPIO0[28-29] - UART1 data signal input/output
+ * GPIO0[30]   - EMAC0 input
+ * GPIO0[31]   - EMAC1 reject packet as output
+ */
+#define CFG_GPIO0_OSRH         0x40000550
+#define CFG_GPIO0_OSRL         0x00000110
+#define CFG_GPIO0_ISR1H                0x00000000
+/*#define CFG_GPIO0_ISR1L      0x15555445*/
+#define CFG_GPIO0_ISR1L                0x15555444
+#define CFG_GPIO0_TSRH         0x00000000
+#define CFG_GPIO0_TSRL         0x00000000
+#define CFG_GPIO0_TCR          0xF7FF8014
+
+/*
+ * Internal Definitions
+ *
+ * Boot Flags
+ */
+#define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
+#define BOOTFLAG_WARM  0x02            /* Software reboot                      */
+
+
+#define CONFIG_NO_SERIAL_EEPROM
+
+/*--------------------------------------------------------------------*/
+
+#ifdef CONFIG_NO_SERIAL_EEPROM
+
+/*
+!-----------------------------------------------------------------------
+! Defines for entry options.
+! Note: Because the 405EP SDRAM controller does not support ECC, ECC DIMMs that
+!      are plugged in the board will be utilized as non-ECC DIMMs.
+!-----------------------------------------------------------------------
+*/
+#undef         AUTO_MEMORY_CONFIG
+#define                DIMM_READ_ADDR 0xAB
+#define                DIMM_WRITE_ADDR 0xAA
+
+
+#define CPC0_PLLMR0  (CNTRL_DCR_BASE+0x0)  /* PLL mode 0 register              */
+#define CPC0_BOOT    (CNTRL_DCR_BASE+0x1)  /* Chip Clock Status register       */
+#define CPC0_CR1     (CNTRL_DCR_BASE+0x2)  /* Chip Control 1 register          */
+#define CPC0_EPRCSR  (CNTRL_DCR_BASE+0x3)  /* EMAC PHY Rcv Clk Src register    */
+#define CPC0_PLLMR1  (CNTRL_DCR_BASE+0x4)  /* PLL mode 1 register              */
+#define CPC0_UCR     (CNTRL_DCR_BASE+0x5)  /* UART Control register            */
+#define CPC0_SRR     (CNTRL_DCR_BASE+0x6)  /* Soft Reset register              */
+#define CPC0_JTAGID  (CNTRL_DCR_BASE+0x7)  /* JTAG ID register                 */
+#define CPC0_SPARE   (CNTRL_DCR_BASE+0x8)  /* Spare DCR                                */
+#define CPC0_PCI     (CNTRL_DCR_BASE+0x9)  /* PCI Control register             */
+
+/* Defines for CPC0_PLLMR1 Register fields */
+#define PLL_ACTIVE             0x80000000
+#define CPC0_PLLMR1_SSCS       0x80000000
+#define PLL_RESET              0x40000000
+#define CPC0_PLLMR1_PLLR       0x40000000
+    /* Feedback multiplier */
+#define PLL_FBKDIV             0x00F00000
+#define CPC0_PLLMR1_FBDV       0x00F00000
+#define PLL_FBKDIV_16          0x00000000
+#define PLL_FBKDIV_1           0x00100000
+#define PLL_FBKDIV_2           0x00200000
+#define PLL_FBKDIV_3           0x00300000
+#define PLL_FBKDIV_4           0x00400000
+#define PLL_FBKDIV_5           0x00500000
+#define PLL_FBKDIV_6           0x00600000
+#define PLL_FBKDIV_7           0x00700000
+#define PLL_FBKDIV_8           0x00800000
+#define PLL_FBKDIV_9           0x00900000
+#define PLL_FBKDIV_10          0x00A00000
+#define PLL_FBKDIV_11          0x00B00000
+#define PLL_FBKDIV_12          0x00C00000
+#define PLL_FBKDIV_13          0x00D00000
+#define PLL_FBKDIV_14          0x00E00000
+#define PLL_FBKDIV_15          0x00F00000
+    /* Forward A divisor */
+#define PLL_FWDDIVA            0x00070000
+#define CPC0_PLLMR1_FWDVA      0x00070000
+#define PLL_FWDDIVA_8          0x00000000
+#define PLL_FWDDIVA_7          0x00010000
+#define PLL_FWDDIVA_6          0x00020000
+#define PLL_FWDDIVA_5          0x00030000
+#define PLL_FWDDIVA_4          0x00040000
+#define PLL_FWDDIVA_3          0x00050000
+#define PLL_FWDDIVA_2          0x00060000
+#define PLL_FWDDIVA_1          0x00070000
+    /* Forward B divisor */
+#define PLL_FWDDIVB            0x00007000
+#define CPC0_PLLMR1_FWDVB      0x00007000
+#define PLL_FWDDIVB_8          0x00000000
+#define PLL_FWDDIVB_7          0x00001000
+#define PLL_FWDDIVB_6          0x00002000
+#define PLL_FWDDIVB_5          0x00003000
+#define PLL_FWDDIVB_4          0x00004000
+#define PLL_FWDDIVB_3          0x00005000
+#define PLL_FWDDIVB_2          0x00006000
+#define PLL_FWDDIVB_1          0x00007000
+    /* PLL tune bits */
+#define PLL_TUNE_MASK          0x000003FF
+#define PLL_TUNE_2_M_3         0x00000133      /*  2 <= M <= 3                 */
+#define PLL_TUNE_4_M_6         0x00000134      /*  3 <  M <= 6                 */
+#define PLL_TUNE_7_M_10                0x00000138      /*  6 <  M <= 10                */
+#define PLL_TUNE_11_M_14       0x0000013C      /* 10 <  M <= 14                */
+#define PLL_TUNE_15_M_40       0x0000023E      /* 14 <  M <= 40                */
+#define PLL_TUNE_VCO_LOW       0x00000000      /* 500MHz <= VCO <=  800MHz     */
+#define PLL_TUNE_VCO_HI                0x00000080      /* 800MHz <  VCO <= 1000MHz     */
+
+/* Defines for CPC0_PLLMR0 Register fields */
+    /* CPU divisor */
+#define PLL_CPUDIV             0x00300000
+#define CPC0_PLLMR0_CCDV       0x00300000
+#define PLL_CPUDIV_1           0x00000000
+#define PLL_CPUDIV_2           0x00100000
+#define PLL_CPUDIV_3           0x00200000
+#define PLL_CPUDIV_4           0x00300000
+    /* PLB divisor */
+#define PLL_PLBDIV             0x00030000
+#define CPC0_PLLMR0_CBDV       0x00030000
+#define PLL_PLBDIV_1           0x00000000
+#define PLL_PLBDIV_2           0x00010000
+#define PLL_PLBDIV_3           0x00020000
+#define PLL_PLBDIV_4           0x00030000
+    /* OPB divisor */
+#define PLL_OPBDIV             0x00003000
+#define CPC0_PLLMR0_OPDV       0x00003000
+#define PLL_OPBDIV_1           0x00000000
+#define PLL_OPBDIV_2           0x00001000
+#define PLL_OPBDIV_3           0x00002000
+#define PLL_OPBDIV_4           0x00003000
+    /* EBC divisor */
+#define PLL_EXTBUSDIV          0x00000300
+#define CPC0_PLLMR0_EPDV       0x00000300
+#define PLL_EXTBUSDIV_2                0x00000000
+#define PLL_EXTBUSDIV_3                0x00000100
+#define PLL_EXTBUSDIV_4                0x00000200
+#define PLL_EXTBUSDIV_5                0x00000300
+    /* MAL divisor */
+#define PLL_MALDIV             0x00000030
+#define CPC0_PLLMR0_MPDV       0x00000030
+#define PLL_MALDIV_1           0x00000000
+#define PLL_MALDIV_2           0x00000010
+#define PLL_MALDIV_3           0x00000020
+#define PLL_MALDIV_4           0x00000030
+    /* PCI divisor */
+#define PLL_PCIDIV             0x00000003
+#define CPC0_PLLMR0_PPFD       0x00000003
+#define PLL_PCIDIV_1           0x00000000
+#define PLL_PCIDIV_2           0x00000001
+#define PLL_PCIDIV_3           0x00000002
+#define PLL_PCIDIV_4           0x00000003
+
+/* CPU - PLB/SDRAM - EBC - OPB - PCI (assuming a 33.3MHz input clock to the 405EP) */
+#define PLLMR0_133_133_33_66_33         (PLL_CPUDIV_1 | PLL_PLBDIV_1 | \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_4 | \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_4)
+#define PLLMR1_133_133_33_66_33         (PLL_FBKDIV_4  |  \
+                                 PLL_FWDDIVA_6 | PLL_FWDDIVB_6 | \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+#define PLLMR0_200_100_50_33    (PLL_CPUDIV_1 | PLL_PLBDIV_2 | \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 | \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_4)
+#define PLLMR1_200_100_50_33    (PLL_FBKDIV_6  | \
+                                 PLL_FWDDIVA_4 | PLL_FWDDIVB_4 | \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+#define PLLMR0_266_133_33_66_33         (PLL_CPUDIV_1 | PLL_PLBDIV_2 | \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_4 | \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_4)
+#define PLLMR1_266_133_33_66_33         (PLL_FBKDIV_8  | \
+                                 PLL_FWDDIVA_3 | PLL_FWDDIVB_3 | \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+#define PLLMR0_333_111_37_55_55         (PLL_CPUDIV_1 | PLL_PLBDIV_3 | \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 | \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_2)
+#define PLLMR1_333_111_37_55_55         (PLL_FBKDIV_10 | \
+                                 PLL_FWDDIVA_3 | PLL_FWDDIVB_3 | \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_HI)
+
+#if   (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_HI)
+/* Model HI */
+#define PLLMR0_DEFAULT         PLLMR0_333_111_37_55_55
+#define PLLMR1_DEFAULT         PLLMR1_333_111_37_55_55
+/* Model ME */
+#elif (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_ME)
+#define PLLMR0_DEFAULT         PLLMR0_266_133_33_66_33
+#define PLLMR1_DEFAULT         PLLMR1_266_133_33_66_33
+#else
+/* Model BA (default) */
+#define PLLMR0_DEFAULT         PLLMR0_133_133_33_66_33
+#define PLLMR1_DEFAULT         PLLMR1_133_133_33_66_33
+#endif
+
+#endif /* CONFIG_NO_SERIAL_EEPROM */
+
+#define CONFIG_JFFS2_NAND 1                    /* jffs2 on nand support */
+#define CONFIG_JFFS2_NAND_DEV 0                        /* nand device jffs2 lives on */
+#define CONFIG_JFFS2_NAND_OFF 0                        /* start of jffs2 partition */
+#define CONFIG_JFFS2_NAND_SIZE 2*1024*1024     /* size of jffs2 partition */
+#define NAND_CACHE_PAGES 16                    /* size of nand cache in 512 bytes pages */
+
+#endif /* __CONFIG_H */
index d03f5c53e30f9aba969dd53c0e3413e037b6ebbf..c9e52e2a4a7e863a4b0955ab77a608fa33b04039 100644 (file)
                                CFG_CMD_EEPROM  | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IRQ     | \
+                               CFG_CMD_JFFS2   | \
                                CFG_CMD_MII     | \
                                CFG_CMD_NAND    | \
-                               CFG_CMD_JFFS2)
+                               CFG_CMD_PCI     )
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 #define CFG_MEMTEST_START      0x0400000       /* memtest works on     */
 #define CFG_MEMTEST_END                0x0C00000       /* 4 ... 12 MB in DRAM  */
 
-#undef CFG_EXT_SERIAL_CLOCK           /* no external serial clock used */
+#undef CFG_EXT_SERIAL_CLOCK            /* no external serial clock used */
 #define CFG_IGNORE_405_UART_ERRATA_59  /* ignore ppc405gp errata #59   */
-#define CFG_BASE_BAUD      691200
+#define CFG_BASE_BAUD          691200
 
 /* The following table includes the supported baudrates */
 #define CFG_BAUDRATE_TABLE     \
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #if 0 /* test-only */
-#define CFG_JFFS2_FIRST_BANK   0           /* use for JFFS2 */
-#define CFG_JFFS2_NUM_BANKS    1           /* ! second bank contains U-Boot */
+#define CFG_JFFS2_FIRST_BANK   0        /* use for JFFS2 */
+#define CFG_JFFS2_NUM_BANKS    1        /* ! second bank contains U-Boot */
 #endif
 
 /*-----------------------------------------------------------------------
 #define CFG_FPGA_STATUS_FLASH  0x0008
 #define CFG_FPGA_STATUS_TS_IRQ 0x1000
 
-#define CFG_FPGA_SPARTAN2      1           /* using Xilinx Spartan 2 now    */
-#define CFG_FPGA_MAX_SIZE      128*1024    /* 128kByte is enough for XC2S50E*/
+#define CFG_FPGA_SPARTAN2      1               /* using Xilinx Spartan 2 now    */
+#define CFG_FPGA_MAX_SIZE      128*1024        /* 128kByte is enough for XC2S50E*/
 
 /* FPGA program pin configuration */
-#define CFG_FPGA_PRG           0x04000000  /* FPGA program pin (ppc output) */
-#define CFG_FPGA_CLK           0x02000000  /* FPGA clk pin (ppc output)     */
-#define CFG_FPGA_DATA          0x01000000  /* FPGA data pin (ppc output)    */
-#define CFG_FPGA_INIT          0x00010000  /* FPGA init pin (ppc input)     */
-#define CFG_FPGA_DONE          0x00008000  /* FPGA done pin (ppc input)     */
+#define CFG_FPGA_PRG           0x04000000      /* FPGA program pin (ppc output) */
+#define CFG_FPGA_CLK           0x02000000      /* FPGA clk pin (ppc output)     */
+#define CFG_FPGA_DATA          0x01000000      /* FPGA data pin (ppc output)    */
+#define CFG_FPGA_INIT          0x00010000      /* FPGA init pin (ppc input)     */
+#define CFG_FPGA_DONE          0x00008000      /* FPGA done pin (ppc input)     */
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in data cache)
  */
-#if 0 /* test-only */
-#define CFG_INIT_DCACHE_CS     4       /* use cs # 4 for data cache memory    */
-
-#define CFG_INIT_RAM_ADDR      0x40000000  /* use data cache                  */
-#define CFG_INIT_RAM_END       0x2000  /* End of used area in RAM             */
-#else
 /* use on chip memory ( OCM ) for temperary stack until sdram is tested */
-#define CFG_TEMP_STACK_OCM       1
+#define CFG_TEMP_STACK_OCM     1
 
 /* On Chip Memory location */
 #define CFG_OCM_DATA_ADDR      0xF8000000
 #define CFG_OCM_DATA_SIZE      0x1000
 #define CFG_INIT_RAM_ADDR      CFG_OCM_DATA_ADDR /* inside of SDRAM            */
 #define CFG_INIT_RAM_END       CFG_OCM_DATA_SIZE /* End of used area in RAM    */
-#endif
 
 #define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 !      are plugged in the board will be utilized as non-ECC DIMMs.
 !-----------------------------------------------------------------------
 */
-#undef       AUTO_MEMORY_CONFIG
-#define               DIMM_READ_ADDR 0xAB
-#define               DIMM_WRITE_ADDR 0xAA
-
-
-#define CPC0_PLLMR0  (CNTRL_DCR_BASE+0x0)  /* PLL mode 0 register         */
-#define CPC0_BOOT    (CNTRL_DCR_BASE+0x1)  /* Chip Clock Status register   */
-#define CPC0_CR1     (CNTRL_DCR_BASE+0x2)  /* Chip Control 1 register     */
-#define CPC0_EPRCSR  (CNTRL_DCR_BASE+0x3)  /* EMAC PHY Rcv Clk Src register*/
-#define CPC0_PLLMR1  (CNTRL_DCR_BASE+0x4)  /* PLL mode 1 register         */
-#define CPC0_UCR     (CNTRL_DCR_BASE+0x5)  /* UART Control register       */
-#define CPC0_SRR     (CNTRL_DCR_BASE+0x6)  /* Soft Reset register         */
-#define CPC0_JTAGID  (CNTRL_DCR_BASE+0x7)  /* JTAG ID register            */
-#define CPC0_SPARE   (CNTRL_DCR_BASE+0x8)  /* Spare DCR                           */
-#define CPC0_PCI     (CNTRL_DCR_BASE+0x9)  /* PCI Control register        */
+#undef         AUTO_MEMORY_CONFIG
+#define                DIMM_READ_ADDR 0xAB
+#define                DIMM_WRITE_ADDR 0xAA
+
+
+#define CPC0_PLLMR0  (CNTRL_DCR_BASE+0x0)  /* PLL mode 0 register              */
+#define CPC0_BOOT    (CNTRL_DCR_BASE+0x1)  /* Chip Clock Status register       */
+#define CPC0_CR1     (CNTRL_DCR_BASE+0x2)  /* Chip Control 1 register          */
+#define CPC0_EPRCSR  (CNTRL_DCR_BASE+0x3)  /* EMAC PHY Rcv Clk Src register    */
+#define CPC0_PLLMR1  (CNTRL_DCR_BASE+0x4)  /* PLL mode 1 register              */
+#define CPC0_UCR     (CNTRL_DCR_BASE+0x5)  /* UART Control register            */
+#define CPC0_SRR     (CNTRL_DCR_BASE+0x6)  /* Soft Reset register              */
+#define CPC0_JTAGID  (CNTRL_DCR_BASE+0x7)  /* JTAG ID register                 */
+#define CPC0_SPARE   (CNTRL_DCR_BASE+0x8)  /* Spare DCR                                */
+#define CPC0_PCI     (CNTRL_DCR_BASE+0x9)  /* PCI Control register             */
 
 /* Defines for CPC0_PLLMR1 Register fields */
-#define PLL_ACTIVE                0x80000000
-#define CPC0_PLLMR1_SSCS          0x80000000
-#define PLL_RESET                 0x40000000
-#define CPC0_PLLMR1_PLLR          0x40000000
+#define PLL_ACTIVE             0x80000000
+#define CPC0_PLLMR1_SSCS       0x80000000
+#define PLL_RESET              0x40000000
+#define CPC0_PLLMR1_PLLR       0x40000000
     /* Feedback multiplier */
-#define PLL_FBKDIV                0x00F00000
-#define CPC0_PLLMR1_FBDV          0x00F00000
-#define PLL_FBKDIV_16             0x00000000
-#define PLL_FBKDIV_1              0x00100000
-#define PLL_FBKDIV_2              0x00200000
-#define PLL_FBKDIV_3              0x00300000
-#define PLL_FBKDIV_4              0x00400000
-#define PLL_FBKDIV_5              0x00500000
-#define PLL_FBKDIV_6              0x00600000
-#define PLL_FBKDIV_7              0x00700000
-#define PLL_FBKDIV_8              0x00800000
-#define PLL_FBKDIV_9              0x00900000
-#define PLL_FBKDIV_10             0x00A00000
-#define PLL_FBKDIV_11             0x00B00000
-#define PLL_FBKDIV_12             0x00C00000
-#define PLL_FBKDIV_13             0x00D00000
-#define PLL_FBKDIV_14             0x00E00000
-#define PLL_FBKDIV_15             0x00F00000
+#define PLL_FBKDIV             0x00F00000
+#define CPC0_PLLMR1_FBDV       0x00F00000
+#define PLL_FBKDIV_16          0x00000000
+#define PLL_FBKDIV_1           0x00100000
+#define PLL_FBKDIV_2           0x00200000
+#define PLL_FBKDIV_3           0x00300000
+#define PLL_FBKDIV_4           0x00400000
+#define PLL_FBKDIV_5           0x00500000
+#define PLL_FBKDIV_6           0x00600000
+#define PLL_FBKDIV_7           0x00700000
+#define PLL_FBKDIV_8           0x00800000
+#define PLL_FBKDIV_9           0x00900000
+#define PLL_FBKDIV_10          0x00A00000
+#define PLL_FBKDIV_11          0x00B00000
+#define PLL_FBKDIV_12          0x00C00000
+#define PLL_FBKDIV_13          0x00D00000
+#define PLL_FBKDIV_14          0x00E00000
+#define PLL_FBKDIV_15          0x00F00000
     /* Forward A divisor */
-#define PLL_FWDDIVA               0x00070000
-#define CPC0_PLLMR1_FWDVA         0x00070000
-#define PLL_FWDDIVA_8             0x00000000
-#define PLL_FWDDIVA_7             0x00010000
-#define PLL_FWDDIVA_6             0x00020000
-#define PLL_FWDDIVA_5             0x00030000
-#define PLL_FWDDIVA_4             0x00040000
-#define PLL_FWDDIVA_3             0x00050000
-#define PLL_FWDDIVA_2             0x00060000
-#define PLL_FWDDIVA_1             0x00070000
+#define PLL_FWDDIVA            0x00070000
+#define CPC0_PLLMR1_FWDVA      0x00070000
+#define PLL_FWDDIVA_8          0x00000000
+#define PLL_FWDDIVA_7          0x00010000
+#define PLL_FWDDIVA_6          0x00020000
+#define PLL_FWDDIVA_5          0x00030000
+#define PLL_FWDDIVA_4          0x00040000
+#define PLL_FWDDIVA_3          0x00050000
+#define PLL_FWDDIVA_2          0x00060000
+#define PLL_FWDDIVA_1          0x00070000
     /* Forward B divisor */
-#define PLL_FWDDIVB               0x00007000
-#define CPC0_PLLMR1_FWDVB         0x00007000
-#define PLL_FWDDIVB_8             0x00000000
-#define PLL_FWDDIVB_7             0x00001000
-#define PLL_FWDDIVB_6             0x00002000
-#define PLL_FWDDIVB_5             0x00003000
-#define PLL_FWDDIVB_4             0x00004000
-#define PLL_FWDDIVB_3             0x00005000
-#define PLL_FWDDIVB_2             0x00006000
-#define PLL_FWDDIVB_1             0x00007000
+#define PLL_FWDDIVB            0x00007000
+#define CPC0_PLLMR1_FWDVB      0x00007000
+#define PLL_FWDDIVB_8          0x00000000
+#define PLL_FWDDIVB_7          0x00001000
+#define PLL_FWDDIVB_6          0x00002000
+#define PLL_FWDDIVB_5          0x00003000
+#define PLL_FWDDIVB_4          0x00004000
+#define PLL_FWDDIVB_3          0x00005000
+#define PLL_FWDDIVB_2          0x00006000
+#define PLL_FWDDIVB_1          0x00007000
     /* PLL tune bits */
-#define PLL_TUNE_MASK           0x000003FF
-#define PLL_TUNE_2_M_3          0x00000133     /*  2 <= M <= 3               */
-#define PLL_TUNE_4_M_6          0x00000134     /*  3 <  M <= 6               */
-#define PLL_TUNE_7_M_10                 0x00000138     /*  6 <  M <= 10              */
-#define PLL_TUNE_11_M_14        0x0000013C     /* 10 <  M <= 14              */
-#define PLL_TUNE_15_M_40        0x0000023E     /* 14 <  M <= 40              */
-#define PLL_TUNE_VCO_LOW        0x00000000     /* 500MHz <= VCO <=  800MHz   */
-#define PLL_TUNE_VCO_HI                 0x00000080     /* 800MHz <  VCO <= 1000MHz   */
+#define PLL_TUNE_MASK          0x000003FF
+#define PLL_TUNE_2_M_3         0x00000133      /*  2 <= M <= 3                 */
+#define PLL_TUNE_4_M_6         0x00000134      /*  3 <  M <= 6                 */
+#define PLL_TUNE_7_M_10                0x00000138      /*  6 <  M <= 10                */
+#define PLL_TUNE_11_M_14       0x0000013C      /* 10 <  M <= 14                */
+#define PLL_TUNE_15_M_40       0x0000023E      /* 14 <  M <= 40                */
+#define PLL_TUNE_VCO_LOW       0x00000000      /* 500MHz <= VCO <=  800MHz     */
+#define PLL_TUNE_VCO_HI                0x00000080      /* 800MHz <  VCO <= 1000MHz     */
 
 /* Defines for CPC0_PLLMR0 Register fields */
     /* CPU divisor */
-#define PLL_CPUDIV                0x00300000
-#define CPC0_PLLMR0_CCDV          0x00300000
-#define PLL_CPUDIV_1              0x00000000
-#define PLL_CPUDIV_2              0x00100000
-#define PLL_CPUDIV_3              0x00200000
-#define PLL_CPUDIV_4              0x00300000
+#define PLL_CPUDIV             0x00300000
+#define CPC0_PLLMR0_CCDV       0x00300000
+#define PLL_CPUDIV_1           0x00000000
+#define PLL_CPUDIV_2           0x00100000
+#define PLL_CPUDIV_3           0x00200000
+#define PLL_CPUDIV_4           0x00300000
     /* PLB divisor */
-#define PLL_PLBDIV                0x00030000
-#define CPC0_PLLMR0_CBDV          0x00030000
-#define PLL_PLBDIV_1              0x00000000
-#define PLL_PLBDIV_2              0x00010000
-#define PLL_PLBDIV_3              0x00020000
-#define PLL_PLBDIV_4              0x00030000
+#define PLL_PLBDIV             0x00030000
+#define CPC0_PLLMR0_CBDV       0x00030000
+#define PLL_PLBDIV_1           0x00000000
+#define PLL_PLBDIV_2           0x00010000
+#define PLL_PLBDIV_3           0x00020000
+#define PLL_PLBDIV_4           0x00030000
     /* OPB divisor */
-#define PLL_OPBDIV                0x00003000
-#define CPC0_PLLMR0_OPDV          0x00003000
-#define PLL_OPBDIV_1              0x00000000
-#define PLL_OPBDIV_2              0x00001000
-#define PLL_OPBDIV_3              0x00002000
-#define PLL_OPBDIV_4              0x00003000
+#define PLL_OPBDIV             0x00003000
+#define CPC0_PLLMR0_OPDV       0x00003000
+#define PLL_OPBDIV_1           0x00000000
+#define PLL_OPBDIV_2           0x00001000
+#define PLL_OPBDIV_3           0x00002000
+#define PLL_OPBDIV_4           0x00003000
     /* EBC divisor */
-#define PLL_EXTBUSDIV             0x00000300
-#define CPC0_PLLMR0_EPDV          0x00000300
-#define PLL_EXTBUSDIV_2                   0x00000000
-#define PLL_EXTBUSDIV_3                   0x00000100
-#define PLL_EXTBUSDIV_4                   0x00000200
-#define PLL_EXTBUSDIV_5                   0x00000300
+#define PLL_EXTBUSDIV          0x00000300
+#define CPC0_PLLMR0_EPDV       0x00000300
+#define PLL_EXTBUSDIV_2                0x00000000
+#define PLL_EXTBUSDIV_3                0x00000100
+#define PLL_EXTBUSDIV_4                0x00000200
+#define PLL_EXTBUSDIV_5                0x00000300
     /* MAL divisor */
-#define PLL_MALDIV                0x00000030
-#define CPC0_PLLMR0_MPDV          0x00000030
-#define PLL_MALDIV_1              0x00000000
-#define PLL_MALDIV_2              0x00000010
-#define PLL_MALDIV_3              0x00000020
-#define PLL_MALDIV_4              0x00000030
+#define PLL_MALDIV             0x00000030
+#define CPC0_PLLMR0_MPDV       0x00000030
+#define PLL_MALDIV_1           0x00000000
+#define PLL_MALDIV_2           0x00000010
+#define PLL_MALDIV_3           0x00000020
+#define PLL_MALDIV_4           0x00000030
     /* PCI divisor */
-#define PLL_PCIDIV                0x00000003
-#define CPC0_PLLMR0_PPFD          0x00000003
-#define PLL_PCIDIV_1              0x00000000
-#define PLL_PCIDIV_2              0x00000001
-#define PLL_PCIDIV_3              0x00000002
-#define PLL_PCIDIV_4              0x00000003
+#define PLL_PCIDIV             0x00000003
+#define CPC0_PLLMR0_PPFD       0x00000003
+#define PLL_PCIDIV_1           0x00000000
+#define PLL_PCIDIV_2           0x00000001
+#define PLL_PCIDIV_3           0x00000002
+#define PLL_PCIDIV_4           0x00000003
 
 /* CPU - PLB/SDRAM - EBC - OPB - PCI (assuming a 33.3MHz input clock to the 405EP) */
 #define PLLMR0_133_133_33_66_33         (PLL_CPUDIV_1 | PLL_PLBDIV_1 |  \
-                             PLL_OPBDIV_2 | PLL_EXTBUSDIV_4 |  \
-                             PLL_MALDIV_1 | PLL_PCIDIV_4)
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_4 |      \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_4)
 #define PLLMR1_133_133_33_66_33         (PLL_FBKDIV_4  |  \
-                             PLL_FWDDIVA_6 | PLL_FWDDIVB_6 |  \
-                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
-#define PLLMR0_200_100_50_33 (PLL_CPUDIV_1 | PLL_PLBDIV_2 |  \
-                             PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 |  \
-                             PLL_MALDIV_1 | PLL_PCIDIV_4)
-#define PLLMR1_200_100_50_33 (PLL_FBKDIV_6  |  \
-                             PLL_FWDDIVA_4 | PLL_FWDDIVB_4 |  \
-                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
-#define PLLMR0_266_133_33_66_33 (PLL_CPUDIV_1 | PLL_PLBDIV_2 | \
-                             PLL_OPBDIV_2 | PLL_EXTBUSDIV_4 |  \
-                             PLL_MALDIV_1 | PLL_PCIDIV_4)
-#define PLLMR1_266_133_33_66_33 (PLL_FBKDIV_8  |  \
-                             PLL_FWDDIVA_3 | PLL_FWDDIVB_3 |  \
-                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
-#define PLLMR0_333_111_37_55_55 (PLL_CPUDIV_1 | PLL_PLBDIV_3 | \
-                             PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 |  \
-                             PLL_MALDIV_1 | PLL_PCIDIV_2)
-#define PLLMR1_333_111_37_55_55 (PLL_FBKDIV_10 |  \
-                             PLL_FWDDIVA_3 | PLL_FWDDIVB_3 |  \
-                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_HI)
+                                 PLL_FWDDIVA_6 | PLL_FWDDIVB_6 |  \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+#define PLLMR0_200_100_50_33    (PLL_CPUDIV_1 | PLL_PLBDIV_2 |  \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 |      \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_4)
+#define PLLMR1_200_100_50_33    (PLL_FBKDIV_6  |  \
+                                 PLL_FWDDIVA_4 | PLL_FWDDIVB_4 |  \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+#define PLLMR0_266_133_33_66_33         (PLL_CPUDIV_1 | PLL_PLBDIV_2 | \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_4 |      \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_4)
+#define PLLMR1_266_133_33_66_33         (PLL_FBKDIV_8  |  \
+                                 PLL_FWDDIVA_3 | PLL_FWDDIVB_3 |  \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+#define PLLMR0_333_111_37_55_55         (PLL_CPUDIV_1 | PLL_PLBDIV_3 | \
+                                 PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 |      \
+                                 PLL_MALDIV_1 | PLL_PCIDIV_2)
+#define PLLMR1_333_111_37_55_55         (PLL_FBKDIV_10 |  \
+                                 PLL_FWDDIVA_3 | PLL_FWDDIVB_3 |  \
+                                 PLL_TUNE_15_M_40 | PLL_TUNE_VCO_HI)
 
 #if   (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_HI)
 /* Model HI */
 
 #endif /* CONFIG_NO_SERIAL_EEPROM */
 
-#define CONFIG_JFFS2_NAND 1                    /* jffs2 on nand support */
+#define CONFIG_JFFS2_NAND 1                    /* jffs2 on nand support */
 #define CONFIG_JFFS2_NAND_DEV 0                        /* nand device jffs2 lives on */
 #define CONFIG_JFFS2_NAND_OFF 0                        /* start of jffs2 partition */
 #define CONFIG_JFFS2_NAND_SIZE 2*1024*1024     /* size of jffs2 partition */