arm-novena-Switch-novena-to-config_distro_bootcmd

Signed-off-by: Vagrant Cascadian <vagrant@aikidev.net>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Sean Cross <xobs@kosagi.com>
Cc: Stefano Babic <sbabic@denx.de>
Gbp-Pq: Topic novena
Gbp-Pq: Name 0001-arm-novena-Switch-novena-to-config_distro_bootcmd.patch

diff --git a/include/configs/novena.h b/include/configs/novena.h
index cd426be18c6ad5c6e9e3144bd768b2cda19f4d96..f1efa1d6d11b07ddcc450a41db88e74d9ee1913d 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -16,6 +16,7 @@
 #define CONFIG_FIT
 #define CONFIG_KEYBOARD
 
+#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* U-Boot Commands */
@@ -58,7 +59,7 @@
 /* Booting Linux */
 #define CONFIG_BOOTFILE                        "fitImage"
 #define CONFIG_BOOTARGS                        "console=ttymxc1,115200 "
-#define CONFIG_BOOTCOMMAND             "run net_nfs"
+#define CONFIG_BOOTCOMMAND             "run distro_bootcmd ; run net_nfs"
 #define CONFIG_HOSTNAME                        novena
 
 /* Physical Memory Map */
@@ -189,6 +190,7 @@
 #endif
 
 /* Extra U-Boot environment. */
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "fdt_high=0xffffffff\0"                                         \
        "initrd_high=0xffffffff\0"                                      \
@@ -197,7 +199,12 @@
        "bootdev=/dev/mmcblk0p1\0"                                      \
        "rootdev=/dev/mmcblk0p2\0"                                      \
        "netdev=eth0\0"                                                 \
-       "kernel_addr_r=0x18000000\0"                                    \
+       "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"                \
+       "pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"               \
+       "scriptaddr="__stringify(CONFIG_LOADADDR)"\0"                   \
+       "ramdisk_addr_r=0x28000000\0"                                   \
+       "fdt_addr_r=0x18000000\0"                                       \
+       "fdtfile=imx6q-novena.dtb\0"                                    \
        "addcons="                                                      \
                "setenv bootargs ${bootargs} "                          \
                "console=${consdev},${baudrate}\0"                      \
@@ -241,5 +248,19 @@
                "fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\
                "fi ; "                                                 \
                "fi\0"                                                  \
+       BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(SATA, sata, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif /* CONFIG_SPL_BUILD */
 
 #endif                         /* __CONFIG_H */