From 825adb991ab081a50a92e50cc54a1f42b7277c94 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 27 May 2015 01:11:44 -0300 Subject: warp: Adjust CONFIG_SYS_DFU_DATA_BUF_SIZE Adjust CONFIG_SYS_DFU_DATA_BUF_SIZE in order to avoid the following error when running the dfu command: => dfu 0 mmc 0 dfu_get_buf: Could not memalign 0x2000000 bytes Signed-off-by: Fabio Estevam --- include/configs/warp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/warp.h b/include/configs/warp.h index 2673948..f0a912b 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -94,7 +94,7 @@ #define CONFIG_CMD_DFU #define CONFIG_DFU_FUNCTION #define CONFIG_DFU_MMC -#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 #define CONFIG_EXTRA_ENV_SETTINGS \ -- cgit v1.1 From b459803335c2375ea776e68a1382f6d923278736 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 27 May 2015 01:11:45 -0300 Subject: warp: Fix CONFIG_SYS_FSL_ESDHC_ADDR Warp uses eMMC connected to esdhc2 port, so fix CONFIG_SYS_FSL_ESDHC_ADDR to reflect that. Signed-off-by: Fabio Estevam --- include/configs/warp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/warp.h b/include/configs/warp.h index f0a912b..a67254e 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -25,7 +25,7 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* MMC Configs */ -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE -- cgit v1.1 From e6434d7eca14fc3b1bde9beac5eb8df6db1bf929 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 27 May 2015 01:11:46 -0300 Subject: warp: Enable CONFIG_SUPPORT_EMMC_BOOT CONFIG_SUPPORT_EMMC_BOOT is important to enable the boot partition via 'mmc partconf 0 1 1 0' command, for example. Signed-off-by: Fabio Estevam --- include/configs/warp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/warp.h b/include/configs/warp.h index a67254e..5463c40 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -28,6 +28,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE +#define CONFIG_SUPPORT_EMMC_BOOT /* Command definition */ #undef CONFIG_CMD_NET -- cgit v1.1 From fdf71898d943505412daa6f9dd37f86fd7e70c6c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 27 May 2015 01:11:47 -0300 Subject: warp: Add fuse command support Select the fuse command support. Signed-off-by: Fabio Estevam --- include/configs/warp.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/configs/warp.h b/include/configs/warp.h index 5463c40..296ea83 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -98,6 +98,10 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 +/* Fuses */ +#define CONFIG_CMD_FUSE +#define CONFIG_MXC_OCOTP + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ -- cgit v1.1 From da2103c79ec95820bdbf7f1100a34bc501ebf7a4 Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Tue, 12 May 2015 10:55:39 +0200 Subject: arm: mx6: tqma6: fix spelling error in condition Signed-off-by: Markus Niebel --- include/configs/tqma6_mba6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 88c0067..2f52598 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013, 2014 Markus Niebel + * Copyright (C) 2013 - 2015 Markus Niebel * * Configuration settings for the TQ Systems TQMa6 module. * @@ -11,7 +11,7 @@ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define CONFIG_DEFAULT_FDT_FILE "imx6dl-mba6x.dtb" -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q) +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) #define CONFIG_DEFAULT_FDT_FILE "imx6q-mba6x.dtb" #endif -- cgit v1.1 From c0c5341e732b0c52190b2fd85bb6b94c5879dfd9 Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Tue, 12 May 2015 10:55:40 +0200 Subject: arm: mx6: tqma6: use default CONFIG_SYS_PBSIZE this removes a config entry and uses the default value defined in config_fallbacks.h. This implements the same behaviour as a patch series for other i.MX6 boards from Freescale Signed-off-by: Markus Niebel --- include/configs/tqma6.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 4c93c9b..a091184 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -369,10 +369,6 @@ "panicboot=echo No boot device !!! reset\0" \ TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT) + 16) - #define CONFIG_STACKSIZE (128u * SZ_1K) /* Physical Memory Map */ -- cgit v1.1 From 9a8804a85e37d774419ee6452a90cc6e57d925f3 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 21 May 2015 19:24:05 -0300 Subject: wandboard: Add board revision detection support There are two revisions of wandboard: version B1 and C1. Add the revision detection support, so that the correct dtb file can be automatically loaded. Based on the patch from Richard Hu . Signed-off-by: Fabio Estevam Reviewed-by: Stefano Babic Tested-By: Vagrant Cascadian --- include/configs/wandboard.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 69590ad..0cc0f03 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -194,10 +194,14 @@ "bootz; " \ "fi;\0" \ "findfdt="\ - "if test $board_rev = MX6Q ; then " \ + "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ "setenv fdtfile imx6q-wandboard.dtb; fi; " \ - "if test $board_rev = MX6DL ; then " \ + "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ + "if test $board_name = B1 && test $board_rev = MX6Q ; then " \ + "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ + "if test $board_name = B1 && test $board_rev = MX6DL ; then " \ + "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; \0" \ -- cgit v1.1 From cd6ddc48134297497d226209a4e6ea72b71c87c5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 28 May 2015 12:33:34 -0300 Subject: mx6_common: Fix LOADADDR and SYS_TEXT_BASE for MX6SL and MX6SX Commit 8183058188cd2d942 ("imx6: centralise common boot options in mx6_common.h") broke boot on mx6sl and mx6sx by assuming that all mx6 SoCs use the same LOADADDR/SYS_TEXT_BASE range, which is not correct. DDR on mx6sx/mx6sl starts at 0x80000000. Adjust LOADADDR/SYS_TEXT_BASE to the proper values for mx6sx/mx6sl, so that these SoCs can boot again. Also, TQMA6 requires a custom CONFIG_SYS_TEXT_BASE value, so move its setting prior to the inclusion of mx6_common.h. Signed-off-by: Fabio Estevam --- include/configs/mx6_common.h | 10 +++++++++- include/configs/tqma6.h | 14 +++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 233c6d2..50370e1 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -53,11 +53,19 @@ #define CONFIG_REVISION_TAG /* Boot options */ +#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL)) +#define CONFIG_LOADADDR 0x82000000 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0x87800000 +#endif +#else #define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x17800000 #endif +#endif +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + #ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 3 #endif diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index a091184..e46c580 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -22,6 +22,13 @@ /* #endif */ +/* place code in last 4 MiB of RAM */ +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) +#define CONFIG_SYS_TEXT_BASE 0x2fc00000 +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) +#define CONFIG_SYS_TEXT_BASE 0x4fc00000 +#endif + #include "mx6_common.h" #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) @@ -118,13 +125,6 @@ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR -/* place code in last 4 MiB of RAM */ -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) -#define CONFIG_SYS_TEXT_BASE 0x2fc00000 -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) -#define CONFIG_SYS_TEXT_BASE 0x4fc00000 -#endif - #define CONFIG_ENV_SIZE (SZ_8K) /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) -- cgit v1.1 From 30748d81d0b33f04c86b5b96aab2e8bf8d330ea2 Mon Sep 17 00:00:00 2001 From: Bhuvanchandra DV Date: Mon, 1 Jun 2015 18:37:18 +0530 Subject: colibri_vf: Enable GPIO support Acked-by: Stefan Agner Signed-off-by: Bhuvanchandra DV --- include/configs/colibri_vf.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 804291d..195102b 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -54,6 +54,11 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR +/* GPIO support */ +#define CONFIG_DM_GPIO +#define CONFIG_CMD_GPIO +#define CONFIG_VYBRID_GPIO + /* Dynamic MTD partition support */ #define CONFIG_CMD_MTDPARTS /* Enable 'mtdparts' command line support */ #define CONFIG_MTD_PARTITIONS -- cgit v1.1 From 98e3fd3ddfac658be7c63256c8c6a9a9db2f23bf Mon Sep 17 00:00:00 2001 From: Bhuvanchandra DV Date: Mon, 1 Jun 2015 18:37:22 +0530 Subject: colibri-vf: Enable SPI support Signed-off-by: Bhuvanchandra DV Acked-by: Stefan Agner --- include/configs/colibri_vf.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 195102b..56e6d97 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -272,4 +272,11 @@ #define CONFIG_USB_GADGET_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE +/* Enable SPI support */ +#ifdef CONFIG_OF_CONTROL +#define CONFIG_DM_SPI +#define CONFIG_CMD_SPI +#define CONFIG_FSL_DSPI +#endif + #endif /* __CONFIG_H */ -- cgit v1.1