drivers/mtd: Move conditional compilation to Makefile

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

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index a6ed77a..c476333 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -4,7 +4,7 @@
  * Richard Woodruff <r-woodruff2@ti.com>
  * Kshitij Gupta <kshitij@ti.com>
  *
- * Configuration settings for the 242x TI H4 board.
+ * Configuration settings for the LogicPD i.MX31 Litekit board.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -28,6 +28,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <asm/arch/mx31-regs.h>
+
  /* High Level Configuration Options */
 #define CONFIG_ARM1136         1    /* This is an arm1136 CPU core */
 #define CONFIG_MX31            1    /* in a mx31 */
@@ -52,7 +54,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
-#define CFG_GBL_DATA_SIZE      128  /* num bytes reserved for initial data */
+#define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
@@ -61,6 +63,13 @@
 #define CONFIG_MX31_UART       1
 #define CFG_MX31_UART1         1
 
+#define CONFIG_HARD_SPI                1
+#define CONFIG_MXC_SPI         1
+#define CONFIG_DEFAULT_SPI_BUS 1
+#define CONFIG_DEFAULT_SPI_MODE        (SPI_MODE_2 | SPI_CS_HIGH)
+
+#define CONFIG_RTC_MC13783     1
+
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX      1
@@ -75,6 +84,8 @@
 
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
+#define CONFIG_CMD_SPI
+#define CONFIG_CMD_DATE
 
 #define CONFIG_BOOTDELAY       3
 
@@ -82,19 +93,17 @@
 #define CONFIG_IPADDR          192.168.23.168
 #define CONFIG_SERVERIP                192.168.23.2
 
-#define        CONFIG_EXTRA_ENV_SETTINGS                               \
-       "bootargs_base=setenv bootargs console=ttySMX0,115200\0"        \
-       "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs "       \
-               "ip=dhcp nfsroot=$(serverip):$(nfsrootfs), v3, tcp\0"   \
-       "bootcmd=run bootcmd_net\0"                                     \
-       "bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; "     \
-               "tftpboot 0x80000000 uImage-mx31; bootm\0"              \
-       "prg_uboot=tftpboot 0x80000000 u-boot-imx31_litekit.bin; "      \
-               "protect off all; erase 0xa00d0000 0xa01effff; "        \
-               "cp.b 0x80000000 0xa00d0000 $(filesize)\0"
+#define        CONFIG_EXTRA_ENV_SETTINGS                                                                                       \
+       "bootargs_base=setenv bootargs console=ttySMX0,115200\0"                                                        \
+       "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0"      \
+       "bootcmd=run bootcmd_net\0"                                                                                     \
+       "bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; tftpboot 0x80000000 uImage-mx31; bootm\0"             \
+       "prg_uboot=tftpboot 0x80000000 u-boot-imx31_litekit.bin; protect off all; erase 0xa00d0000 0xa01effff; cp.b 0x80000000 0xa00d0000 $(filesize)\0"
+
 
 #define CONFIG_DRIVER_SMC911X          1
-#define CONFIG_DRIVER_SMC911X_BASE     0xb4020000
+#define CONFIG_DRIVER_SMC911X_BASE     (CS4_BASE + 0x00020000)
+#define CONFIG_DRIVER_SMC911X_32_BIT   1
 
 /*
  * Miscellaneous configurable options
@@ -129,19 +138,18 @@
  * Physical Memory Map
  */
 #define CONFIG_NR_DRAM_BANKS   1
-#define PHYS_SDRAM_1           0x80000000
+#define PHYS_SDRAM_1           CSD0_BASE
 #define PHYS_SDRAM_1_SIZE      (128 * 1024 * 1024)
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_FLASH_BASE         0xa0000000
-#define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
-#define CFG_MAX_FLASH_SECT     128     /* max number of sectors on one chip */
-/* Monitor at beginning of flash */
-#define CFG_MONITOR_BASE       CFG_FLASH_BASE
+#define CFG_FLASH_BASE         CS0_BASE
+#define CFG_MAX_FLASH_BANKS    1           /* max number of memory banks */
+#define CFG_MAX_FLASH_SECT     128          /* max number of sectors on one chip */
+#define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
-#define CFG_ENV_ADDR           0xa01f0000
+#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x001f0000)
 #define        CFG_ENV_IS_IN_FLASH     1
 #define CFG_ENV_SECT_SIZE      (64 * 1024)
 #define CFG_ENV_SIZE           (64 * 1024)
@@ -150,7 +158,7 @@
  * CFI FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */