x86: x86-common.h: Add generic FS commands

[u-boot] / include / configs / novena.h

diff --git a/include/configs/novena.h b/include/configs/novena.h
index cd426be18c6ad5c6e9e3144bd768b2cda19f4d96..5f0a2302de573a6d58a7c18a5fdaa743a1dd5622 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 */
@@ -82,6 +83,7 @@
 
 /* SPL */
 #define CONFIG_SPL_FAT_SUPPORT
+#define CONFIG_SPL_EXT_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 
@@ -189,6 +191,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 +200,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 +249,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 */