This keeps the compatibility with the old bootcmd.

Signed-off-by: Denis 'GNUtoo' Carikli <gnu...@cyberdimension.org>
---
 include/configs/tbs2910.h | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index b598fca1ec..8867918f37 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -8,6 +8,26 @@
 #ifndef __TBS2910_CONFIG_H
 #define __TBS2910_CONFIG_H
 
+#define CONFIG_BOOTCOMMAND \
+       "mmc rescan; " \
+       "if run bootcmd_up1; then " \
+               "run bootcmd_up2; " \
+       "else " \
+               "run bootcmd_mmc || run distro_bootcmd; " \
+       "fi"
+
+#ifndef CONFIG_SPL_BUILD
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(SATA, sata, 0) \
+       func(USB, usb, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
+#endif
+
 #include "mx6_common.h"
 
 /* General configuration */
@@ -80,6 +100,13 @@
 #define CONFIG_BOARD_SIZE_LIMIT                392192 /* (CONFIG_ENV_OFFSET - 
1024) */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "fdt_addr=0x13000000\0" \
+       "fdt_addr_r=0x13000000\0" \
+       "initrd_high=0xffffffff\0" \
+       "kernel_addr_r=0x10008000\0" \
+       "pxefile_addr_r=0x10008000\0" \
+       "ramdisk_addr_r=0x18000000\0" \
+       "scriptaddr=0x14000000\0" \
        "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
        "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \
                        "video=mxcfb1:off video=mxcfb2:off fbmem=28M\0" \
@@ -102,14 +129,8 @@
                        "setenv stderr serial,vga\0" \
        "stderr=serial,vga\0" \
        "stdin=serial,usbkbd\0" \
-       "stdout=serial,vga\0"
-
-#define CONFIG_BOOTCOMMAND \
-       "mmc rescan; " \
-       "if run bootcmd_up1; then " \
-               "run bootcmd_up2; " \
-       "else " \
-               "run bootcmd_mmc; " \
-       "fi"
+       "stdout=serial,vga\0" \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+       BOOTENV
 
 #endif                        /* __TBS2910_CONFIG_H * */
-- 
2.24.1

Reply via email to