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/mx6cuboxi.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index b6f9d4e..9f260bb 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -8,9 +8,6 @@ #ifndef __MX6CUBOXI_CONFIG_H #define __MX6CUBOXI_CONFIG_H -#include -#include -#include #include "mx6_common.h" #define CONFIG_MX6 @@ -107,11 +104,7 @@ "setenv stderr serial; " \ "fi;" -#define CONFIG_SYS_NO_FLASH - /* Command definition */ -#include - #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -- cgit v1.1 From 3b1f681131149b5f62602f582a7e60b0185a2a49 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:46 +0100 Subject: imx6: move generic imx6 options to mx6_common.h All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO, CONFIG_DISPLAY_CPUINFO and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common Signed-off-by: Peter Robinson Reviewed-by: Tom Rini --- include/configs/mx6cuboxi.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 9f260bb..c434fa2 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -10,19 +10,15 @@ #include "mx6_common.h" -#define CONFIG_MX6 #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG #define CONFIG_IMX6_THERMAL -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F -- cgit v1.1 From ea6909173f0f918e397d468e579fb43ee6481b1a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:47 +0100 Subject: imx6: move standard ATAG configs to mx6_common.h Define the standard ATAG consfigs in mx6_common. Signed-off-by: Peter Robinson Reviewed-by: Tom Rini --- include/configs/mx6cuboxi.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index c434fa2..5fc7a8c 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -14,10 +14,6 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_IMX6_THERMAL #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) -- cgit v1.1 From 302b2e5babb11b24c7808b79521851457fb2d8e8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:48 +0100 Subject: imx6: move MXC_GPIO define to mx6_common.h Define CONFIG_MXC_GPIO and CONFIG_CMD_GPIO by default in mx6_common Signed-off-by: Peter Robinson --- include/configs/mx6cuboxi.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 5fc7a8c..f42db85 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP -- cgit v1.1 From 8183058188cd2d9424503b68de8606c5900ba74b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:49 +0100 Subject: imx6: centralise common boot options in mx6_common.h Define common LOADADDR and BOOTDELAY to ensure a consistent experience across mx6 boards Signed-off-by: Peter Robinson --- include/configs/mx6cuboxi.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index f42db85..2e90b83 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -99,11 +99,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 1 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" #define CONFIG_MMCROOT "/dev/mmcblk0p2" @@ -217,8 +212,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING /* Physical Memory Map */ -- cgit v1.1 From 2d8a07475eaa521f0055fc7c2617723a0364fe27 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:50 +0100 Subject: imx6: move generic miscellaneous and overwrite options Move generic miscellaneous options that are standard across most, if not all, mx6 boards to central mx6_common define to ensure consistent features. Signed-off-by: Peter Robinson --- include/configs/mx6cuboxi.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 2e90b83..45c12a0 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -49,11 +49,6 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - /* Framebuffer */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 @@ -208,8 +203,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256 -#define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_CMDLINE_EDITING -- cgit v1.1 From a380ce6e9698257c4e8be4c0711b09c90a8febff Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:51 +0100 Subject: imx6: standardise filesystem and boot options Move all standard filesystem, partition and fdt options to mx6_common. Signed-off-by: Peter Robinson --- include/configs/mx6cuboxi.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 45c12a0..60c3ac9 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -31,10 +31,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* Ethernet Configuration */ #define CONFIG_FEC_MXC @@ -91,7 +87,6 @@ "fi;" /* Command definition */ -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #define CONFIG_MXC_UART_BASE UART1_BASE @@ -223,7 +218,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024) -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_CACHE #endif /* __MX6CUBOXI_CONFIG_H */ -- cgit v1.1 From e51c1e8eced7f1661994bd3e1caf0ca032455b3e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:52 +0100 Subject: imx6: generic MMC config options to mx6_common Move all standard mx6 MMC configs to mx6_common. Signed-off-by: Peter Robinson Reviewed-by: Tom Rini --- include/configs/mx6cuboxi.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 60c3ac9..3c0affe 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -24,13 +24,7 @@ #define CONFIG_MXC_OCOTP /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER /* Ethernet Configuration */ #define CONFIG_FEC_MXC -- cgit v1.1 From 1022b85cb0e143b4f3a8e6c7d9258d516920d464 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:53 +0100 Subject: mx6: standardise CONFIG_CMD_CACHE Move CONFIG_CMD_CACHE to mx6_common and standardise the way it's defined. Signed-off-by: Peter Robinson Reviewed-by: Tom Rini --- include/configs/mx6cuboxi.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/configs/mx6cuboxi.h') diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 3c0affe..21c3f96 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -212,6 +212,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024) -#define CONFIG_CMD_CACHE - #endif /* __MX6CUBOXI_CONFIG_H */ -- cgit v1.1