diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-05-22 17:30:45 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-05-26 15:58:48 +0200 |
| commit | 056845c23522222613660c6af567049479367906 (patch) | |
| tree | 06aea50f376843292fa7bdb921edf27766fdc53a /include/configs/aristainetos-common.h | |
| parent | 60667a53bc6dcdc5e8413c10689eadf7c8eb86bb (diff) | |
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 <pbrobinson@gmail.com>
Diffstat (limited to 'include/configs/aristainetos-common.h')
| -rw-r--r-- | include/configs/aristainetos-common.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 7d60cf9840..e9a0d46bc8 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -16,14 +16,10 @@ #define CONFIG_MX6 #include "mx6_common.h" -#include <linux/sizes.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) @@ -83,12 +79,9 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -229,9 +222,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 (12 * 1024) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT |