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/ot1200.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'include/configs/ot1200.h') diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 200f40a..15c49d9 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -13,9 +13,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -152,9 +149,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 2 @@ -190,9 +184,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_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 * 1024) /* 64 kb */ #define CONFIG_ENV_OFFSET (1024 * 1024) -- cgit v1.1