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/mx6qarm2.h | |
| parent | 60667a53bc6dcdc5e8413c10689eadf7c8eb86bb (diff) | |
| download | u-boot-056845c23522222613660c6af567049479367906.tar.gz | |
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/mx6qarm2.h')
| -rw-r--r-- | include/configs/mx6qarm2.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 5412dd3c51..6233b125b7 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -16,8 +16,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include <asm/arch/imx-regs.h> - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,9 +60,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -176,9 +171,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_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC |