powerpc: mpc85xx: Move CONFIG_FSL_PCIE_RESET to Kconfig

[platform/kernel/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 97bd874..de0a6af 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013
  * Texas Instruments Incorporated.
@@ -8,8 +9,6 @@
  *
  * TI OMAP5 AND DRA7XX common configuration settings
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * For more details, please see the technical documents listed at
  * http://www.ti.com/product/omap5432
  */
@@ -50,75 +49,24 @@
 /*
  * Environment setup
  */
-#ifndef PARTS_DEFAULT
-#define PARTS_DEFAULT
-#endif
 
 #ifndef DFUARGS
 #define DFUARGS
 #endif
 
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+#include <environment/ti/boot.h>
+#include <environment/ti/mmc.h>
+#include <environment/ti/nand.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
        DEFAULT_MMC_TI_ARGS \
        DEFAULT_FIT_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" \
-       "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 = dra71x; then " \
-                       "setenv fdtfile dra71-evm.dtb; fi;" \
-               "if test $board_name = beagle_x15; then " \
-                       "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
-               "if test $board_name = beagle_x15_revb1; then " \
-                       "setenv fdtfile am57xx-beagle-x15-revb1.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 $board_name = am57xx_evm_reva3; then " \
-                       "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
-               "if test $board_name = am571x_idk; then " \
-                       "setenv fdtfile am571x-idk.dtb; fi;" \
-               "if test $fdtfile = undefined; then " \
-                       "echo WARNING: Could not determine device tree to use; fi; \0" \
+       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 " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
-       "fi;" \
-       "if test ${boot_fit} -eq 1; then "      \
-               "run update_to_fit;"    \
-       "fi;"   \
-       "run findfdt; " \
-       "run envboot; " \
-       "run mmcboot;" \
-       "setenv mmcdev 1; " \
-       "setenv bootpart 1:2; " \
-       "setenv mmcroot /dev/mmcblk0p2 rw; " \
-       "run mmcboot;" \
-       ""
+       NANDARGS \
 
 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
@@ -135,7 +83,6 @@
  * RAM from address 0x40301350 (0x40300000+0x1000(reserved)+0x350(cert)).
  */
 #define TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ      0x1000
-#define CONFIG_SPL_TEXT_BASE   0x40301350
 /* If no specific start address is specified then the secure EMIF
  * region will be placed at the end of the DDR space. In order to prevent
  * the main u-boot relocation from clobbering that memory and causing a
@@ -149,17 +96,10 @@
  * For all booting on GP parts, the flash loader image is
  * downloaded into internal RAM at address 0x40300000.
  */
-#define CONFIG_SPL_TEXT_BASE   0x40300000
 #endif
 
-#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/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
-
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_TIMER
 #endif