i.MX6: move duplicated options to mx6_common to standardise mx6 config
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
There's a lot of common options in the i.MX6 boards that are repeated across a lot of the devices. There's a mx6_common.h which is little used but makes sense to be the central location for all the options we want across all mx6 boards to ensure a consistent set of features. This is a first pass at moving those options and unifying the common options to a standard default.
Changes since v1:
* Move CONFIG_SYS_NO_FLASH changes from patch 7 to patch 2 and reorder includes so we don't need to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS
* Add CONFIG_CMD_GPIO to mx6_common.f (patch 5)
* Use the default for all CONFIG_SYS_PROMPT_HUSH_PS2 (patch 7)
* Drop LZO change (patch 8)
I think I got all the review points :)
Peter Robinson (10):
novena: standardise mx6_common.h include
imx6: move all standard includes to mx6_common.h
imx6: move generic imx6 options to mx6_common.h
imx6: move standard ATAG configs to mx6_common.h
imx6: move MXC_GPIO define to mx6_common.h
imx6: centralise common boot options in mx6_common.h
imx6: move generic miscellaneous and overwrite options
imx6: standardise filesystem and boot options
imx6: generic MMC config options to mx6_common
mx6: standardise CONFIG_CMD_CACHE
Reviewed-by Eric Nelson <[email protected]>
PATCH v2 1/10 novena: standardise mx6_common.h include
Standardise mx6_common.h to the same as other mx6 boards
Signed-off-by Peter Robinson <[email protected]>
Reviewed-by Tom Rini <[email protected]>
--- include/configs/novena.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/novena.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_NO_FLASH -#include "configs/mx6_common.h" +#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> #include <config_cmd_default.h>
Signature · 1 line
2.4.0
PATCH v2 2/10 imx6: move all standard includes to mx6_common.h
In reply to Peter RobinsonThe 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 <[email protected]>
--- include/configs/aristainetos.h | 11 +---------- include/configs/cgtqmx6eval.h | 10 +--------- include/configs/cm_fx6.h | 6 ------ include/configs/embestmx6boards.h | 10 +--------- include/configs/gw_ventana.h | 8 -------- include/configs/hummingboard.h | 10 +--------- include/configs/mx6_common.h | 7 +++++++ include/configs/mx6cuboxi.h | 7 ------- include/configs/mx6qarm2.h | 9 +-------- include/configs/mx6sabre_common.h | 11 +---------- include/configs/mx6sabresd.h | 3 --- include/configs/mx6slevk.h | 10 +--------- include/configs/mx6sxsabresd.h | 8 -------- include/configs/nitrogen6x.h | 10 +--------- include/configs/novena.h | 4 ---- include/configs/ot1200.h | 10 +--------- include/configs/platinum.h | 7 ------- include/configs/secomx6quq7.h | 10 +--------- include/configs/tbs2910.h | 10 +--------- include/configs/titanium.h | 8 -------- include/configs/tqma6.h | 9 --------- include/configs/udoo.h | 10 +--------- include/configs/wandboard.h | 10 +--------- include/configs/warp.h | 6 ------ 24 files changed, 20 insertions(+), 184 deletions(-)
include/configs/aristainetos.h +1 -10
@@ -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 CONFIG_HOSTNAME aristainetos
@@ -87,12 +83,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
@@ -239,9 +232,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
include/configs/cgtqmx6eval.h +1 -9
@@ -22,9 +22,6 @@#define CONFIG_MACH_TYPE 4122 -#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
@@ -62,9 +59,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_BOOTDELAY 3
@@ -160,9 +154,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
include/configs/cm_fx6.h +0 -6
@@ -11,8 +11,6 @@#ifndef __CONFIG_CM_FX6_H#define __CONFIG_CM_FX6_H -#include <asm/arch/imx-regs.h> -#include <config_distro_defaults.h> #include "mx6_common.h" /* Machine config */
@@ -30,14 +28,11 @@#define CONFIG_TIMESTAMP /* CMD */ -#include <config_cmd_default.h> #define CONFIG_CMD_GREPENV -#undef CONFIG_CMD_FLASH#undef CONFIG_CMD_LOADB#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_XIMG#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMLS/* MMC */ #define CONFIG_MMC
@@ -77,7 +72,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16)/* SPI flash */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0#define CONFIG_SF_DEFAULT_CS 0
include/configs/embestmx6boards.h +1 -9
@@ -13,11 +13,7 @@#ifndef __RIOTBOARD_CONFIG_H#define __RIOTBOARD_CONFIG_H -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include "mx6_common.h" -#include <linux/sizes.h> #define CONFIG_SYS_GENERIC_BOARD
@@ -107,12 +103,10 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> #undef CONFIG_CMD_FPGA#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS#define CONFIG_LOADADDR 0x12000000#define CONFIG_SYS_TEXT_BASE 0x17800000
@@ -149,9 +143,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)#if defined(CONFIG_ENV_IS_IN_MMC )
include/configs/gw_ventana.h +0 -8
@@ -25,9 +25,6 @@#define CONFIG_MACH_TYPE 4520/* Gateworks Ventana Platform */ -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -/* ATAGs */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS
@@ -155,8 +152,6 @@#define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c/* Various command support */ -#include <config_cmd_default.h> -#undef CONFIG_CMD_IMLS#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII
@@ -272,9 +267,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 /* no NOR flash */ -/* * MTD Command for mtdparts */
include/configs/hummingboard.h +1 -9
@@ -12,9 +12,6 @@#define __CONFIG_H#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO
@@ -44,9 +41,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#undef CONFIG_CMD_I2C#define CONFIG_CMD_BMODE
@@ -205,9 +199,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
include/configs/mx6_common.h +7 -0
@@ -31,4 +31,11 @@#define CONFIG_MP #define CONFIG_MXC_GPT_HCLK +#define CONFIG_SYS_NO_FLASH + +#include <linux/sizes.h> +#include <asm/arch/imx-regs.h> +#include <asm/imx-common/gpio.h> +#include <config_cmd_default.h> +#endif
include/configs/mx6cuboxi.h +0 -7
@@ -8,9 +8,6 @@#ifndef __MX6CUBOXI_CONFIG_H#define __MX6CUBOXI_CONFIG_H -#include <linux/sizes.h> -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> #include "mx6_common.h" #define CONFIG_MX6
@@ -66,11 +63,7 @@#define CONFIG_CONS_INDEX 1#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_NO_FLASH -/* Command definition */ -#include <config_cmd_default.h> -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR
include/configs/mx6qarm2.h +1 -8
@@ -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
include/configs/mx6sabre_common.h +1 -10
@@ -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
include/configs/mx6sabresd.h +0 -3
@@ -9,9 +9,6 @@#ifndef __MX6QSABRESD_CONFIG_H#define __MX6QSABRESD_CONFIG_H -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#ifdef CONFIG_SPL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT
include/configs/mx6slevk.h +1 -9
@@ -9,9 +9,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #include "mx6_common.h" #define CONFIG_MX6
@@ -81,9 +78,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_BOOTDELAY 3
@@ -195,9 +189,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 SZ_8K#if definedCONFIG_SYS_BOOT_SPINOR
include/configs/mx6sxsabresd.h +0 -8
@@ -10,8 +10,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/imx-regs.h> -#include <linux/sizes.h> #include "mx6_common.h" #define CONFIG_MX6
@@ -45,9 +43,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_BOOTDELAY 3
@@ -233,9 +228,6 @@#define CONFIG_MXC_OCOTP #endif -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_TIME #define CONFIG_FSL_QSPI
include/configs/nitrogen6x.h +1 -9
@@ -17,9 +17,6 @@#define CONFIG_MACH_TYPE 3769 -#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
@@ -159,9 +156,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_BOOTDELAY 1
@@ -353,9 +347,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)#if defined(CONFIG_SABRELITE )
include/configs/novena.h +0 -4
@@ -23,12 +23,8 @@#define CONFIG_MXC_GPIO #define CONFIG_OF_LIBFDT #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_SYS_NO_FLASH #include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <config_cmd_default.h> /* U-Boot Commands */ #define CONFIG_CMD_ASKENV
include/configs/ot1200.h +1 -9
@@ -13,9 +13,6 @@#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
@@ -152,9 +149,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_BOOTDELAY 2
@@ -190,9 +184,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_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 * 1024)/* 64 kb */ #define CONFIG_ENV_OFFSET (1024 * 1024)
include/configs/platinum.h +0 -7
@@ -18,14 +18,11 @@#include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> /* * Console configuration */ -#include <config_cmd_default.h> #define CONFIG_CMD_BMODE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2
@@ -33,7 +30,6 @@#define CONFIG_CMD_FUSE #define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C -#undef CONFIG_CMD_IMLS#define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_MTDPARTS
@@ -108,9 +104,6 @@#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH -#ifdef CONFIG_CMD_NAND /* NAND config */
include/configs/secomx6quq7.h +1 -9
@@ -10,9 +10,6 @@#define __CONFIG_H#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO
@@ -39,9 +36,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR
@@ -145,9 +139,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)#if defined(CONFIG_ENV_IS_IN_MMC )
include/configs/tbs2910.h +1 -9
@@ -10,8 +10,6 @@#define __TBS2910_CONFIG_H#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> /* General configuration */ #define CONFIG_MX6
@@ -74,10 +72,6 @@#define CONFIG_CONS_INDEX 1/* *** Command definition *** */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS -#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR #define CONFIG_CMD_MEMTEST
@@ -214,9 +208,7 @@#define CONFIG_CMD_CACHE #endif -/* Flash and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 2#define CONFIG_SYS_MMC_ENV_PART 1
include/configs/titanium.h +0 -8
@@ -14,8 +14,6 @@#define __CONFIG_H#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> #define CONFIG_MX6 #define CONFIG_MX6Q
@@ -93,9 +91,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#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
include/configs/tqma6.h +0 -9
@@ -25,9 +25,6 @@/* #endif */ #include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #if defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S )#define PHYS_SDRAM_SIZE (512u * SZ_1M)
@@ -145,13 +142,10 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> -#define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS#define CONFIG_BOOTDELAY 3
@@ -440,9 +434,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 -#define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP #define CONFIG_FIT
include/configs/udoo.h +1 -9
@@ -10,9 +10,6 @@#define __CONFIG_H#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO
@@ -71,9 +68,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR
@@ -216,9 +210,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
include/configs/wandboard.h +1 -9
@@ -10,9 +10,6 @@#define __CONFIG_H#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO
@@ -44,9 +41,6 @@#define CONFIG_BAUDRATE 115200/* Command definition */ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_IMLS#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR
@@ -270,9 +264,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
include/configs/warp.h +0 -6
@@ -13,8 +13,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/imx-regs.h> -#include <linux/sizes.h> #include "mx6_common.h" #define CONFIG_MX6
@@ -59,11 +57,7 @@#define CONFIG_CONS_INDEX 1#define CONFIG_BAUDRATE 115200 -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH -/* Command definition */ -#include <config_cmd_default.h> #undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS
Signature · 1 line
2.4.0
PATCH v2 3/10 imx6: move generic imx6 options to mx6_common.h
In reply to Peter RobinsonAll 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 <[email protected]>
Reviewed-by Tom Rini <[email protected]>
--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 5 ----- include/configs/cm_fx6.h | 7 ------- include/configs/embestmx6boards.h | 7 ------- include/configs/gw_ventana.h | 5 ----- include/configs/hummingboard.h | 6 ------ include/configs/mx6_common.h | 5 +++++ include/configs/mx6cuboxi.h | 4 ---- include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 6 ------ include/configs/mx6sxsabresd.h | 5 ----- include/configs/nitrogen6x.h | 4 ---- include/configs/novena.h | 4 ---- include/configs/ot1200.h | 4 ---- include/configs/platinum.h | 6 ------ include/configs/platinum_picon.h | 2 -- include/configs/platinum_titanium.h | 2 -- include/configs/secomx6quq7.h | 4 ---- include/configs/tbs2910.h | 4 ---- include/configs/titanium.h | 3 --- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 5 ----- 25 files changed, 5 insertions(+), 122 deletions(-)
include/configs/aristainetos.h +0 -7
@@ -13,20 +13,13 @@#ifndef __ARISTAINETOS_CONFIG_H#define __ARISTAINETOS_CONFIG_H -#define CONFIG_MX6 -#include "mx6_common.h" -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MACH_TYPE 4501#define CONFIG_MMCROOT "/dev/mmcblk0p1"#define CONFIG_HOSTNAME aristainetos#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M)
include/configs/cgtqmx6eval.h +0 -5
@@ -13,13 +13,8 @@#ifndef __CONFIG_CGTQMX6EVAL_H#define __CONFIG_CGTQMX6EVAL_H -#define CONFIG_MX6 -#include "mx6_common.h" -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MACH_TYPE 4122#define CONFIG_CMDLINE_TAG
include/configs/cm_fx6.h +0 -7
@@ -14,7 +14,6 @@#include "mx6_common.h" /* Machine config */ -#define CONFIG_MX6 #define CONFIG_SYS_LITTLE_ENDIAN #define CONFIG_MACH_TYPE 4273
@@ -22,11 +21,6 @@#define CONFIG_CMD_GPIO #endif -/* Display information on boot */ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_TIMESTAMP -/* CMD */ #define CONFIG_CMD_GREPENV #undef CONFIG_CMD_LOADB
@@ -271,7 +265,6 @@#define CONFIG_SERIAL_TAG /* misc */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_STACKSIZE (128 * 1024)#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800/* 400 KB */
include/configs/embestmx6boards.h +0 -7
@@ -15,19 +15,12 @@#include "mx6_common.h" -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_MXC_UART_BASE UART2_BASE#define CONFIG_CONSOLE_DEV "ttymxc1"#define CONFIG_MMCROOT "/dev/mmcblk1p2"#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -#define CONFIG_MX6 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/gw_ventana.h +0 -5
@@ -19,9 +19,6 @@#include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO /* display cpu info */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* display board info (after reloc) */ #define CONFIG_MACH_TYPE 4520/* Gateworks Ventana Platform */
@@ -32,8 +29,6 @@#define CONFIG_SERIAL_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/hummingboard.h +0 -6
@@ -13,10 +13,6 @@#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MACH_TYPE 4773#define CONFIG_CMDLINE_TAG
@@ -24,8 +20,6 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
include/configs/mx6_common.h +5 -0
@@ -38,4 +38,9 @@#include <asm/imx-common/gpio.h> #include <config_cmd_default.h> +#define CONFIG_MX6 +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_SYS_GENERIC_BOARD +#endif
include/configs/mx6cuboxi.h +0 -4
@@ -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 (2 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F
include/configs/mx6qarm2.h +0 -7
@@ -9,19 +9,12 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_MX6 -#include "mx6_common.h" -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
include/configs/mx6sabre_common.h +0 -7
@@ -9,13 +9,8 @@#ifndef __MX6QSABRE_COMMON_CONFIG_H#define __MX6QSABRE_COMMON_CONFIG_H -#define CONFIG_MX6 -#include "mx6_common.h" -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
@@ -23,8 +18,6 @@#define CONFIG_IMX6_THERMAL -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
include/configs/mx6slevk.h +0 -6
@@ -11,10 +11,6 @@#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define MACH_TYPE_MX6SLEVK 4307#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK
@@ -23,8 +19,6 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
include/configs/mx6sxsabresd.h +0 -5
@@ -12,10 +12,6 @@#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#ifdef CONFIG_SPL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT
@@ -26,7 +22,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
include/configs/nitrogen6x.h +0 -4
@@ -11,9 +11,6 @@#define __CONFIG_H#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_MACH_TYPE 3769
@@ -21,7 +18,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/novena.h +0 -4
@@ -10,19 +10,15 @@#define __CONFIG_H/* System configurations */ -#define CONFIG_MX6 #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT #define CONFIG_MISC_INIT_R -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_FIT #define CONFIG_KEYBOARD #define CONFIG_MXC_GPIO #define CONFIG_OF_LIBFDT -#define CONFIG_SYS_GENERIC_BOARD #include "mx6_common.h"
include/configs/ot1200.h +0 -4
@@ -9,15 +9,11 @@#define __CONFIG_H#include "mx6_common.h" -#define CONFIG_MX6 -#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_SYS_GENERIC_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/platinum.h +0 -6
@@ -7,8 +7,6 @@#ifndef __PLATINUM_CONFIG_H__#define __PLATINUM_CONFIG_H__ -#define CONFIG_SYS_GENERIC_BOARD -/* SPL */ #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_MMC_SUPPORT
@@ -146,10 +144,6 @@* U-Boot configuration */ -/* Console boot messages */ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Tag config */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS
include/configs/platinum_picon.h +0 -2
@@ -12,8 +12,6 @@#define CONFIG_PLATINUM_PROJECT "picon"#define CONFIG_PLATINUM_CPU "imx6dl" -#define CONFIG_MX6 -#include <configs/platinum.h> #define CONFIG_FEC_XCV_TYPE RMII
include/configs/platinum_titanium.h +0 -2
@@ -12,8 +12,6 @@#define CONFIG_PLATINUM_PROJECT "titanium"#define CONFIG_PLATINUM_CPU "imx6q" -#define CONFIG_MX6 -#define PHYS_SDRAM_SIZE (512 << 20)#define CONFIG_SYS_NAND_MAX_CHIPS 1
include/configs/secomx6quq7.h +0 -4
@@ -11,10 +11,6 @@#include "mx6_common.h" -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/tbs2910.h +0 -4
@@ -12,9 +12,6 @@#include "mx6_common.h" /* General configuration */ -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_SYS_THUMB_BUILD #define CONFIG_MACH_TYPE 3980
@@ -23,7 +20,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MXC_GPIO
include/configs/titanium.h +0 -3
@@ -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
include/configs/tqma6.h +0 -6
@@ -9,8 +9,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_MX6 -/* SPL */ /* #if defined(CONFIG_SPL_BUILD) */
@@ -32,10 +30,6 @@#define PHYS_SDRAM_SIZE (1024u * SZ_1M)#endif -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/udoo.h +0 -6
@@ -11,10 +11,6 @@#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define MACH_TYPE_UDOO 4800#define CONFIG_MACH_TYPE MACH_TYPE_UDOO
@@ -23,8 +19,6 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
include/configs/wandboard.h +0 -6
@@ -11,10 +11,6 @@#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define MACH_TYPE_WANDBOARD 4412#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD
@@ -23,8 +19,6 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
include/configs/warp.h +0 -5
@@ -15,11 +15,6 @@#include "mx6_common.h" -#define CONFIG_MX6 -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
Signature · 1 line
2.4.0
PATCH 3/10 imx6: move generic imx6 options to mx6_common.h
Hello Peter,
sorry for the noise, did not see v2 of your series. Just one thing:
Am 11.05.2015 um 18:22 schrieb Peter Robinson:
Quoted 5 lines
All boards define
CONFIG_MX6,CONFIG_DISPLAY_BOARDINFO,CONFIG_DISPLAY_CPUINFOandCONFIG_SYS_GENERIC_BOARDso define them inmx6_commonSigned-off-by Peter Robinson <[email protected]>Reviewed-by Tom Rini <[email protected]>
[...]
include/configs/mx6_common.h line 41
Quoted 10 lines
include/configs/mx6_common.h +1
-0@@ -38,4 +38,9 @@#include <asm/imx-common/gpio.h> #include <config_cmd_default.h> +#define CONFIG_MX6
Here we need an #if !defined(CONFIG_MX6) because secomx6quq7 (and soon hopefully other boards) sets this via Kconfig under arch/arm/cpu/armv7/mx6
[...]
Regards
Markus
PATCH 3/10 imx6: move generic imx6 options to mx6_common.h
Quoted 22 lines · Markus Niebel
Hello Peter,
sorry for the noise, did not see v2 of your series. Just one thing:
Am 11.05.2015 um 18:22 schrieb Peter Robinson:
Quoted 5 lines
All boards define
CONFIG_MX6,CONFIG_DISPLAY_BOARDINFO,CONFIG_DISPLAY_CPUINFOandCONFIG_SYS_GENERIC_BOARDso define them inmx6_commonSigned-off-by Peter Robinson <[email protected]>Reviewed-by Tom Rini <[email protected]>[...]
Quoted 9 lines
include/configs/mx6_common.h +0
-0@@ -38,4 +38,9 @@#include <asm/imx-common/gpio.h> #include <config_cmd_default.h>
Quoted 5 lines
include/configs/mx6_common.h line 41
Quoted 1 line
include/configs/mx6_common.h +1
-0+#define CONFIG_MX6 Here we need an #if !defined(CONFIG_MX6) because secomx6quq7 (and soon hopefully other boards) sets this via
Kconfigunderarch/arm/cpu/armv7/mx6
Oh good catch. Would it be hard to just make everyone do this via Kconfig instead? I would expect not...
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150512/93da93b5/attachment.sig>
PATCH 3/10 imx6: move generic imx6 options to mx6_common.h
Hello
Am 12.05.2015 um 12:51 schrieb Tom Rini:
Quoted 24 lines · Markus Niebel
Quoted 23 lines
Hello Peter,
sorry for the noise, did not see v2 of your series. Just one thing:
Am 11.05.2015 um 18:22 schrieb Peter Robinson:
Quoted 5 lines
All boards define
CONFIG_MX6,CONFIG_DISPLAY_BOARDINFO,CONFIG_DISPLAY_CPUINFOandCONFIG_SYS_GENERIC_BOARDso define them inmx6_commonSigned-off-by Peter Robinson <[email protected]>Reviewed-by Tom Rini <[email protected]>[...]
Quoted 9 lines
include/configs/mx6_common.h +0
-0@@ -38,4 +38,9 @@#include <asm/imx-common/gpio.h> #include <config_cmd_default.h>
Quoted 9 lines
Quoted 5 lines
include/configs/mx6_common.h line 41
Quoted 1 line
include/configs/mx6_common.h +1
-0+#define CONFIG_MX6 Here we need an #if !defined(CONFIG_MX6) because secomx6quq7 (and soon hopefully other boards) sets this via
Kconfigunderarch/arm/cpu/armv7/mx6Oh good catch. Would it be hard to just make everyone do this via
Kconfiginstead? I would expect not...
See the series for TQMa6 I posted. Main point is to delete inclusion of the board Kconfig from arch/arm/Kconfig and to add them to source them from arch/arm/cpu/armv7/mx6/Kconfig.
As a side effect the CPU type can then also be selected using Kconfig ...
Quoted 7 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v2 3/10 imx6: move generic imx6 options to mx6_common.h
In reply to Tom RiniHi Peter,
Quoted 24 lines · Tom Rini
Quoted 22 lines · Markus Niebel
Hello Peter,
sorry for the noise, did not see v2 of your series. Just one thing:
Am 11.05.2015 um 18:22 schrieb Peter Robinson:
Quoted 5 lines
All boards define
CONFIG_MX6,CONFIG_DISPLAY_BOARDINFO,CONFIG_DISPLAY_CPUINFOandCONFIG_SYS_GENERIC_BOARDso define them inmx6_commonSigned-off-by Peter Robinson <[email protected]>Reviewed-by Tom Rini <[email protected]>[...]
Quoted 9 lines
include/configs/mx6_common.h +0
-0@@ -38,4 +38,9 @@#include <asm/imx-common/gpio.h> #include <config_cmd_default.h>
Quoted 9 lines
Quoted 5 lines
include/configs/mx6_common.h line 41
Quoted 1 line
include/configs/mx6_common.h +1
-0+#define CONFIG_MX6 Here we need an #if !defined(CONFIG_MX6) because secomx6quq7 (and soon hopefully other boards) sets this via
Kconfigunderarch/arm/cpu/armv7/mx6Oh good catch. Would it be hard to just make everyone do this via
Kconfiginstead? I would expect not...
What do you mind about this ? Can you fix it directly in a V3 ?
Thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 4/10 imx6: move standard ATAG configs to mx6_common.h
In reply to Peter RobinsonDefine the standard ATAG consfigs in mx6_common.
Signed-off-by Peter Robinson <[email protected]>
Reviewed-by Tom Rini <[email protected]>
--- include/configs/cgtqmx6eval.h | 5 ----- include/configs/cm_fx6.h | 4 ---- include/configs/embestmx6boards.h | 5 ----- include/configs/gw_ventana.h | 6 +----- include/configs/hummingboard.h | 5 ----- include/configs/mx6_common.h | 6 ++++++ include/configs/mx6cuboxi.h | 4 ---- include/configs/mx6qarm2.h | 4 ---- include/configs/mx6sabre_common.h | 5 ----- include/configs/mx6slevk.h | 5 ----- include/configs/mx6sxsabresd.h | 5 ----- include/configs/nitrogen6x.h | 5 ----- include/configs/novena.h | 5 ----- include/configs/ot1200.h | 5 ----- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 4 ---- include/configs/tbs2910.h | 5 ----- include/configs/titanium.h | 5 ----- include/configs/tqma6.h | 5 ----- include/configs/udoo.h | 5 ----- include/configs/wandboard.h | 5 ----- include/configs/warp.h | 5 ----- 22 files changed, 7 insertions(+), 102 deletions(-)
include/configs/cgtqmx6eval.h +0 -5
@@ -17,11 +17,6 @@#define CONFIG_MACH_TYPE 4122 -#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 (10 * 1024 * 1024)
include/configs/cm_fx6.h +0 -4
@@ -257,11 +257,7 @@#define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_LOADADDR 0x10800000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_SERIAL_TAG /* misc */
include/configs/embestmx6boards.h +0 -5
@@ -21,11 +21,6 @@#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -#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 (10 * SZ_1M)
include/configs/gw_ventana.h +1 -5
@@ -22,12 +22,8 @@#define CONFIG_MACH_TYPE 4520/* Gateworks Ventana Platform */ -/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG +/* Serial ATAG */ #define CONFIG_SERIAL_TAG -#define CONFIG_REVISION_TAG /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/hummingboard.h +0 -5
@@ -15,11 +15,6 @@#define CONFIG_MACH_TYPE 4773 -#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 * SZ_1M)
include/configs/mx6_common.h +6 -0
@@ -43,4 +43,10 @@#define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_GENERIC_BOARD +/* ATAGs */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG +#endif
include/configs/mx6cuboxi.h +0 -4
@@ -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 (2 * SZ_1M)
include/configs/mx6qarm2.h +0 -4
@@ -11,10 +11,6 @@#include "mx6_common.h" -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
include/configs/mx6sabre_common.h +0 -5
@@ -11,11 +11,6 @@#include "mx6_common.h" -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_IMX6_THERMAL /* Size of malloc() pool */
include/configs/mx6slevk.h +0 -5
@@ -14,11 +14,6 @@#define MACH_TYPE_MX6SLEVK 4307#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK -#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 (3 * SZ_1M)
include/configs/mx6sxsabresd.h +0 -5
@@ -18,11 +18,6 @@#include "imx6_spl.h" #endif -#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 (3 * SZ_1M)
include/configs/nitrogen6x.h +0 -5
@@ -14,11 +14,6 @@#define CONFIG_MACH_TYPE 3769 -#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 (10 * 1024 * 1024)
include/configs/novena.h +0 -5
@@ -110,11 +110,6 @@#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" /* common IMX6 SPL configuration */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Ethernet Configuration */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC
include/configs/ot1200.h +0 -5
@@ -10,11 +10,6 @@#include "mx6_common.h" -#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 (10 * 1024 * 1024)
include/configs/platinum.h +0 -6
@@ -144,12 +144,6 @@* U-Boot configuration */ -/* Tag config */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Board startup config */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R
include/configs/secomx6quq7.h +0 -4
@@ -11,10 +11,6 @@#include "mx6_common.h" -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_BOARD_REVISION_TAG /* Size of malloc() pool */
include/configs/tbs2910.h +0 -5
@@ -16,11 +16,6 @@#define CONFIG_MACH_TYPE 3980 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO
include/configs/titanium.h +0 -5
@@ -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)
include/configs/tqma6.h +0 -5
@@ -30,11 +30,6 @@#define PHYS_SDRAM_SIZE (1024u * SZ_1M)#endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT
include/configs/udoo.h +0 -5
@@ -14,11 +14,6 @@#define MACH_TYPE_UDOO 4800#define CONFIG_MACH_TYPE MACH_TYPE_UDOO -#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 * SZ_1M)
include/configs/wandboard.h +0 -5
@@ -14,11 +14,6 @@#define MACH_TYPE_WANDBOARD 4412#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD -#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 (10 * SZ_1M)
include/configs/warp.h +0 -5
@@ -15,11 +15,6 @@#include "mx6_common.h" -#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 (35 * SZ_1M)/* Increase due to DFU */
Signature · 1 line
2.4.0
PATCH v2 5/10 imx6: move MXC_GPIO define to mx6_common.h
In reply to Peter RobinsonDefine CONFIG_MXC_GPIO and CONFIG_CMD_GPIO by default in mx6_common
Signed-off-by Peter Robinson <[email protected]>
--- include/configs/aristainetos.h | 2 -- include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 7 ------- include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 3 --- include/configs/hummingboard.h | 1 - include/configs/mx6_common.h | 4 ++++ include/configs/mx6cuboxi.h | 1 - include/configs/mx6qarm2.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/nitrogen6x.h | 2 -- include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/platinum.h | 4 ---- include/configs/secomx6quq7.h | 1 - include/configs/tbs2910.h | 2 -- include/configs/titanium.h | 1 - include/configs/tqma6.h | 1 - include/configs/udoo.h | 1 - include/configs/wandboard.h | 1 - include/configs/warp.h | 1 - 23 files changed, 4 insertions(+), 36 deletions(-)
include/configs/aristainetos.h +0 -2
@@ -24,7 +24,6 @@#define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART5_BASE
@@ -251,7 +250,6 @@#define CONFIG_SYS_I2C_SLAVE 0x7f#define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} } -#define CONFIG_CMD_GPIO #define CONFIG_GPIO_ENABLE_SPI_FLASH IMX_GPIO_NR(2, 15)/* NAND stuff */
include/configs/cgtqmx6eval.h +0 -1
@@ -22,7 +22,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 UART2_BASE
include/configs/cm_fx6.h +0 -7
@@ -17,10 +17,6 @@#define CONFIG_SYS_LITTLE_ENDIAN #define CONFIG_MACH_TYPE 4273 -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_GPIO -#endif -/* CMD */ #define CONFIG_CMD_GREPENV #undef CONFIG_CMD_LOADB
@@ -250,9 +246,6 @@#define CONFIG_DWC_AHSATA_PORT_ID 0#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR -/* GPIO */ -#define CONFIG_MXC_GPIO -/* Boot */ #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_LOADADDR 0x10800000
include/configs/embestmx6boards.h +0 -1
@@ -26,7 +26,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART
include/configs/gw_ventana.h +0 -3
@@ -32,9 +32,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -/* GPIO */ -#define CONFIG_MXC_GPIO -/* Serial */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE
include/configs/hummingboard.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE
include/configs/mx6_common.h +4 -0
@@ -49,4 +49,8 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG +/* GPIO */ +#define CONFIG_MXC_GPIO +#define CONFIG_CMD_GPIO +#endif
include/configs/mx6cuboxi.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_SYS_MALLOC_LEN (2 * 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
include/configs/mx6qarm2.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART4_BASE
include/configs/mx6sabre_common.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART
include/configs/mx6slevk.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
include/configs/mx6sxsabresd.h +0 -1
@@ -22,7 +22,6 @@#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE
include/configs/nitrogen6x.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO #define CONFIG_CI_UDC #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED
include/configs/novena.h +0 -1
@@ -17,7 +17,6 @@#define CONFIG_FAT_WRITE #define CONFIG_FIT #define CONFIG_KEYBOARD -#define CONFIG_MXC_GPIO #define CONFIG_OF_LIBFDT #include "mx6_common.h"
include/configs/ot1200.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO /* FUSE Configs */ #define CONFIG_CMD_FUSE
include/configs/platinum.h +0 -4
@@ -26,7 +26,6 @@#define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_FUSE -#define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_MMC
@@ -44,9 +43,6 @@* Hardware configuration */ -/* GPIO config */ -#define CONFIG_MXC_GPIO -/* UART config */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE
include/configs/secomx6quq7.h +0 -1
@@ -17,7 +17,6 @@#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE
include/configs/tbs2910.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_MACH_TYPE 3980#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER
include/configs/titanium.h +0 -1
@@ -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
include/configs/tqma6.h +0 -1
@@ -33,7 +33,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART /* SPI */
include/configs/udoo.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE
include/configs/wandboard.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE
include/configs/warp.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
Signature · 1 line
2.4.0
PATCH v2 6/10 imx6: centralise common boot options in mx6_common.h
In reply to Peter RobinsonDefine common LOADADDR and BOOTDELAY to ensure a consistent experience across mx6 boards
Signed-off-by Peter Robinson <[email protected]>
--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 7 ------- include/configs/cm_fx6.h | 3 --- include/configs/embestmx6boards.h | 5 ----- include/configs/gw_ventana.h | 4 ---- include/configs/hummingboard.h | 5 ----- include/configs/mx6_common.h | 6 ++++++ include/configs/mx6cuboxi.h | 7 ------- include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 7 ------- include/configs/mx6sxsabresd.h | 7 ------- include/configs/nitrogen6x.h | 7 ------- include/configs/novena.h | 3 --- include/configs/ot1200.h | 7 ------- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 5 ----- include/configs/tbs2910.h | 3 --- include/configs/titanium.h | 7 ------- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 7 ------- 23 files changed, 6 insertions(+), 129 deletions(-)
include/configs/aristainetos.h +0 -7
@@ -79,11 +79,6 @@#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=u-boot.scr\0" \ "fit_file=/boot/system.itb\0" \
@@ -206,8 +201,6 @@#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000)#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024)
include/configs/cgtqmx6eval.h +0 -7
@@ -49,11 +49,6 @@/* Command definition */ -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb"#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -125,8 +120,6 @@#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING /* Physical Memory Map */
include/configs/cm_fx6.h +0 -3
@@ -247,9 +247,6 @@#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR/* Boot */ -#define CONFIG_ZERO_BOOTDELAY_CHECK -#define CONFIG_LOADADDR 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR#define CONFIG_SYS_BOOTMAPSZ (8 << 20)#define CONFIG_SERIAL_TAG
include/configs/embestmx6boards.h +0 -5
@@ -95,9 +95,6 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_ARP_TIMEOUT 200UL/* Miscellaneous configurable options */
@@ -113,8 +110,6 @@#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_STACKSIZE (128 * 1024)/* Physical Memory Map */
include/configs/gw_ventana.h +0 -4
@@ -240,8 +240,6 @@#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_SYS_LOAD_ADDR 0x12000000/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1
@@ -298,8 +296,6 @@#endif /* Environment */ -#define CONFIG_BOOTDELAY 3 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR#define CONFIG_IPADDR 192.168.1.1#define CONFIG_SERVERIP 192.168.1.146#define HWCONFIG_DEFAULT \
include/configs/hummingboard.h +0 -5
@@ -34,12 +34,9 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR #define CONFIG_CMD_MEMTEST -#define CONFIG_BOOTDELAY 3#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000/* MMC Configuration */ #define CONFIG_FSL_ESDHC
@@ -170,8 +167,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 */
include/configs/mx6_common.h +6 -0
@@ -49,6 +49,12 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG +/* Boot options */ +#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_TEXT_BASE 0x17800000 +#define CONFIG_BOOTDELAY 3 +/* GPIO */ #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO
include/configs/mx6cuboxi.h +0 -7
@@ -58,11 +58,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"
@@ -176,8 +171,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 */
include/configs/mx6qarm2.h +0 -7
@@ -49,11 +49,6 @@/* Command definition */ -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -142,8 +137,6 @@#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING /* Physical Memory Map */
include/configs/mx6sabre_common.h +0 -7
@@ -76,11 +76,6 @@#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 1 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ "emmcdev=2\0" \
@@ -204,8 +199,6 @@#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024)
include/configs/mx6slevk.h +0 -7
@@ -67,11 +67,6 @@/* Command definition */ -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x82000000 -#define CONFIG_SYS_TEXT_BASE 0x87800000 -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -158,8 +153,6 @@#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_512M) -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K
include/configs/mx6sxsabresd.h +0 -7
@@ -33,11 +33,6 @@/* Command definition */ -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x80800000 -#define CONFIG_SYS_TEXT_BASE 0x87800000 -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -124,8 +119,6 @@#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K
include/configs/nitrogen6x.h +0 -7
@@ -146,13 +146,8 @@/* Command definition */ -#define CONFIG_BOOTDELAY 1 -#define CONFIG_PREBOOT "" -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#ifdef CONFIG_CMD_SATA #define CONFIG_DRIVE_SATA "sata "#else
@@ -319,8 +314,6 @@#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING /* Physical Memory Map */
include/configs/novena.h +0 -3
@@ -77,12 +77,9 @@#endif /* Booting Linux */ -#define CONFIG_BOOTDELAY 5#define CONFIG_BOOTFILE "fitImage"#define CONFIG_BOOTARGS "console=ttymxc1,115200 "#define CONFIG_BOOTCOMMAND "run net_nfs" -#define CONFIG_LOADADDR 0x18000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR#define CONFIG_HOSTNAME novena/* Physical Memory Map */
include/configs/ot1200.h +0 -7
@@ -140,13 +140,8 @@/* Command definition */ -#define CONFIG_BOOTDELAY 2 -#define CONFIG_PREBOOT "" -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -/* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER
@@ -157,8 +152,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 */
include/configs/platinum.h +0 -6
@@ -150,14 +150,10 @@/* Device tree support */ #define CONFIG_OF_LIBFDT -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ PHYS_SDRAM_SIZE - (12 << 20)) -#define CONFIG_BOOTDELAY 3#define CONFIG_BOOTCOMMAND "run bootubi_scr"/* Miscellaneous configurable options */
@@ -176,8 +172,6 @@#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* MTD/UBI/UBIFS config */ #define CONFIG_LZO #define CONFIG_MTD_DEVICE
include/configs/secomx6quq7.h +0 -5
@@ -31,12 +31,8 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 3 -#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000/* MMC Configuration */ #define CONFIG_FSL_ESDHC
@@ -110,7 +106,6 @@#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR#define CONFIG_SYS_HZ 1000#define CONFIG_CMDLINE_EDITING
include/configs/tbs2910.h +0 -3
@@ -21,7 +21,6 @@#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "Matrix U-Boot> " -#define CONFIG_BOOTDELAY 3#define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 16
@@ -47,9 +46,7 @@#define CONFIG_SYS_MEMTEST_END \ (CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024) -#define CONFIG_SYS_TEXT_BASE 0x80000000#define CONFIG_SYS_BOOTMAPSZ 0x6C000000 -#define CONFIG_SYS_LOAD_ADDR 0x10800000/* Serial console */ #define CONFIG_MXC_UART
include/configs/titanium.h +0 -7
@@ -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
include/configs/tqma6.h +0 -6
@@ -135,10 +135,6 @@#define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -/* place code in last 4 MiB of RAM */ #if defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S )#define CONFIG_SYS_TEXT_BASE 0x2fc00000
@@ -404,8 +400,6 @@#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128u * SZ_1K)
include/configs/udoo.h +0 -6
@@ -60,12 +60,8 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 3 -#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000/* MMC Configuration */ #define CONFIG_FSL_ESDHC
@@ -181,8 +177,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 */
include/configs/wandboard.h +0 -6
@@ -33,12 +33,8 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#define CONFIG_BOOTDELAY 5 -#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000/* I2C Configs */ #define CONFIG_CMD_I2C
@@ -235,8 +231,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 */
include/configs/warp.h +0 -7
@@ -50,11 +50,6 @@#undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x82000000 -#define CONFIG_SYS_TEXT_BASE 0x87800000 -/* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER
@@ -71,8 +66,6 @@#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M) -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K
Signature · 1 line
2.4.0
PATCH v2 7/10 imx6: move generic miscellaneous and overwrite options
In reply to Peter RobinsonMove 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 <[email protected]>
--- include/configs/aristainetos.h | 14 -------------- include/configs/cgtqmx6eval.h | 15 --------------- include/configs/cm_fx6.h | 4 ---- include/configs/embestmx6boards.h | 11 ----------- include/configs/gw_ventana.h | 12 ------------ include/configs/hummingboard.h | 15 --------------- include/configs/mx6_common.h | 16 ++++++++++++++++ include/configs/mx6cuboxi.h | 15 --------------- include/configs/mx6qarm2.h | 17 ----------------- include/configs/mx6sabre_common.h | 15 --------------- include/configs/mx6slevk.h | 16 ---------------- include/configs/mx6sxsabresd.h | 16 ---------------- include/configs/nitrogen6x.h | 17 ----------------- include/configs/novena.h | 11 ----------- include/configs/ot1200.h | 16 ---------------- include/configs/platinum.h | 14 -------------- include/configs/secomx6quq7.h | 16 ---------------- include/configs/tbs2910.h | 6 ------ include/configs/titanium.h | 16 ---------------- include/configs/tqma6.h | 16 ---------------- include/configs/udoo.h | 16 ---------------- include/configs/wandboard.h | 16 ---------------- include/configs/warp.h | 14 -------------- 23 files changed, 16 insertions(+), 308 deletions(-)
include/configs/aristainetos.h +0 -14
@@ -69,10 +69,6 @@#define CONFIG_SF_DEFAULT_SPEED 20000000#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0#define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200/* Command definition */ #define CONFIG_CMD_BMODE
@@ -185,23 +181,13 @@#define CONFIG_ARP_TIMEOUT 200UL -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_AUTO_COMPLETE -#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#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000)#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024)/* Physical Memory Map */
include/configs/cgtqmx6eval.h +0 -15
@@ -42,13 +42,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_DEFAULT_FDT_FILE "imx6q-congatec.dtb"#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -105,23 +98,15 @@"else echo ERR: Fail to boot from mmc; fi" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "CGT-QMX6-Quad U-Boot > " -#define CONFIG_AUTO_COMPLETE -#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#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_CMDLINE_EDITING -/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/cm_fx6.h +0 -4
@@ -55,9 +55,6 @@/* Shell */ #define CONFIG_SYS_PROMPT "CM-FX6 # " -#define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)
@@ -69,7 +66,6 @@#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)/* Environment */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
include/configs/embestmx6boards.h +0 -11
@@ -84,11 +84,6 @@#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0#endif -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ #undef CONFIG_CMD_FPGA
@@ -97,14 +92,8 @@#define CONFIG_ARP_TIMEOUT 200UL -/* Miscellaneous configurable options */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#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#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000
include/configs/gw_ventana.h +0 -12
@@ -218,23 +218,12 @@#define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -/* serial console (ttymxc1,115200) */ -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "Ventana > " -#define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_HWCONFIG /* 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/* Memory configuration */ #define CONFIG_SYS_MEMTEST_START 0x10000000
@@ -269,7 +258,6 @@#endif /* Persistent Environment Config */ -#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ #ifdef CONFIG_SPI_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #else
include/configs/hummingboard.h +0 -15
@@ -23,11 +23,6 @@#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ #undef CONFIG_CMD_I2C
@@ -159,16 +154,6 @@"fi; " \"else run netboot; fi" -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */#define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/mx6_common.h +16 -0
@@ -55,6 +55,22 @@#define CONFIG_SYS_TEXT_BASE 0x17800000#define CONFIG_BOOTDELAY 3 +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 + +/* Miscellaneous configurable options */ +#define CONFIG_SYS_NO_FLASH +#undef CONFIG_CMD_IMLS +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_CMDLINE_EDITING +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_CBSIZE 512 +#define CONFIG_SYS_MAXARGS 32 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +/* GPIO */ #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO
include/configs/mx6cuboxi.h +0 -15
@@ -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 -/* Command definition */ #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR
@@ -163,16 +158,6 @@"fi; " \"else run netboot; fi" -/* Miscellaneous configurable options */ -#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 - /* Physical Memory Map */#define CONFIG_NR_DRAM_BANKS 1#define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
include/configs/mx6qarm2.h +0 -17
@@ -42,13 +42,6 @@#define CONFIG_FEC_XCV_TYPE RGMII#define CONFIG_FEC_MXC_PHYADDR 0 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - -/* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -126,19 +119,9 @@#define CONFIG_ARP_TIMEOUT 200UL/* Miscellaneous configurable options */ -#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_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000 -#define CONFIG_CMDLINE_EDITING -/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/mx6sabre_common.h +0 -15
@@ -66,11 +66,6 @@#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0#endif -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ
@@ -186,20 +181,10 @@#define CONFIG_ARP_TIMEOUT 200UL -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256 -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024)/* Physical Memory Map */
include/configs/mx6slevk.h +0 -16
@@ -60,13 +60,6 @@#define CONFIG_PHYLIB #define CONFIG_PHY_SMSC -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - -/* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -142,18 +135,9 @@"else run netboot; fi" /* Miscellaneous configurable options */ -#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_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_512M) -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K/* Physical Memory Map */
include/configs/mx6sxsabresd.h +0 -16
@@ -26,13 +26,6 @@#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - -/* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
@@ -108,18 +101,9 @@"else run netboot; fi" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 1024 - -#define CONFIG_SYS_MAXARGS 256 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K/* Physical Memory Map */
include/configs/nitrogen6x.h +0 -17
@@ -139,13 +139,6 @@#define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - -/* Command definition */ -#define CONFIG_PREBOOT ""#ifdef CONFIG_CMD_SATA
@@ -302,20 +295,10 @@#endif /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT "U-Boot > " -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MAXARGS 48 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END 0x10010000#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_CMDLINE_EDITING -/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/novena.h +0 -11
@@ -46,18 +46,9 @@#define CONFIG_VIDEO /* U-Boot general configurations */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_CBSIZE 1024/* Console I/O buffer size */ -#define CONFIG_SYS_MAXARGS 32/* Max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -/* Boot argument buffer size */ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ -#define CONFIG_AUTO_COMPLETE /* Command auto complete */ -#define CONFIG_CMDLINE_EDITING /* Command history etc */ -#define CONFIG_SYS_HUSH_PARSER /* U-Boot environment */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_SIZE (16 * 1024)/* * Environment is on MMC, starting at offset 512KiB from start of the card.
@@ -179,8 +170,6 @@/* UART */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_BAUDRATE 115200 -#define CONFIG_CONS_INDEX 1/* USB Configs */ #ifdef CONFIG_CMD_USB
include/configs/ot1200.h +0 -16
@@ -133,26 +133,10 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 - -/* Command definition */ -#define CONFIG_PREBOOT "" -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_CBSIZE 1024 -/* 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 - -#define CONFIG_CMDLINE_EDITING /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1
include/configs/platinum.h +0 -14
@@ -46,8 +46,6 @@/* UART config */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_BAUDRATE 115200 -#define CONFIG_CONS_INDEX 1/* I2C config */ #define CONFIG_SYS_I2C
@@ -144,9 +142,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -/* Device tree support */ #define CONFIG_OF_LIBFDT
@@ -157,20 +152,11 @@#define CONFIG_BOOTCOMMAND "run bootubi_scr"/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER - -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_PREBOOT -#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/* MTD/UBI/UBIFS config */ #define CONFIG_LZO
include/configs/secomx6quq7.h +0 -16
@@ -21,13 +21,7 @@#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ -#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR
@@ -93,24 +87,14 @@/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "SECO MX6Q uQ7 U-Boot > " -#define CONFIG_AUTO_COMPLETE -#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#define CONFIG_SYS_HZ 1000 -#define CONFIG_CMDLINE_EDITING - -/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/tbs2910.h +0 -6
@@ -18,13 +18,7 @@#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "Matrix U-Boot> " -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_CBSIZE 1024#define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)#define CONFIG_SYS_HZ 1000
include/configs/titanium.h +0 -16
@@ -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
include/configs/tqma6.h +0 -16
@@ -124,11 +124,6 @@#define CONFIG_TFTP_BLOCKSIZE 4096#define CONFIG_NFS_READ_SIZE 4096 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ
@@ -386,21 +381,10 @@"panicboot=echo No boot device !!! reset\0" \TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \ -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 512 - /* 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 -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128u * SZ_1K)/* Physical Memory Map */
include/configs/udoo.h +0 -16
@@ -50,13 +50,7 @@#define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL_KSZ9031 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ -#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR
@@ -166,18 +160,8 @@"fi; " \"else run netboot; fi" -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTO_COMPLETE -#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 - -#define CONFIG_CMDLINE_EDITING /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1
include/configs/wandboard.h +0 -16
@@ -23,13 +23,7 @@#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ -#define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR
@@ -223,16 +217,6 @@"fi; " \"else run netboot; fi" -/* Miscellaneous configurable options */ -#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 - /* Physical Memory Map */#define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
include/configs/warp.h +0 -14
@@ -41,32 +41,18 @@#define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -/* Command definition */ #undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256 -/* Watchdog */ #define CONFIG_HW_WATCHDOG #define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000/* 30s */ -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M) -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K/* Physical Memory Map */
Signature · 1 line
2.4.0
PATCH v2 8/10 imx6: standardise filesystem and boot options
In reply to Peter RobinsonMove all standard filesystem, partition and fdt options to mx6_common.
Signed-off-by Peter Robinson <[email protected]>
--- include/configs/aristainetos.h | 9 +-------- include/configs/cgtqmx6eval.h | 6 ------ include/configs/gw_ventana.h | 9 +-------- include/configs/hummingboard.h | 6 ------ include/configs/mx6_common.h | 11 +++++++++++ include/configs/mx6cuboxi.h | 6 ------ include/configs/mx6qarm2.h | 5 ----- include/configs/mx6sabre_common.h | 8 -------- include/configs/mx6slevk.h | 5 ----- include/configs/mx6sxsabresd.h | 6 ------ include/configs/nitrogen6x.h | 13 ------------- include/configs/novena.h | 8 -------- include/configs/ot1200.h | 14 -------------- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 6 ------ include/configs/tbs2910.h | 9 --------- include/configs/titanium.h | 7 ------- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 8 -------- 21 files changed, 13 insertions(+), 147 deletions(-)
include/configs/aristainetos.h +1 -8
@@ -41,9 +41,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
@@ -72,7 +69,6 @@/* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -215,8 +211,6 @@#define CONFIG_ENV_OFFSET (0x0d0000)#define CONFIG_ENV_OFFSET_REDUND (0x0e0000) -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_CACHE #define CONFIG_SYS_FSL_USDHC_NUM 2
@@ -253,7 +247,6 @@/* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE
@@ -266,11 +259,11 @@#define ARISTAINETOS_USB_H1_PWR IMX_GPIO_NR(3, 31)/* UBI support */ +#define CONFIG_LZO #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE #define CONFIG_RBTREE -#define CONFIG_LZO #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS
include/configs/cgtqmx6eval.h +0 -6
@@ -35,9 +35,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 /* Miscellaneous commands */ #define CONFIG_CMD_BMODE
@@ -129,9 +126,6 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/gw_ventana.h +1 -8
@@ -97,12 +97,7 @@#define CONFIG_BOUNCE_BUFFER /* Filesystem support */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT #define CONFIG_CMD_UBIFS -#define CONFIG_DOS_PARTITION /* * SATA Configs
@@ -147,12 +142,10 @@#define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_GSC #define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_CMD_UBI #define CONFIG_RBTREE -#define CONFIG_LZO #define CONFIG_CMD_FUSE /* eFUSE read/write support */ #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
@@ -245,6 +238,7 @@/* * MTD Command for mtdparts */ +#define CONFIG_LZO #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS
@@ -436,7 +430,6 @@/* Device Tree Support */ #define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_LIBFDT #define CONFIG_FDT_FIXUP_PARTITIONS #ifndef CONFIG_SYS_DCACHE_OFF
include/configs/hummingboard.h +0 -6
@@ -43,9 +43,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 /* Ethernet Configuration */ #define CONFIG_FEC_MXC
@@ -174,9 +171,6 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/mx6_common.h +11 -0
@@ -60,6 +60,17 @@#define CONFIG_CONS_INDEX 1#define CONFIG_BAUDRATE 115200 +/* Filesystems and image support */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_BOOTZ +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FAT +/* Miscellaneous configurable options */ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS
include/configs/mx6cuboxi.h +0 -6
@@ -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
@@ -50,7 +46,6 @@#define CONFIG_PHY_ATHEROS /* Command definition */ -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #define CONFIG_MXC_UART_BASE UART1_BASE
@@ -174,7 +169,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 */
include/configs/mx6qarm2.h +0 -5
@@ -29,8 +29,6 @@#define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP
@@ -141,9 +139,6 @@#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -/* USB Configs */ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
include/configs/mx6sabre_common.h +0 -8
@@ -35,11 +35,6 @@#define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP
@@ -68,7 +63,6 @@/* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #ifdef CONFIG_SUPPORT_EMMC_BOOT
@@ -209,8 +203,6 @@#define CONFIG_ENV_OFFSET (8 * 64 * 1024)#endif -#define CONFIG_OF_LIBFDT -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/mx6slevk.h +0 -5
@@ -30,8 +30,6 @@#define CONFIG_MMC #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* I2C Configs */ #define CONFIG_CMD_I2C
@@ -170,9 +168,6 @@#define CONFIG_ENV_IS_IN_MMC #endif -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/mx6sxsabresd.h +0 -6
@@ -129,9 +129,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 /* I2C Configs */ #define CONFIG_CMD_I2C
@@ -218,9 +215,6 @@#define CONFIG_ENV_SIZE SZ_8K#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/nitrogen6x.h +0 -13
@@ -63,11 +63,6 @@#define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #ifdef CONFIG_MX6Q #define CONFIG_CMD_SATA
@@ -101,7 +96,6 @@/* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE
@@ -333,9 +327,6 @@#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED#endif -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
@@ -346,10 +337,6 @@#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_ALT_MEMTEST -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_CMD_FS_GENERIC -/* * PCI express */
include/configs/novena.h +0 -8
@@ -13,25 +13,17 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT #define CONFIG_MISC_INIT_R -#define CONFIG_DOS_PARTITION -#define CONFIG_FAT_WRITE #define CONFIG_FIT #define CONFIG_KEYBOARD -#define CONFIG_OF_LIBFDT #include "mx6_common.h" /* U-Boot Commands */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_I2C #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII
include/configs/ot1200.h +0 -14
@@ -162,24 +162,10 @@#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD - -/* FS Configs */ -#define CONFIG_CMD_EXT3 -#define CONFIG_CMD_EXT4 -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_LIB_UUID -#define CONFIG_CMD_FS_UUID -#define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_BOOTFILE
include/configs/platinum.h +0 -6
@@ -23,8 +23,6 @@#define CONFIG_CMD_BMODE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT #define CONFIG_CMD_FUSE #define CONFIG_CMD_I2C #define CONFIG_CMD_MII
@@ -61,7 +59,6 @@#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION /* Ethernet config */ #define CONFIG_FEC_MXC
@@ -142,9 +139,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -/* Device tree support */ -#define CONFIG_OF_LIBFDT -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ PHYS_SDRAM_SIZE - (12 << 20))
include/configs/secomx6quq7.h +0 -6
@@ -38,9 +38,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 /* Ethernet Configuration */ #define CONFIG_CMD_PING
@@ -118,9 +115,6 @@#define CONFIG_DYNAMIC_MMC_DEVNO #endif -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/tbs2910.h +0 -9
@@ -58,15 +58,6 @@#define CONFIG_CMD_TIME /* Filesystems / image support */ -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_FS_GENERIC - -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_FIT /* MMC */
include/configs/titanium.h +0 -7
@@ -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
include/configs/tqma6.h +0 -6
@@ -104,10 +104,6 @@#define CONFIG_MXC_OCOTP #define CONFIG_CMD_FUSE -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII
@@ -126,7 +122,6 @@/* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR
@@ -400,7 +395,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP #define CONFIG_FIT #define CONFIG_FIT_VERBOSE
include/configs/udoo.h +0 -6
@@ -66,9 +66,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_DEFAULT_FDT_FILE "imx6q-udoo.dtb"
@@ -183,9 +180,6 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/wandboard.h +0 -6
@@ -47,9 +47,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 /* USB Configs */ #define CONFIG_CMD_USB
@@ -237,9 +234,6 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
include/configs/warp.h +0 -8
@@ -35,11 +35,6 @@#define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* Command definition */ #undef CONFIG_CMD_NET
@@ -77,9 +72,6 @@/* VDD voltage 1.65 - 1.95 */ #define CONFIG_SYS_SD_VOLTAGE 0x00000080 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif
Signature · 1 line
2.4.0
PATCH v2 8/10 imx6: standardise filesystem and boot options
[...]
Quoted 23 lines
include/configs/mx6_common.h +12
-0@@ -58,6 +58,18 @@#define CONFIG_CONS_INDEX 1#define CONFIG_BAUDRATE 115200 +/* Filesystems and image support */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_BOOTZ +#define CONFIG_LZO +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FAT +/* Miscellaneous configurable options */ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS
[...]
Quoted 9 lines
include/configs/tbs2910.h +0
-1@@ -58,15 +58,6 @@#define CONFIG_CMD_TIME /* Filesystems / image support */ -#define CONFIG_CMD_EXT4
include/configs/tbs2910.h line 62
Quoted 10 lines
include/configs/tbs2910.h +0
-8-#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_FS_GENERIC - -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_FIT
Peter,
you removed CONFIG_EFI_PARTITION from tbs2910.h without adding it to mx6_common.h . Please fix this in your next version of the patch series.
Thanks,
Soeren
PATCH v2 8/10 imx6: standardise filesystem and boot options
Quoted 49 lines · Soeren Moch
[...]
Quoted 22 lines
include/configs/mx6_common.h +11
-0@@ -58,6 +58,18 @@#define CONFIG_CONS_INDEX 1#define CONFIG_BAUDRATE 115200 +/* Filesystems and image support */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_BOOTZ +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FAT +/* Miscellaneous configurable options */ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS[...]
Quoted 9 lines
include/configs/tbs2910.h +0
-1@@ -58,15 +58,6 @@#define CONFIG_CMD_TIME /* Filesystems / image support */ -#define CONFIG_CMD_EXT4 include/configs/tbs2910.h line 62
Quoted 10 lines
include/configs/tbs2910.h +0
-8-#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_FS_GENERIC - -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_FIT Peter,
Quoted 6 lines
you removed
CONFIG_EFI_PARTITIONfromtbs2910.hwithout adding it tomx6_common.h. Please fix this in your next version of the patch series.Thanks,
Soeren
One additional comment:
Do we really need CONFIG_CMD_EXT2 when CONFIG_CMD_EXT4 is defined? My understanding was so far, that CONFIG_CMD_EXT4 alone is enough.
Regards,
Soeren
PATCH v2 9/10 imx6: generic MMC config options to mx6_common
In reply to Peter RobinsonMove all standard mx6 MMC configs to mx6_common.
Signed-off-by Peter Robinson <[email protected]>
Reviewed-by Tom Rini <[email protected]>
--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 7 ------- include/configs/cm_fx6.h | 5 ----- include/configs/embestmx6boards.h | 7 ------- include/configs/gw_ventana.h | 6 ------ include/configs/hummingboard.h | 7 ------- include/configs/mx6_common.h | 8 ++++++++ include/configs/mx6cuboxi.h | 6 ------ include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 6 ------ include/configs/mx6sxsabresd.h | 7 ------- include/configs/nitrogen6x.h | 7 ------- include/configs/novena.h | 8 -------- include/configs/ot1200.h | 7 ------- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 7 ------- include/configs/tbs2910.h | 7 ------- include/configs/titanium.h | 7 ------- include/configs/tqma6.h | 7 ------- include/configs/udoo.h | 7 ------- include/configs/wandboard.h | 7 ------- include/configs/warp.h | 7 ------- 23 files changed, 8 insertions(+), 149 deletions(-)
include/configs/aristainetos.h +0 -7
@@ -33,15 +33,8 @@#define CONFIG_MXC_OCOTP /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#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
include/configs/cgtqmx6eval.h +0 -7
@@ -27,15 +27,8 @@#define CONFIG_MXC_UART_BASE UART2_BASE/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* Miscellaneous commands */ #define CONFIG_CMD_BMODE
include/configs/cm_fx6.h +0 -5
@@ -25,11 +25,6 @@#undef CONFIG_CMD_FPGA/* MMC */ -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 3#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
include/configs/embestmx6boards.h +0 -7
@@ -54,15 +54,8 @@#define CONFIG_MXC_USB_FLAGS 0/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -#define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR
include/configs/gw_ventana.h +0 -6
@@ -87,14 +87,8 @@#define CONFIG_I2C_EDID /* 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 /* Filesystem support */ #define CONFIG_CMD_UBIFS
include/configs/hummingboard.h +0 -7
@@ -34,16 +34,9 @@#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 1#define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* Ethernet Configuration */ #define CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC
include/configs/mx6_common.h +8 -0
@@ -86,4 +86,12 @@#define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO +/* MMC */ +#define CONFIG_MMC +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_BOUNCE_BUFFER +#define CONFIG_FSL_ESDHC +#define CONFIG_FSL_USDHC +#endif
include/configs/mx6cuboxi.h +0 -6
@@ -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
include/configs/mx6qarm2.h +0 -7
@@ -20,16 +20,9 @@#define CONFIG_MXC_UART_BASE UART4_BASE/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR#define CONFIG_SYS_FSL_USDHC_NUM 2 -#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
include/configs/mx6sabre_common.h +0 -7
@@ -27,15 +27,8 @@#endif /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#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
include/configs/mx6slevk.h +0 -6
@@ -23,14 +23,8 @@#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR/* 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 -/* I2C Configs */ #define CONFIG_CMD_I2C #define CONFIG_SYS_I2C
include/configs/mx6sxsabresd.h +0 -7
@@ -121,15 +121,8 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* I2C Configs */ #define CONFIG_CMD_I2C #define CONFIG_SYS_I2C
include/configs/nitrogen6x.h +0 -7
@@ -54,16 +54,9 @@#define CONFIG_I2C_EDID /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -#ifdef CONFIG_MX6Q #define CONFIG_CMD_SATA #endif
include/configs/novena.h +0 -8
@@ -27,7 +27,6 @@#define CONFIG_CMD_I2C #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII -#define CONFIG_CMD_MMC #define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING
@@ -118,15 +117,8 @@#endif /* MMC Configs */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_USDHC_NUM 2 -#endif /* OCOTP Configs */ #ifdef CONFIG_CMD_FUSE
include/configs/ot1200.h +0 -7
@@ -61,16 +61,9 @@#define IMX_OTPWRITE_ENABLED /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE
include/configs/platinum.h +0 -6
@@ -26,7 +26,6 @@#define CONFIG_CMD_FUSE #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#define CONFIG_CMD_MMC #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS
@@ -52,13 +51,8 @@#define CONFIG_SYS_I2C_SPEED 100000/* MMC config */ -#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_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER /* Ethernet config */ #define CONFIG_FEC_MXC
include/configs/secomx6quq7.h +0 -7
@@ -29,16 +29,9 @@#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2#define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* Ethernet Configuration */ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP
include/configs/tbs2910.h +0 -7
@@ -61,16 +61,9 @@#define CONFIG_FIT /* MMC */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 3#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_CMD_PING
include/configs/titanium.h +0 -7
@@ -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
include/configs/tqma6.h +0 -7
@@ -80,15 +80,8 @@#define TQMA6_PFUZE100_I2C_BUS 2/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_EHCI
include/configs/udoo.h +0 -7
@@ -58,15 +58,8 @@#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -#define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"#define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/wandboard.h +0 -7
@@ -38,16 +38,9 @@#define CONFIG_SYS_I2C_SPEED 100000/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2#define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_EHCI
include/configs/warp.h +0 -7
@@ -25,17 +25,10 @@#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -/* Command definition */ #undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS
Signature · 1 line
2.4.0
PATCH v2 10/10 mx6: standardise CONFIG_CMD_CACHE
In reply to Peter RobinsonMove CONFIG_CMD_CACHE to mx6_common and standardise the way it's defined.
Signed-off-by Peter Robinson <[email protected]>
Reviewed-by Tom Rini <[email protected]>
--- include/configs/aristainetos.h | 2 -- include/configs/cgtqmx6eval.h | 4 ---- include/configs/embestmx6boards.h | 4 ---- include/configs/gw_ventana.h | 4 ---- include/configs/hummingboard.h | 4 ---- include/configs/mx6_common.h | 4 ++++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 4 ---- include/configs/mx6slevk.h | 4 ---- include/configs/mx6sxsabresd.h | 4 ---- include/configs/nitrogen6x.h | 4 ---- include/configs/novena.h | 1 - include/configs/ot1200.h | 4 ---- include/configs/platinum.h | 4 ---- include/configs/secomx6quq7.h | 4 ---- include/configs/tbs2910.h | 4 ---- include/configs/titanium.h | 4 ---- include/configs/tqma6.h | 4 ---- include/configs/udoo.h | 4 ---- include/configs/wandboard.h | 4 ---- include/configs/warp.h | 4 ---- 21 files changed, 4 insertions(+), 73 deletions(-)
include/configs/aristainetos.h +0 -2
@@ -204,8 +204,6 @@#define CONFIG_ENV_OFFSET (0x0d0000)#define CONFIG_ENV_OFFSET_REDUND (0x0e0000) -#define CONFIG_CMD_CACHE -#define CONFIG_SYS_FSL_USDHC_NUM 2#define CONFIG_CMD_I2C
include/configs/cgtqmx6eval.h +0 -4
@@ -119,8 +119,4 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#endif /* __CONFIG_CGTQMX6EVAL_H */
include/configs/embestmx6boards.h +0 -4
@@ -129,10 +129,6 @@#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED#endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -/* Framebuffer */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3
include/configs/gw_ventana.h +0 -4
@@ -426,8 +426,4 @@#define CONFIG_OF_BOARD_SETUP #define CONFIG_FDT_FIXUP_PARTITIONS -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#endif /* __CONFIG_H */
include/configs/hummingboard.h +0 -4
@@ -164,8 +164,4 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#endif /* __CONFIG_H * */
include/configs/mx6_common.h +4 -0
@@ -82,6 +82,10 @@#define CONFIG_SYS_MAXARGS 32#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#ifndef CONFIG_SYS_DCACHE_OFF +#define CONFIG_CMD_CACHE +#endif +/* GPIO */ #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO
include/configs/mx6cuboxi.h +0 -2
@@ -163,6 +163,4 @@#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024) -#define CONFIG_CMD_CACHE -#endif /* __MX6CUBOXI_CONFIG_H */
include/configs/mx6sabre_common.h +0 -4
@@ -196,10 +196,6 @@#define CONFIG_ENV_OFFSET (8 * 64 * 1024)#endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -/* Framebuffer */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3
include/configs/mx6slevk.h +0 -4
@@ -162,10 +162,6 @@#define CONFIG_ENV_IS_IN_MMC #endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF #define CONFIG_SPI_FLASH
include/configs/mx6sxsabresd.h +0 -4
@@ -208,10 +208,6 @@#define CONFIG_ENV_SIZE SZ_8K#define CONFIG_ENV_IS_IN_MMC -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#define CONFIG_SYS_FSL_USDHC_NUM 3#if defined(CONFIG_ENV_IS_IN_MMC )#define CONFIG_SYS_MMC_ENV_DEV 2/*USDHC4*/
include/configs/nitrogen6x.h +0 -4
@@ -320,10 +320,6 @@#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED#endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#define CONFIG_CMD_BMP #define CONFIG_CMD_TIME
include/configs/novena.h +0 -1
@@ -21,7 +21,6 @@/* U-Boot Commands */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BMODE -#define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C
include/configs/ot1200.h +0 -4
@@ -155,10 +155,6 @@#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_BOOTFILE
include/configs/platinum.h +0 -4
@@ -164,10 +164,6 @@ "512k(res2),512k(res3),-(ubi1)"#endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -/* * Environment configuration */
include/configs/secomx6quq7.h +0 -4
@@ -108,8 +108,4 @@#define CONFIG_DYNAMIC_MMC_DEVNO #endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#endif /* __CONFIG_H */
include/configs/tbs2910.h +0 -4
@@ -168,10 +168,6 @@#define CONFIG_MXC_OCOTP #endif -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -/* Environment organization */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 2
include/configs/titanium.h +0 -4
@@ -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 */
include/configs/tqma6.h +0 -4
@@ -392,10 +392,6 @@#define CONFIG_FIT #define CONFIG_FIT_VERBOSE -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -/* * All the defines above are for the TQMa6 SoM *
include/configs/udoo.h +0 -4
@@ -173,8 +173,4 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#endif /* __CONFIG_H * */
include/configs/wandboard.h +0 -4
@@ -227,8 +227,4 @@#define CONFIG_ENV_OFFSET (6 * 64 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0 -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -#endif /* __CONFIG_H * */
include/configs/warp.h +0 -4
@@ -65,10 +65,6 @@/* VDD voltage 1.65 - 1.95 */ #define CONFIG_SYS_SD_VOLTAGE 0x00000080 -#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif -/* USB Configs */ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
Signature · 1 line
2.4.0
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
In reply to Peter Robinson[V2: sorry forgot to Cc: the list]
Quoted 27 lines
There's a lot of common options in the i.MX6 boards that are repeated across a lot of the devices. There's a
mx6_common.hwhich is little used but makes sense to be the central location for all the options we want across all mx6 boards to ensure a consistent set of features. This is a first pass at moving those options and unifying the common options to a standard default.Changes since v1:
* MoveCONFIG_SYS_NO_FLASHchanges from patch 7 to patch 2 and reorder includes so we don't need to undefCONFIG_CMD_FLASH/CONFIG_CMD_IMLS
* AddCONFIG_CMD_GPIOto mx6_common.f (patch 5)
* Use the default for allCONFIG_SYS_PROMPT_HUSH_PS2(patch 7)
* Drop LZO change (patch 8)I think I got all the review points
Peter Robinson (10):
novena: standardisemx6_common.hinclude
imx6: move all standard includes tomx6_common.h
imx6: move generic imx6 options tomx6_common.h
imx6: move standard ATAG configs tomx6_common.h
imx6: moveMXC_GPIOdefine tomx6_common.h
imx6: centralise common boot options inmx6_common.h
imx6: move generic miscellaneous and overwrite options
imx6: standardise filesystem and boot options
imx6: generic MMC config options tomx6_common
mx6: standardiseCONFIG_CMD_CACHE
Quoted 1 line
Reviewed-by Eric Nelson <[email protected]>
Besides my comments on patch 8/10,
for the whole series (especially the tbs2910 part):
Acked-by Soeren Moch <[email protected]>
Thanks for this great cleanup!
Soeren
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
Hi Peter, Soeren,
Quoted 9 lines · Soeren Moch
Quoted 2 lines
Reviewed-by Eric Nelson <[email protected]>Besides my comments on patch 8/10,
for the whole series (especially the tbs2910 part):Acked-by Soeren Moch <[email protected]>Thanks for this great cleanup!
I will add my thanks for this great clean-up. Soeren, as you Acked this patchset, I will merge it together with you patches for tbs2910 [1..4], dropping patch 5.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
Quoted 10 lines · Stefano Babic
Hi Peter, Soeren,
Quoted 6 lines · Soeren Moch
Quoted 2 lines
Reviewed-by Eric Nelson <[email protected]>Besides my comments on patch 8/10,
for the whole series (especially the tbs2910 part):
Quoted 8 lines
Quoted 3 lines
Acked-by Soeren Moch <[email protected]>Thanks for this great cleanup!
I will add my thanks for this great clean-up. Soeren, as you Acked this patchset, I will merge it together with you patches for tbs2910 [1..4], dropping patch 5.
Hi Stefano,
that's fine thanks!
Soeren
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
In reply to Peter RobinsonHi Peter,
Quoted 27 lines · Peter Robinson
There's a lot of common options in the i.MX6 boards that are repeated across a lot of the devices. There's a
mx6_common.hwhich is little used but makes sense to be the central location for all the options we want across all mx6 boards to ensure a consistent set of features. This is a first pass at moving those options and unifying the common options to a standard default.Changes since v1:
* MoveCONFIG_SYS_NO_FLASHchanges from patch 7 to patch 2 and reorder includes so we don't need to undefCONFIG_CMD_FLASH/CONFIG_CMD_IMLS
* AddCONFIG_CMD_GPIOto mx6_common.f (patch 5)
* Use the default for allCONFIG_SYS_PROMPT_HUSH_PS2(patch 7)
* Drop LZO change (patch 8)I think I got all the review points :)
Peter Robinson (10):
novena: standardisemx6_common.hinclude
imx6: move all standard includes tomx6_common.h
imx6: move generic imx6 options tomx6_common.h
imx6: move standard ATAG configs tomx6_common.h
imx6: moveMXC_GPIOdefine tomx6_common.h
imx6: centralise common boot options inmx6_common.h
imx6: move generic miscellaneous and overwrite options
imx6: standardise filesystem and boot options
imx6: generic MMC config options tomx6_common
mx6: standardiseCONFIG_CMD_CACHE
Quoted 2 lines
Reviewed-by Eric Nelson <[email protected]>
Applying your patchset (I had to merge something due to changes in tree), I get several warnings due to duplicated #define.
For example, tqma6 defines CONFIG_SYS_TEXT_BASE. I agree to have it in mx6_common, we need a #undef CONFIG_SYS_TEXT_BASE in the board configuration file for boards (like tqma6) that redefines it.
CONFIG_BOOTDELAY is also set in config_distro_defaults, and it generates also a warning - maybe we have to remove it from mx6_common.h
Can you check these issues and repost a V3 on current u-boot-imx tree ?
Thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
Hi Stefano,
Sorry for the delay, we're on the pointy end of the Fedora 22 release and that's been taking my time.
Quoted 31 lines · Peter Robinson
Quoted 27 lines
There's a lot of common options in the i.MX6 boards that are repeated across a lot of the devices. There's a
mx6_common.hwhich is little used but makes sense to be the central location for all the options we want across all mx6 boards to ensure a consistent set of features. This is a first pass at moving those options and unifying the common options to a standard default.Changes since v1:
* MoveCONFIG_SYS_NO_FLASHchanges from patch 7 to patch 2 and reorder includes so we don't need to undefCONFIG_CMD_FLASH/CONFIG_CMD_IMLS
* AddCONFIG_CMD_GPIOto mx6_common.f (patch 5)
* Use the default for allCONFIG_SYS_PROMPT_HUSH_PS2(patch 7)
* Drop LZO change (patch 8)I think I got all the review points :)
Peter Robinson (10):
novena: standardisemx6_common.hinclude
imx6: move all standard includes tomx6_common.h
imx6: move generic imx6 options tomx6_common.h
imx6: move standard ATAG configs tomx6_common.h
imx6: moveMXC_GPIOdefine tomx6_common.h
imx6: centralise common boot options inmx6_common.h
imx6: move generic miscellaneous and overwrite options
imx6: standardise filesystem and boot options
imx6: generic MMC config options tomx6_common
mx6: standardiseCONFIG_CMD_CACHEQuoted 2 lines
Reviewed-by Eric Nelson <[email protected]>
Quoted 6 lines
Applying your patchset (I had to merge something due to changes in tree), I get several warnings due to duplicated #define.
For example, tqma6 defines
CONFIG_SYS_TEXT_BASE. I agree to have it inmx6_common, we need a #undefCONFIG_SYS_TEXT_BASEin the board configuration file for boards (like tqma6) that redefines it.
Is tqma6 a new board since I did the late patch, I thought any options I'd moved into the central were ones I removed over all the imx6 boards.
Quoted 2 lines
CONFIG_BOOTDELAYis also set inconfig_distro_defaults, and it generates also a warning - maybe we have to remove it frommx6_common.h
I was hoping eventually to be able to add the distro_defaults to the common so we got that across all the boards but I'd not got that far yet. Was basically trying to do the low hanging fruit first.
In the interim would a #ifndef work?
Quoted 1 line
Can you check these issues and repost a V3 on current u-boot-imx tree ?
Sure, will try and get the time over the weekend to rebase.
Peter
Quoted 12 lines
Thanks !
Best regards,
Stefano Babic--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
v2 cover i.MX6: move duplicated options to mx6_common to standardise mx6 config
Hi Peter,
Quoted 5 lines · Peter Robinson
Hi Stefano,
Sorry for the delay, we're on the pointy end of the Fedora 22 release and that's been taking my time.
Do not worry :-)
Quoted 10 lines
Quoted 5 lines · Peter Robinson
For example, tqma6 defines
CONFIG_SYS_TEXT_BASE. I agree to have it inmx6_common, we need a #undefCONFIG_SYS_TEXT_BASEin the board configuration file for boards (like tqma6) that redefines it.Is tqma6 a new board since I did the late patch, I thought any options I'd moved into the central were ones I removed over all the imx6 boards
Quoted 6 lines
Quoted 2 lines
CONFIG_BOOTDELAYis also set inconfig_distro_defaults, and it generates also a warning - maybe we have to remove it frommx6_common.hI was hoping eventually to be able to add the
distro_defaultsto the common so we got that across all the boards but I'd not got that far yet. Was basically trying to do the low hanging fruit first.
Agree on that. This can be done later.
Quoted 2 lines
In the interim would a #ifndef work?
Yes. After this big cleanup will be merged, it will be easier to optimize further issues.
Quoted 4 lines
Quoted 2 lines
Can you check these issues and repost a V3 on current u-boot-imx tree ?
Sure, will try and get the time over the weekend to rebase.
Thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================