]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Fix SysClk handling for PPChameleon and CATcenter boards
authorwdenk <wdenk>
Thu, 9 Sep 2004 17:44:35 +0000 (17:44 +0000)
committerwdenk <wdenk>
Thu, 9 Sep 2004 17:44:35 +0000 (17:44 +0000)
CHANGELOG
Makefile
include/configs/CATcenter.h
include/configs/PPChameleonEVB.h

index 490790697829bbfe7fd84e9c81bb064c7ddc4772..7287009c6b7550745d13c357ac3b04261df97bce 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Fix SysClk handling for PPChameleon and CATcenter boards
+
 * Patch by Detlev Zundel, 08 Sep 2004:
   Update etags build target
 
index ba52bdd37768cb06840894ccabdcb94f48eafabb..c693b6afa61b92c0a11b6a4ba7d3a3a8a64eb46c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -680,9 +680,19 @@ BUBINGA405EP_config:       unconfig
 CANBT_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx canbt esd
 
-CATcenter_config:      unconfig
+CATcenter_config       \
+CATcenter_25_config    \
+CATcenter_33_config:   unconfig
        @ echo "/* CATcenter uses PPChameleon Model ME */"  > include/config.h
        @ echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> include/config.h
+       @[ -z "$(findstring _25,$@)" ] || \
+               { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>include/config.h ; \
+                 echo "SysClk = 25MHz" ; \
+               }
+       @[ -z "$(findstring _33,$@)" ] || \
+               { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>include/config.h ; \
+                 echo "SysClk = 33MHz" ; \
+               }
        @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
 CPCI405_config \
@@ -771,25 +781,25 @@ PPChameleonEVB_BA_33_config       \
 PPChameleonEVB_ME_33_config    \
 PPChameleonEVB_HI_33_config:   unconfig
        @ >include/config.h
