drivers/mtd: Move conditional compilation to Makefile

[platform/kernel/u-boot.git] / include / configs / stxssa.h

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index f32ff67..4f1c156 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -41,6 +41,7 @@
 #define CONFIG_MPC85xx         1       /* MPC8540/MPC8560      */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_STXSSA          1       /* Silicon Tx GPPP SSA board specific*/
+#define CONFIG_MPC8560         1
 
 #define CONFIG_PCI                     /* PCI ethernet support */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support*/
@@ -51,6 +52,7 @@
 #undef CONFIG_DDR_DLL                  /* possible DLL fix needed */
 #define CONFIG_DDR_2T_TIMING           /* Sets the 2T timing bit */
 
+#define CONFIG_FSL_LAW         1       /* Use common FSL init code */
 
 /* sysclk for MPC85xx
  */
@@ -68,10 +70,10 @@
 #define  CONFIG_BTB                            /* toggle branch predition */
 #define  CONFIG_ADDR_STREAMING                 /* toggle addr streaming        */
 
-#define CONFIG_BOARD_EARLY_INIT_F   1          /* Call board_pre_init   */
+#define CONFIG_BOARD_EARLY_INIT_F   1          /* Call board_pre_init   */
 
-#undef CFG_DRAM_TEST                           /* memory test, takes time      */
-#define CFG_MEMTEST_START      0x00200000      /* memtest region */
+#undef CFG_DRAM_TEST                           /* memory test, takes time      */
+#define CFG_MEMTEST_START      0x00200000      /* memtest region */
 #define CFG_MEMTEST_END                0x00400000
 
 
@@ -96,7 +98,7 @@
 #define CFG_OR0_PRELIM (CFG_FLASH_BASE | 0x0FF7)
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks   */
@@ -126,6 +128,7 @@
 #define CFG_CCSRBAR_DEFAULT    0xff700000      /* CCSRBAR Default      */
 #endif
 #define CFG_CCSRBAR            0xe0000000      /* relocated CCSRBAR    */
+#define CFG_CCSRBAR_PHYS       CFG_CCSRBAR     /* physical addr of CCSRBAR */
 #define CFG_IMMR               CFG_CCSRBAR     /* PQII uses CFG_IMMR   */
 
 
@@ -189,20 +192,21 @@
 #define CFG_PROMPT_HUSH_PS2 "> "
 #endif
 
-/* I2C */
+/*
+ * I2C
+ */
 #define CONFIG_FSL_I2C                 /* Use FSL common I2C driver */
 #define  CONFIG_HARD_I2C               /* I2C with hardware support*/
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
 #define CFG_I2C_SPEED          400000  /* I2C speed and slave address  */
 #define CFG_I2C_SLAVE          0x7F
-#if 0
-#define CFG_I2C_NOPROBES       {0x00}  /* Don't probe these addrs */
-#else
-/* I did the 'if 0' so we could keep the syntax above if ever needed. */
 #undef CFG_I2C_NOPROBES
-#endif
 #define CFG_I2C_OFFSET         0x3000
 
+/* I2C RTC */
+#define CONFIG_RTC_DS1337              /* This is really a DS1339 RTC  */
+#define CFG_I2C_RTC_ADDR       0x68    /* at address 0x68              */
+
 /* I2C EEPROM. AT24C32, we keep our environment in here.
 */
 #define CFG_I2C_EEPROM_ADDR            0x51    /* 1010001x             */
@@ -229,8 +233,8 @@
 #define CFG_PCI2_IO_PHYS       0xe3000000
 #define CFG_PCI2_IO_SIZE       0x01000000      /* 16M */
 
-#if defined(CONFIG_PCI)                /* PCI Ethernet card */
-
+#if defined(CONFIG_PCI)                        /* PCI Ethernet card */
+#define CONFIG_MPC85XX_PCI2    1
 #define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
@@ -341,8 +345,13 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_PING
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SNTP
 
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI
@@ -385,13 +394,6 @@
  */
 #define CFG_BOOTMAPSZ          (8 << 20) /* Initial Memory map for Linux */
 
-/* Cache Configuration */
-#define CFG_DCACHE_SIZE                32768
-#define CFG_CACHELINE_SIZE     32
-#if defined(CONFIG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT    5       /* log base 2 of the above value */
-#endif
-
 /*
  * Internal Definitions
  *
@@ -427,13 +429,13 @@
 #define CONFIG_BOOTDELAY       3       /* -1 disable autoboot */
 #define CONFIG_BOOTCOMMAND     "bootm 0xffc00000 0xffd00000"
 #define CONFIG_BOOTARGS                "root=/dev/nfs rw ip=any console=ttyS1,$baudrate"
-#define CONFIG_SERVERIP        192.168.85.1
+#define CONFIG_SERVERIP                192.168.85.1
 #define CONFIG_IPADDR          192.168.85.60
 #define CONFIG_GATEWAYIP       192.168.85.1
 #define CONFIG_NETMASK         255.255.255.0
-#define CONFIG_HOSTNAME        STX_SSA
-#define CONFIG_ROOTPATH        /gppproot
-#define CONFIG_BOOTFILE        uImage
+#define CONFIG_HOSTNAME                STX_SSA
+#define CONFIG_ROOTPATH                /gppproot
+#define CONFIG_BOOTFILE                uImage
 #define CONFIG_LOADADDR                0x1000000
 
 #else /* ENV IS IN FLASH               -- use a full-blown envionment */