imx6: fix warnings due to switch to distro environment

wandboard and mx6cuboxi have warnings because BOOT_DELAY
is defined twice.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Vagrant Cascadian <vagrant@debian.org>
CC: Otavio Salvador <otavio@ossystems.com.br>
CC: Fabio Estevam <fabio.estevam@freescale.com>

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 0f3b992d7aa9fa2fa5a7e3a5dcf02f2e874591fe..4feb12194bce7f2ea90a55e5c664e02593f9f16c 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -8,6 +8,7 @@
 #ifndef __MX6CUBOXI_CONFIG_H
 #define __MX6CUBOXI_CONFIG_H
 
 #ifndef __MX6CUBOXI_CONFIG_H
 #define __MX6CUBOXI_CONFIG_H
 

+#include <config_distro_defaults.h>

 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT


@@ -137,7 +138,6 @@
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 

-#include <config_distro_defaults.h>

 #include <config_distro_bootcmd.h>
 
 #else
 #include <config_distro_bootcmd.h>
 
 #else

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 6408b5e0ae2b4d6cc83185585504ea09cb500c12..4c8e9e9819fa58975c932d7ae6c9209cd6f0a84a 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -9,6 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 

+#include <config_distro_defaults.h>

 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT


@@ -166,7 +167,6 @@
           "run findfdt; " \
           "run distro_bootcmd"
 
           "run findfdt; " \
           "run distro_bootcmd"
 

-#include <config_distro_defaults.h>

 #include <config_distro_bootcmd.h>
 
 /* Physical Memory Map */
 #include <config_distro_bootcmd.h>
 
 /* Physical Memory Map */