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 <[email protected]>

CC Vagrant Cascadian <[email protected]>

CC Otavio Salvador <[email protected]>

CC Fabio Estevam <[email protected]>

---
 include/configs/mx6cuboxi.h | 2 +-
 include/configs/wandboard.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

include/configs/mx6cuboxi.h +1 -1

index 0f3b992..4feb121 100644
@@ -8,6 +8,7 @@
 #ifndef __MX6CUBOXI_CONFIG_H
 #define __MX6CUBOXI_CONFIG_H
 
+#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT

@@ -137,7 +138,6 @@
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
 
-#include <config_distro_defaults.h>
 #include <config_distro_bootcmd.h>
 
 #else

include/configs/wandboard.h +1 -1

index 6408b5e..4c8e9e9 100644
@@ -9,6 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT

@@ -166,7 +167,6 @@
 	   "run findfdt; " \
 	   "run distro_bootcmd"
 
-#include <config_distro_defaults.h>
 #include <config_distro_bootcmd.h>
 
 /* Physical Memory Map */

Signature · 1 line

1.9.1