summaryrefslogtreecommitdiffstats
path: root/include/configs/mx6sabre_common.h
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-05-22 17:30:45 +0100
committerStefano Babic <sbabic@denx.de>2015-05-26 15:58:48 +0200
commit056845c23522222613660c6af567049479367906 (patch)
tree06aea50f376843292fa7bdb921edf27766fdc53a /include/configs/mx6sabre_common.h
parent60667a53bc6dcdc5e8413c10689eadf7c8eb86bb (diff)
downloadtalos-obmc-uboot-056845c23522222613660c6af567049479367906.tar.gz
talos-obmc-uboot-056845c23522222613660c6af567049479367906.zip
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/mx6sabre_common.h')
-rw-r--r--include/configs/mx6sabre_common.h11
1 files changed, 1 insertions, 10 deletions
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 <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_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
@@ -89,12 +85,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 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
OpenPOWER on IntegriCloud