From 056845c23522222613660c6af567049479367906 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:45 +0100 Subject: imx6: move all standard includes to mx6_common.h The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, config_cmd_default.h includes are used fairly universally across imx6 boards so include them in mx6_common.h by default. We define CONFIG_SYS_NO_FLASH before config_cmd_default.h so that we don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS everywhere. Signed-off-by: Peter Robinson --- include/configs/mx6sabre_common.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'include/configs/mx6sabre_common.h') diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index b72522bf52..9b80af5390 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -12,14 +12,10 @@ #define CONFIG_MX6 #include "mx6_common.h" -#include #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -89,12 +85,9 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 1 @@ -242,9 +235,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC -- cgit v1.2.3