Update TX28 support and add support for TX28S AKA TX28-4130

[karo-tx-uboot.git] / include / configs / tx28.h

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index 10c759d04fb9da5e5ceffe64b37117ff80672fb3..dd384c594a3a7360021e41baae9778026040d705 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -19,13 +19,17 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <asm/sizes.h>
 #include <asm/arch/regs-base.h>
 
 /*
  * Ka-Ro TX28 board - SoC configuration
  */
 #define CONFIG_MX28                            /* i.MX28 SoC */
+#define        CONFIG_MXS_GPIO                         /* GPIO control */
 #define CONFIG_SYS_HZ          1000            /* Ticks per second */
+#define CONFIG_IDENT_STRING    "\nBoard: Ka-Ro TX28-40x0"
+#define CONFIG_SHOW_ACTIVITY
 
 #define CONFIG_SPL
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
@@ -33,13 +37,16 @@
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_GPIO_SUPPORT
+#define CONFIG_SPL_FIXED_BATT_SUPPLY
+#define CONFIG_SKIP_LOWLEVEL_INIT
 
 /*
  * Memory configurations
  */
 #define CONFIG_NR_DRAM_BANKS   1               /* 1 bank of DRAM */
 #define PHYS_SDRAM_1           0x40000000      /* Base address */
-#define PHYS_SDRAM_1_SIZE      0x08000000      /* 128 MB */
+#define PHYS_SDRAM_1_SIZE      SZ_128M
 #define CONFIG_STACKSIZE       0x00010000      /* 128 KB stack */
 #define CONFIG_SYS_MALLOC_LEN  0x00400000      /* 4 MB for malloc */
 #define CONFIG_SYS_GBL_DATA_SIZE 128           /* Reserved for initial data */
@@ -50,7 +57,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_SYS_PROMPT      "MX28 U-Boot > "
 #define CONFIG_SYS_CBSIZE      2048            /* Console I/O buffer size */
 #define CONFIG_SYS_PBSIZE \
@@ -74,6 +80,7 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_BOOTDELAY       3
+#define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_BOOTARGS                "console=ttyAMA0,115200 tx28_base=stkv3" \
        " tx28_otg_mode=device ro debug panic=1"
@@ -104,9 +111,6 @@
 
 #define MTD_NAME                       "gpmi-nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
-#define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":128k@" \
-       xstr(CONFIG_ENV_OFFSET)                               \
-       "(env),1m@0x40000(u-boot),4m(linux),16m(rootfs),-(userfs)"
 
 /*
  * U-Boot Commands
@@ -129,13 +133,18 @@
 /*
  * FEC Driver
  */
-#define CONFIG_MXC_FEC
+#define CONFIG_FEC_MXC
+#ifdef CONFIG_FEC_MXC
+/* This is required for the FEC driver to work with cache enabled */
+#define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
+
+#define CONFIG_FEC_MXC_MULTI
+
+#define CONFIG_MII
+#define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM
-#define CONFIG_FEC0_IOBASE             ((volatile void *)REGS_ENET_BASE)
-#define CONFIG_FEC0_PHY_ADDR           0
 #define CONFIG_NET_MULTI
 #define CONFIG_ETH_PRIME
-#define CONFIG_RMII
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
@@ -143,6 +152,7 @@
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_DNS
+#endif
 
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
@@ -154,17 +164,26 @@
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_MXS_NAND
+#define CONFIG_NAND_MXS
+#define CONFIG_APBH_DMA
+#define CONFIG_APBH_DMA_BURST
+#define CONFIG_APBH_DMA_BURST8
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_NAND_MAX_CHIPS      1
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define        CONFIG_SYS_NAND_5_ADDR_CYCLE
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_OFFSET              0x20000
 #define CONFIG_ENV_SIZE                        0x20000 /* 128 KiB */
+#if 0
+#define CONFIG_ENV_OFFSET_REDUND       0x40000
+#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
+#endif
 #endif
 #ifndef CONFIG_SYS_NO_FLASH
 #define CONFIG_CMD_FLASH
@@ -185,11 +204,10 @@
 #define CONFIG_ENV_IS_IN_MMC
 #endif
 #define CONFIG_MMC
-#define CONFIG_IMX_SSP_MMC             /* MMC driver based on SSP */
-#define CONFIG_GENERIC_MMC
+#define        CONFIG_GENERIC_MMC
+#define        CONFIG_MXS_MMC
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
-#define CONFIG_SYS_SSP_MMC_NUM         1
 
 #define CONFIG_BOOT_PARTITION_ACCESS
 #define CONFIG_DOS_PARTITION
@@ -210,18 +228,17 @@
 #endif /* CONFIG_ENV_IS_IN_MMC */
 #endif /* CONFIG_CMD_MMC */
 
-/* The global boot mode will be detected by ROM code and
- * a boot mode value will be stored at fixed address:
- * TO1.0 addr 0x0001a7f0
- * TO1.2 addr 0x00019BF0
- */
-#ifndef MX28_EVK_TO1_0
- #define GLOBAL_BOOT_MODE_ADDR 0x00019BF0
+#ifdef CONFIG_ENV_OFFSET_REDUND
+#define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":128k@"   \
+       xstr(CONFIG_ENV_OFFSET)                                         \
+       "(env),"                                                        \
+       xstr(CONFIG_ENV_OFFSET_REDUND)                          \
+       "(env2),1m(u-boot),4m(linux),16m(rootfs),-(userfs)"
 #else
- #define GLOBAL_BOOT_MODE_ADDR 0x0001a7f0
+#define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":128k@"   \
+       xstr(CONFIG_ENV_OFFSET)                                         \
+       "(env),1m(u-boot),4m(linux),16m(rootfs),-(userfs)"
 #endif
-#define BOOT_MODE_SD0 0x9
-#define BOOT_MODE_SD1 0xa
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \