Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh

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

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index f55d81f..5ecc97f 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -11,14 +11,17 @@
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
 #include "at91-sama5_common.h"
-#undef CONFIG_BOOTARGS
 #define CONFIG_SYS_USE_SERIALFLASH     1
+#define CONFIG_BOARD_LATE_INIT
+
+/* Timer */
+#define CONFIG_SYS_TIMER_COUNTER       0xfc06863c
 
 /*
  * Memory configurations
  */
 #define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
+#define CONFIG_SYS_SDRAM_BASE          0x20000000
 #define CONFIG_SYS_SDRAM_SIZE          0x10000000
 
 #ifdef CONFIG_SPL_BUILD
@@ -31,13 +34,11 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_OFFSET              0x8000
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
+#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 #define CONFIG_ENV_SIZE                        0x4000
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
-#define CONFIG_ENV_SECT_SIZE           0x1000
+#define CONFIG_SYS_MMC_ENV_DEV         0       /* eMMC */
+#define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
 /*
  * U-Boot general configurations
@@ -47,8 +48,8 @@
  * Serial Driver
  */
 #define CONFIG_ATMEL_USART
-#define CONFIG_USART_BASE              ATMEL_BASE_USART0
-#define CONFIG_USART_ID                        ATMEL_ID_USART0
+#define CONFIG_USART_BASE              0xf802c000
+#define CONFIG_USART_ID                        6
 
 /*
  * Ethernet
@@ -97,12 +98,11 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
 
 /* USB device */
-#define CONFIG_USB_ETHER
-#define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_MANUFACTURER      "AriesEmbedded"
+#define CONFIG_USB_FUNCTION_MASS_STORAGE
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE   (1 * 1024 * 1024)
+#define DFU_DEFAULT_POLL_TIMEOUT       300
 #endif
 
 /*
@@ -112,7 +112,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_BOOTFILE                "fitImage"
-#define CONFIG_BOOTARGS                "console=ttyS3,115200"
 #define CONFIG_LOADADDR                0x20800000
 #define CONFIG_BOOTCOMMAND     "run mmc_mmc"
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
@@ -127,10 +126,11 @@
        "consdev=ttyS3\0"                                               \
        "baudrate=115200\0"                                             \
        "bootscript=boot.scr\0"                                         \
-       "bootdev=/dev/mmcblk1p1\0"                                      \
-       "bootpart=1:1\0"                                                \
-       "rootdev=/dev/mmcblk1p2\0"                                      \
+       "bootdev=/dev/mmcblk0p1\0"                                      \
+       "bootpart=0:1\0"                                                \
+       "rootdev=/dev/mmcblk0p2\0"                                      \
        "netdev=eth0\0"                                                 \
+       "dfu_alt_info=mmc raw 0 3867148288\0"                           \
        "kernel_addr_r=0x22000000\0"                                    \
        "update_spi_firmware_spl_addr=0x21000000\0"                     \
        "update_spi_firmware_spl_filename=boot.bin\0"                   \
@@ -171,22 +171,27 @@
        "nfsargs="                                                      \
                "setenv bootargs root=/dev/nfs rw "                     \
                        "nfsroot=${serverip}:${rootpath},v3,tcp\0"      \
+       "fdtimg=if test ${bootmode} = \"sf\" ; then "                   \
+                       "setenv kernel_fdt 1 ; "                        \
+               "else ; "                                               \
+                       "setenv kernel_fdt 2 ; "                        \
+               "fi\0"                                                  \
        "mmc_mmc="                                                      \
-               "run mmcload mmcargs addargs ; "                        \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg mmcload mmcargs addargs ; "                 \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "mmc_nfs="                                                      \
-               "run mmcload nfsargs addip addargs ; "                  \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg mmcload nfsargs addip addargs ; "                   \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "net_mmc="                                                      \
-               "run netload mmcargs addargs ; "                        \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg netload mmcargs addargs ; "                 \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "net_nfs="                                                      \
-               "run netload nfsargs addip addargs ; "                  \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg netload nfsargs addip addargs ; "                   \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "try_bootscript="                                               \
                "mmc rescan;"                                           \
-               "if test -e mmc ${bootpart} ${bootscript} ; then "      \
-               "if load mmc ${bootpart} ${kernel_addr_r} ${bootscript};"\
+               "if test -e mmc 1:1 ${bootscript} ; then "              \
+               "if load mmc 1:1 ${kernel_addr_r} ${bootscript};"       \
                "then ; "                                               \
                        "echo Running bootscript... ; "                 \
                        "source ${kernel_addr_r} ; "                    \
@@ -206,4 +211,12 @@
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 
+#define CONFIG_SYS_USE_MMC
+#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
+#define CONFIG_SPL_FAT_SUPPORT
+#define CONFIG_SPL_LIBDISK_SUPPORT
+
 #endif /* __MA5D4EVK_CONFIG_H__ */