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/titanium.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 320d76c..74cb78b 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -14,8 +14,6 @@ #define __CONFIG_H #include "mx6_common.h" -#include -#include #define CONFIG_MX6 #define CONFIG_MX6Q @@ -93,9 +91,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -211,9 +206,6 @@ #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 - /* Enable NAND support */ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -- 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/titanium.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 74cb78b..1b409f6 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -15,10 +15,7 @@ #include "mx6_common.h" -#define CONFIG_MX6 #define CONFIG_MX6Q -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO #define MACH_TYPE_TITANIUM 3769 #define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM -- 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/titanium.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 1b409f6..f09ad8b 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -20,11 +20,6 @@ #define MACH_TYPE_TITANIUM 3769 #define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -- 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/titanium.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index f09ad8b..0aa2ba2 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -25,7 +25,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -- 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/titanium.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 0aa2ba2..9776aeb 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -83,11 +83,6 @@ /* Command definition */ -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (500 << 20)) @@ -181,8 +176,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR -- 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/titanium.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 9776aeb..dc875b5 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -76,13 +76,6 @@ /* Miscellaneous commands */ #define CONFIG_CMD_BMODE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - -/* Command definition */ - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (500 << 20)) @@ -161,20 +154,11 @@ #define CONFIG_BOOTCOMMAND "run nand_ubifs" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "Titanium > " -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ - -#define CONFIG_SYS_CBSIZE 256 /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 -- 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/titanium.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index dc875b5..f3d11fa 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -46,9 +46,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -65,7 +62,6 @@ /* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -220,9 +216,6 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif -- 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/titanium.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index f3d11fa..992d55a 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -37,16 +37,9 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -- 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/titanium.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/titanium.h') diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 992d55a..7490fa8 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -209,8 +209,4 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H */ -- cgit v1.1