Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / ti_omap5_common.h

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 29b7d96d9622de87d04b23ff1cd74995c3053594..539164177b9d486e586496b1cf8c894fde7820e2 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -17,9 +17,6 @@
 #ifndef __CONFIG_TI_OMAP5_COMMON_H
 #define __CONFIG_TI_OMAP5_COMMON_H
 
-/* Common ARM Erratas */
-#define CONFIG_ARM_ERRATA_798870
-
 /* Use General purpose timer 1 */
 #define CONFIG_SYS_TIMERBASE           GPT2_BASE
 
@@ -45,7 +42,7 @@
  * Hardware drivers
  */
 #define CONFIG_SYS_NS16550_CLK         48000000
-#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
+#if !defined(CONFIG_DM_SERIAL)
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #endif
@@ -53,78 +50,24 @@
 /*
  * Environment setup
  */
-#ifndef PARTS_DEFAULT
-#define PARTS_DEFAULT
-#endif
 
 #ifndef DFUARGS
 #define DFUARGS
 #endif
 
+#include <environment/ti/boot.h>
+#include <environment/ti/mmc.h>
+
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
        DEFAULT_MMC_TI_ARGS \
-       "console=" CONSOLEDEV ",115200n8\0" \
-       "fdtfile=undefined\0" \
-       "bootpart=0:2\0" \
-       "bootdir=/boot\0" \
-       "bootfile=zImage\0" \
-       "usbtty=cdc_acm\0" \
-       "vram=16M\0" \
-       "partitions=" PARTS_DEFAULT "\0" \
-       "optargs=\0" \
-       "dofastboot=0\0" \
-       "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-       "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
-               "source ${loadaddr}\0" \
-       "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-       "mmcboot=mmc dev ${mmcdev}; " \
-               "if mmc rescan; then " \
-                       "echo SD/MMC found on device ${mmcdev};" \
-                       "if run loadimage; then " \
-                               "run loadfdt; " \
-                               "echo Booting from mmc${mmcdev} ...; " \
-                               "run args_mmc; " \
-                               "bootz ${loadaddr} - ${fdtaddr}; " \
-                       "fi;" \
-               "fi;\0" \
-       "findfdt="\
-               "if test $board_name = omap5_uevm; then " \
-                       "setenv fdtfile omap5-uevm.dtb; fi; " \
-               "if test $board_name = dra7xx; then " \
-                       "setenv fdtfile dra7-evm.dtb; fi;" \
-               "if test $board_name = dra72x-revc; then " \
-                       "setenv fdtfile dra72-evm-revc.dtb; fi;" \
-               "if test $board_name = dra72x; then " \
-                       "setenv fdtfile dra72-evm.dtb; fi;" \
-               "if test $board_name = beagle_x15; then " \
-                       "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
-               "if test $board_name = am572x_idk; then " \
-                       "setenv fdtfile am572x-idk.dtb; fi;" \
-               "if test $board_name = am57xx_evm; then " \
-                       "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
-               "if test $fdtfile = undefined; then " \
-                       "echo WARNING: Could not determine device tree to use; fi; \0" \
-       "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
+       DEFAULT_FIT_TI_ARGS \
+       DEFAULT_COMMON_BOOT_TI_ARGS \
+       DEFAULT_FDT_TI_ARGS \
        DFUARGS \
        NETARGS \
 
-#define CONFIG_BOOTCOMMAND \
-       "if test ${dofastboot} -eq 1; then " \
-               "echo Boot fastboot requested, resetting dofastboot ...;" \
-               "setenv dofastboot 0; saveenv;" \
-               "echo Booting into fastboot ...; fastboot 0;" \
-       "fi;" \
-       "run findfdt; " \
-       "run envboot; " \
-       "run mmcboot;" \
-       "setenv mmcdev 1; " \
-       "setenv bootpart 1:2; " \
-       "setenv mmcroot /dev/mmcblk0p2 rw; " \
-       "run mmcboot;" \
-       ""
-
 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
  * area between 0x40300000 and 0x4031E000 as a download area for OMAP5.
@@ -157,22 +100,11 @@
 #define CONFIG_SPL_TEXT_BASE   0x40300000
 #endif
 
-#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 #define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
                                         (128 << 20))
 
-#ifdef CONFIG_NAND
-#define CONFIG_SPL_NAND_AM33XX_BCH     /* ELM support */
-#endif
-
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
 #ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_MMC
 #undef CONFIG_TIMER
-#undef CONFIG_DM_ETH
 #endif
 
 #endif /* __CONFIG_TI_OMAP5_COMMON_H */