Migrate CUSTOM_SYS_INIT_SP_ADDR to Kconfig using system-constants.h

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

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 813d326..58d6418 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -11,10 +11,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_FSL_CLK
-
-#define CONFIG_TIMESTAMP               /* Print image info with timestamp */
-
 /*
  * Memory configurations
  */
@@ -28,18 +24,9 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
 /*
  * U-Boot general configurations
  */
-#define CONFIG_SYS_CBSIZE      1024            /* Console I/O buffer size */
-#define CONFIG_SYS_MAXARGS     32              /* Max number of command args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-                                               /* Boot argument buffer size */
 
 /*
  * Serial Driver
@@ -73,13 +60,7 @@
  * Ethernet on SOC (FEC)
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC
-#define IMX_FEC_BASE                   FEC_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR         0x0
-#define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
-#define CONFIG_FEC_XCV_TYPE            RMII
-#define CONFIG_ETHPRIME                        "FEC0"
 #endif
 
 #define CONFIG_SYS_RTC_BUS_NUM         1 /* I2C2 */
@@ -105,7 +86,6 @@
  * SATA
  */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE     1
 #define CONFIG_DWC_AHSATA_PORT_ID      0
 #define CONFIG_DWC_AHSATA_BASE_ADDR    SATA_BASE_ADDR
 #define CONFIG_LBA48
@@ -114,7 +94,6 @@
 /*
  * LCD
  */
-#define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
 
 /* LVDS display */
@@ -127,24 +106,12 @@
 /* Watchdog */
 
 /*
- * Boot Linux
- */
-#define CONFIG_BOOTFILE                "boot/fitImage"
-#define CONFIG_BOOTCOMMAND     "run mmc_mmc"
-
-/*
  * NAND SPL
  */
 #define CONFIG_SPL_TARGET              "u-boot-with-nand-spl.imx"
-#define CONFIG_SPL_PAD_TO              0x8000
 #define CONFIG_SPL_STACK               0x70004000
 
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SPL_PAD_TO
-#define CONFIG_SYS_NAND_PAGE_SIZE      2048
-#define CONFIG_SYS_NAND_OOBSIZE                64
-#define CONFIG_SYS_NAND_PAGE_COUNT     64
 #define CONFIG_SYS_NAND_SIZE           (256 * 1024 * 1024)
-#define CONFIG_SYS_NAND_BAD_BLOCK_POS  0
 
 /*
  * Extra Environments
@@ -166,6 +133,13 @@
        "splashfile=boot/usplash.bmp.gz\0"                              \
        "splashimage=0x88000000\0"                                      \
        "splashpos=m,m\0"                                               \
+       "altbootcmd="                                                   \
+               "if test ${mmcpart} -eq 1 ; then "                      \
+                       "setenv mmcpart 2 ; "                           \
+               "else "                                                 \
+                       "setenv mmcpart 1 ; "                           \
+               "fi ; "                                                 \
+               "boot\0"                                                \
        "stdout=serial,vidconsole\0"                                    \
        "stderr=serial,vidconsole\0"                                    \
        "addcons="                                                      \
@@ -180,14 +154,14 @@
                "setenv bootargs ${bootargs} ${miscargs}\0"             \
        "addargs=run addcons addmisc addmtd\0"                          \
        "mmcload="                                                      \
-               "mmc rescan ; load mmc ${mmcdev}:${mmcpart} "           \
-               "${kernel_addr_r} ${bootfile}\0"                        \
+               "mmc rescan || reset ; load mmc ${mmcdev}:${mmcpart} "  \
+               "${kernel_addr_r} ${bootfile} || reset\0"               \
        "miscargs=nohlt panic=1\0"                                      \
        "mmcargs=setenv bootargs root=/dev/mmcblk0p${mmcpart} rw "      \
                "rootwait\0"                                            \
        "mmc_mmc="                                                      \
-               "run mmcload mmcargs addargs ; "                        \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run mmcload mmcargs addargs || reset ; "               \
+               "bootm ${kernel_addr_r} ; reset\0"                      \
        "netload=tftp ${kernel_addr_r} ${hostname}/${bootfile}\0"       \
        "net_nfs="                                                      \
                "run netload nfsargs addip addargs ; "                  \
@@ -205,9 +179,4 @@
                "fi ; "                                                 \
                "fi\0"
 
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
 #endif /* __M53MENLO_CONFIG_H__ */