-       @[ -z "$(findstring _MODEL_BA,$@)" ] || \
+       @[ -z "$(findstring EVB_BA,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>include/config.h ; \
                  echo "... BASIC model" ; \
                }
-       @[ -z "$(findstring _MODEL_ME,$@)" ] || \
+       @[ -z "$(findstring EVB_ME,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >>include/config.h ; \
                  echo "... MEDIUM model" ; \
                }
-       @[ -z "$(findstring _MODEL_HI,$@)" ] || \
+       @[ -z "$(findstring EVB_HI,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>include/config.h ; \
                  echo "... HIGH-END model" ; \
                }
        @[ -z "$(findstring _25,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>include/config.h ; \
-                 echo " SysClk = 25MHz" ; \
+                 echo "SysClk = 25MHz" ; \
                }
        @[ -z "$(findstring _33,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>include/config.h ; \
-                 echo " SysClk = 33MHz" ; \
+                 echo "SysClk = 33MHz" ; \
                }
        @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
index 4f81cde925942ba043fc681e6ea8b405d6370d4c..15420474df002f52d0a5129724d785573bedf2fc 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * ueberarbeitet durch Christoph Seyfert
+ *
  * (C) Copyright 2004 DENX Software Engineering,
  *     Wolfgang Grandegger <wg@denx.de>
  * (C) Copyright 2003
 #define CONFIG_PPCHAMELEON_MODULE_MODEL CONFIG_PPCHAMELEON_MODULE_BA
 #endif
 
+/* Only one of the following two symbols must be defined (default is 25 MHz)
+ * CONFIG_PPCHAMELEON_CLK_25
+ * CONFIG_PPCHAMELEON_CLK_33
+ */
+#if (!defined(CONFIG_PPCHAMELEON_CLK_25) && !defined(CONFIG_PPCHAMELEON_CLK_33))
+#define CONFIG_PPCHAMELEON_CLK_25
+#endif
+
+#if (defined(CONFIG_PPCHAMELEON_CLK_25) && defined(CONFIG_PPCHAMELEON_CLK_33))
+#error "* Two external frequencies (SysClk) are defined! *"
+#endif
+
+#undef CONFIG_PPCHAMELEON_SMI712
+
 /*
  * Debug stuff
  */
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
 #define CONFIG_MISC_INIT_R     1       /* call misc_init_r()           */
 
+#ifdef CONFIG_PPCHAMELEON_CLK_25
+# define CONFIG_SYS_CLK_FREQ   25000000 /* external frequency to pll   */
+#elif (defined (CONFIG_PPCHAMELEON_CLK_33))
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
+#else
+# error "* External frequency (SysClk) not defined! *"
+#endif
 
-#define CONFIG_UART1_CONSOLE   1       /* Use second UART      */
+#define CONFIG_UART1_CONSOLE   1       /* Use second UART              */
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
+#define CONFIG_VERSION_VARIABLE        1       /* add version variable         */
+#define CONFIG_IDENT_STRING    "1"
+
 #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_ETHADDR 00:50:C2:1E:AF:FE
+#define CONFIG_ETH1ADDR 00:50:C2:1E:AF:FD
 
 #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_NET_MULTI       1
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #ifndef         CONFIG_EXT_PHY
-#define CONFIG_PHY_ADDR                1       /* PHY address                  */
+#define CONFIG_PHY_ADDR                0       /* EMAC0 PHY address            */
+#define CONFIG_PHY1_ADDR       1       /* EMAC1 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_JFFS2   | \
                                CFG_CMD_MII     | \
-                               CFG_CMD_NAND    | \
-                               CFG_CMD_JFFS2)
+                               CFG_CMD_NAND    )
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 #define CFG_LONGHELP                   /* undef to save memory         */
 #define CFG_PROMPT             "=> "   /* Monitor Command Prompt       */
 
-#undef CFG_HUSH_PARSER                 /* use "hush" command parser    */
+#define        CFG_HUSH_PARSER                 /* use "hush" command parser    */
 #ifdef CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2    "> "
 #endif
 
 #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_SUBSYS_VENDORID 0x1014 /* PCI Vendor ID: IBM   */
+#define CFG_PCI_SUBSYS_DEVICEID 0x0000 /* PCI Device ID: ---   */
 #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_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  */
+#ifdef CONFIG_PPCHAMELEON_SMI712
+/*
+ * Video console (graphic: SMI LynxEM)
+ */
+#define CONFIG_VIDEO
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_SMI_LYNXEM
+#define CONFIG_VIDEO_LOGO
+/*#define CONFIG_VIDEO_BMP_LOGO*/
+#define CONFIG_CONSOLE_EXTRA_INFO
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+/* This is the base address (on 405EP-side) used to generate I/O accesses on PCI bus */
+#define CFG_ISA_IO 0xE8000000
+/* see also drivers/videomodes.c */
+#define CFG_DEFAULT_VIDEO_MODE 0x303
 #endif
 
 /*-----------------------------------------------------------------------
  * 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
+#define CFG_TEMP_STACK_OCM     1
 
 /* On Chip Memory location */
 #define CFG_OCM_DATA_ADDR      0xF8000000
 #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 PLL_PCIDIV_3           0x00000002
 #define PLL_PCIDIV_4           0x00000003
 
+#ifdef CONFIG_PPCHAMELEON_CLK_25
+/* CPU - PLB/SDRAM - EBC - OPB - PCI (assuming a 25.0 MHz input clock to the 405EP) */
+#define PPCHAMELEON_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 PPCHAMELEON_PLLMR1_133_133_33_66_33     (PLL_FBKDIV_8  |  \
+                             PLL_FWDDIVA_6 | PLL_FWDDIVB_4 |  \
+                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+
+#define PPCHAMELEON_PLLMR0_200_100_50_33 (PLL_CPUDIV_1 | PLL_PLBDIV_2 |  \
+                             PLL_OPBDIV_2 | PLL_EXTBUSDIV_3 |  \
+                             PLL_MALDIV_1 | PLL_PCIDIV_4)
+#define PPCHAMELEON_PLLMR1_200_100_50_33 (PLL_FBKDIV_8  |  \
+                             PLL_FWDDIVA_4 | PLL_FWDDIVB_4 |  \
+                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+
+#define PPCHAMELEON_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 PPCHAMELEON_PLLMR1_266_133_33_66_33 (PLL_FBKDIV_8  |  \
+                             PLL_FWDDIVA_3 | PLL_FWDDIVB_4 |  \
+                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_LOW)
+
+#define PPCHAMELEON_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 PPCHAMELEON_PLLMR1_333_111_37_55_55 (PLL_FBKDIV_10     |  \
+                             PLL_FWDDIVA_3 | PLL_FWDDIVB_4 |  \
+                             PLL_TUNE_15_M_40 | PLL_TUNE_VCO_HI)
+
+#elif (defined (CONFIG_PPCHAMELEON_CLK_33))
+
 /* 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 | \
+#define PPCHAMELEON_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 | \
+#define PPCHAMELEON_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 | \
+
+#define PPCHAMELEON_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 | \
+#define PPCHAMELEON_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 | \
+
+#define PPCHAMELEON_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 | \
+#define PPCHAMELEON_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 | \
+
+#define PPCHAMELEON_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 | \
+#define PPCHAMELEON_PLLMR1_333_111_37_55_55 (PLL_FBKDIV_10     |  \
+                                 PLL_FWDDIVA_3 | PLL_FWDDIVB_3 |  \
                                  PLL_TUNE_15_M_40 | PLL_TUNE_VCO_HI)
 
+#else
+#error "* External frequency (SysClk) not defined! *"
+#endif
+
 #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
+#define PLLMR0_DEFAULT PPCHAMELEON_PLLMR0_333_111_37_55_55
+#define PLLMR1_DEFAULT PPCHAMELEON_PLLMR1_333_111_37_55_55
+#define CFG_OPB_FREQ   55555555
 /* 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
+#define PLLMR0_DEFAULT PPCHAMELEON_PLLMR0_266_133_33_66_33
+#define PLLMR1_DEFAULT PPCHAMELEON_PLLMR1_266_133_33_66_33
+#define CFG_OPB_FREQ   66666666
 #else
 /* Model BA (default) */
