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>
This commit is contained in:
Stefano Babic 2015-11-13 10:49:01 +01:00
parent ebe517b63c
commit 3d99e86269
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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 */