arm: omap: Extract OMAP5 boot environment to separate file

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index d45baabf0b60ef57697516363799c9613d5ff685..4c3a2766ecbd73777118811eb73f8f0c42c8ba1b 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -50,14 +50,12 @@
 /*
  * 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
@@ -65,63 +63,11 @@
        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;" \
-       ""
-
 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
  * area between 0x40300000 and 0x4031E000 as a download area for OMAP5.

diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
new file mode 100644 (file)
index 0000000..1c3ae40
--- /dev/null
+++ b/include/environment/ti/boot.h
@@ -0,0 +1,83 @@
+/*
+ * Boot related environment variable definitions on TI boards.
+ *
+ * (C) Copyright 2017 Linaro Ltd.
+ * Sam Protsenko <semen.protsenko@linaro.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __TI_BOOT_H
+#define __TI_BOOT_H
+
+#ifndef CONSOLEDEV
+#define CONSOLEDEV "ttyO2"
+#endif
+
+#ifndef PARTS_DEFAULT
+#define PARTS_DEFAULT
+#endif
+
+#define DEFAULT_COMMON_BOOT_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"
+
+#ifdef CONFIG_OMAP54XX
+
+#define DEFAULT_FDT_TI_ARGS \
+       "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"
+
+#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;" \
+       ""
+
+#endif /* CONFIG_OMAP54XX */
+
+#endif /* __TI_BOOT_H */