-#define PLLMR0_DEFAULT         PLLMR0_133_133_33_66_33
-#define PLLMR1_DEFAULT         PLLMR1_133_133_33_66_33
+#define PLLMR0_DEFAULT PPCHAMELEON_PLLMR0_133_133_33_66_33
+#define PLLMR1_DEFAULT PPCHAMELEON_PLLMR1_133_133_33_66_33
+#define CFG_OPB_FREQ   66666666
 #endif
 
 #endif /* CONFIG_NO_SERIAL_EEPROM */
index b1f41a17279e05efc51ef5e8bbb98a2d3ad09d5d..03020f289040824f9cbec62b831fc192c9f39726 100644 (file)
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #ifndef         CONFIG_EXT_PHY
-#define CONFIG_PHY_ADDR                0       /* EMAC0 PHY address                    */
-#define CONFIG_PHY1_ADDR    1  /* EMAC1 PHY address                    */
+#define CONFIG_PHY_ADDR                0       /* EMAC0 PHY address            */
+#define CONFIG_PHY1_ADDR       1       /* EMAC1 PHY address            */
 #else
 #define CONFIG_PHY_ADDR                2       /* PHY address                  */
 #endif
 #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
 #define CFG_GPIO0_OSRH         0x40000550
 #define CFG_GPIO0_OSRL         0x00000110
 #define CFG_GPIO0_ISR1H                0x00000000
-/*#define CFG_GPIO0_ISR1L        0x15555445*/
+/*#define CFG_GPIO0_ISR1L      0x15555445*/
 #define CFG_GPIO0_ISR1L                0x15555444
 #define CFG_GPIO0_TSRH         0x00000000
 #define CFG_GPIO0_TSRL         0x00000000
 
 
 #define CONFIG_NO_SERIAL_EEPROM
-/*#undef CONFIG_NO_SERIAL_EEPROM*/
+
 /*--------------------------------------------------------------------*/
+
 #ifdef CONFIG_NO_SERIAL_EEPROM
 
 /*
 #define PLL_PCIDIV_3           0x00000002
 #define PLL_PCIDIV_4           0x00000003
 
-
 #ifdef CONFIG_PPCHAMELEON_CLK_25
 /* CPU - PLB/SDRAM - EBC - OPB - PCI (assuming a 25.0 MHz input clock to the 405EP) */
 #define PPCHAMELEON_PLLMR0_133_133_33_66_33     (PLL_CPUDIV_1 | PLL_PLBDIV_1 |  \
 
 #if   (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_HI)
 /* Model HI */
-#define PLLMR0_DEFAULT  PPCHAMELEON_PLLMR0_333_111_37_55_55
-#define PLLMR1_DEFAULT  PPCHAMELEON_PLLMR1_333_111_37_55_55
+#define PLLMR0_DEFAULT PPCHAMELEON_PLLMR0_333_111_37_55_55
+#define PLLMR1_DEFAULT PPCHAMELEON_PLLMR1_333_111_37_55_55
 #define CFG_OPB_FREQ   55555555
 /* Model ME */
 #elif (CONFIG_PPCHAMELEON_MODULE_MODEL == CONFIG_PPCHAMELEON_MODULE_ME)
-#define PLLMR0_DEFAULT  PPCHAMELEON_PLLMR0_266_133_33_66_33
-#define PLLMR1_DEFAULT  PPCHAMELEON_PLLMR1_266_133_33_66_33
+#define PLLMR0_DEFAULT PPCHAMELEON_PLLMR0_266_133_33_66_33
+#define PLLMR1_DEFAULT PPCHAMELEON_PLLMR1_266_133_33_66_33
 #define CFG_OPB_FREQ   66666666
 #else
 /* Model BA (default) */
-#define PLLMR0_DEFAULT  PPCHAMELEON_PLLMR0_133_133_33_66_33
-#define PLLMR1_DEFAULT  PPCHAMELEON_PLLMR1_133_133_33_66_33
+#define PLLMR0_DEFAULT PPCHAMELEON_PLLMR0_133_133_33_66_33
+#define PLLMR1_DEFAULT PPCHAMELEON_PLLMR1_133_133_33_66_33
 #define CFG_OPB_FREQ   66666666
 #endif
 
-#endif
+#endif /* CONFIG_NO_SERIAL_EEPROM */
 
-#define CONFIG_JFFS2_NAND 0                    /* 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 */