From e93a693d4966fd6779f02a1b447814424918b88d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:25 -0300 Subject: mx6sxsabresd: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index a290129..a29d62f 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -134,8 +134,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 256 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -- cgit v0.10.2 From 9b686f3029d3c2d893a2b890d17709006c0a457f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:26 -0300 Subject: mx6slevk: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Jason Liu Signed-off-by: Fabio Estevam Acked-by: Jason Liu diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 1221418..21c654b 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -169,8 +169,6 @@ #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 -- cgit v0.10.2 From ad970756208864de4b353b77bfb04c0fb4fc5ab5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:27 -0300 Subject: mx6qarm2: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Jason Liu Signed-off-by: Fabio Estevam Acked-by: Jason Liu diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 76cfef1..5412dd3 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -153,8 +153,6 @@ #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 -- cgit v0.10.2 From bc37d52afeb431feda70381f927b88bd13283fe4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:28 -0300 Subject: mx53loco: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Jason Liu Signed-off-by: Fabio Estevam Acked-by: Jason Liu diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 8d8b93c..8f92234 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -184,8 +184,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ -- cgit v0.10.2 From 8afe832abd25ac02bb3b3046acb14306a634fbf0 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:29 -0300 Subject: mx51evk: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index d6e8ec4..b0c9717 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -222,8 +222,6 @@ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ -- cgit v0.10.2 From 9cf38bf71d1ebb45c55a0d9b466cef689881cb90 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:30 -0300 Subject: mx35pdk: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 603d17c..09d55ce 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -138,8 +138,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ -- cgit v0.10.2 From ba1a10796316a5b81c1c91663148fc7da5843e3a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:31 -0300 Subject: mx31pdk: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Magnus Lilja Signed-off-by: Fabio Estevam Acked-by: Magnus Lilja diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 2a3e53c..1282a6e 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -121,9 +121,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT)+16) /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 /* Boot Argument Buffer Size */ -- cgit v0.10.2 From 31188d873e75557ed98d9584fe04a5cb99828972 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:32 -0300 Subject: mx25pdk: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index c02e29b..bfbfc68 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -229,8 +229,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE -/* 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 -- cgit v0.10.2 From e7a2e7d07e8eeac8fd464a9daeaa7d641cb9b144 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:33 -0300 Subject: mxs: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Marek Vasut Signed-off-by: Fabio Estevam Acked-by: Marek Vasut diff --git a/include/configs/mxs.h b/include/configs/mxs.h index dea8227..38b1e93 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -94,9 +94,6 @@ /* U-Boot general configuration */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ -#define CONFIG_SYS_PBSIZE \ - (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) - /* Print buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -- cgit v0.10.2 From f90f480ed248c8a2f1b11d5835b25171c9c24929 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:34 -0300 Subject: wandboard: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 117d1f7..b586803 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -249,9 +249,6 @@ #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 -- cgit v0.10.2 From 161c6559195b0ceec93b5384b2d1b4e2db268933 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:35 -0300 Subject: hummingboard: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 34dbdce..973f2c5 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -185,9 +185,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #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 -- cgit v0.10.2 From f30f50987a3f9c45c0d580a996d267e7e9688763 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:36 -0300 Subject: nitrogen6x: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Eric Nelson Signed-off-by: Fabio Estevam diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 6d379ed..8ef4b73 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -325,9 +325,6 @@ #define CONFIG_SYS_PROMPT "U-Boot > " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 - -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 48 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -- cgit v0.10.2 From 0e26afe5ce03fffca8d665a9c511173a946ff233 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:37 -0300 Subject: warp: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Otavio Salvador Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador diff --git a/include/configs/warp.h b/include/configs/warp.h index bcdd112..aa3115b 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -81,9 +81,6 @@ #define CONFIG_HW_WATCHDOG #define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */ - -/* 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 -- cgit v0.10.2 From 1f62482eed73108ed602b80ed462c26043a35235 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 14:14:38 -0300 Subject: novena: Use the default CONFIG_SYS_PBSIZE Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Marek Vasut Signed-off-by: Fabio Estevam Acked-by: Marek Vasut diff --git a/include/configs/novena.h b/include/configs/novena.h index 074110c..3809c6c 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -58,9 +58,6 @@ /* U-Boot general configurations */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ -#define CONFIG_SYS_PBSIZE \ - (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) - /* Print buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -- cgit v0.10.2 From 97ee459033f42e41be732a4baba06db7ba6e95e1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 10:17:17 -0300 Subject: warp: Add Device Firmware Upgrade support Device Firmware Upgrade (DFU) is a very convenient mechanism to upgrade U-boot on the eMMC. Add support for it. Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador diff --git a/include/configs/warp.h b/include/configs/warp.h index aa3115b..e851da0 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -28,7 +28,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -147,6 +147,12 @@ #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "FSL" +#define CONFIG_CMD_DFU +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define DFU_DEFAULT_POLL_TIMEOUT 300 + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -161,6 +167,7 @@ "mmcdev=0\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ -- cgit v0.10.2 From 1f9d1cf6b28ec9e2230299eb8f81e58a40070655 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 2 Mar 2015 12:57:22 -0300 Subject: warp: Add a README file Provide instructions on how to upgrade U-boot in the eMMC. Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador diff --git a/board/warp/README b/board/warp/README new file mode 100644 index 0000000..0e1f076 --- /dev/null +++ b/board/warp/README @@ -0,0 +1,56 @@ +How to Update U-boot on Warp board +---------------------------------- + +Required software on the host PC: + +- imx_usb_loader: https://github.com/boundarydevices/imx_usb_loader + +- dfu-util: http://dfu-util.sourceforge.net/releases/ + +Build U-boot for Warp: + +$ make mrproper +$ make warp_config +$ make + +This will generate the U-boot binary called u-boot.imx. + +Put warp board in USB download mode + +Connect a USB to serial adapter between the host PC and warp + +Connect a USB cable between the OTG warp port and the host PC + +Open a terminal program such as minicom + +Copy u-boot.imx to the imx_usb_loader folder. + +Load u-boot.imx via USB: + +$ sudo ./imx_usb u-boot.imx + +Then U-boot should start and its messages will appear in the console program. + +Use the default environment variables: + +=> env default -f -a +=> save + +Run the DFU command: +=> dfu 0 mmc 0 + +Transfer u-boot.imx that will be flashed into the eMMC: + +$ sudo dfu-util -D u-boot.imx -a boot + +Then on the U-boot prompt the following message should be seen after a succesful +upgrade: + +#DOWNLOAD ... OK +Ctrl+C to exit ... + +Remove power from the warp board. + +Put warp board into normal boot mode + +Power up the board and the new updated U-boot should boot from eMMC -- cgit v0.10.2 From 4bf83961b84d5cf51af9dd7b362c9ed416b33bbe Mon Sep 17 00:00:00 2001 From: "maxin.john@enea.com" Date: Tue, 3 Mar 2015 15:48:41 +0100 Subject: mx6sabre_common.h: remove deprecated mmc open/close Replace "mmc open/close" with "mmc dev" in mx6sabre_common.h as those commands were removed with this commit: 614b2bf1c9bf80dbad24f5e5ce1d115bf24a831d cmd_mmc.c: Drop open/close mmc sub-commands Signed-off-by: Maxin B. John Acked-by: Otavio Salvador diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f0e37f0..cbd9a6c 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -111,12 +111,10 @@ "setenv get_cmd tftp; " \ "fi; " \ "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "if mmc dev ${emmcdev} && " \ - "mmc open ${emmcdev} 1; then " \ + "if mmc dev ${emmcdev} 1; then " \ "setexpr fw_sz ${filesize} / 0x200; " \ "setexpr fw_sz ${fw_sz} + 1; " \ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "mmc close ${emmcdev} 1; " \ "fi; " \ "fi\0" #else -- cgit v0.10.2 From 0c1842a01f2b5383064b81862fcbc438146497fa Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 4 Mar 2015 21:33:15 +0800 Subject: imx:mx6 remove duplicated includes There is no need to include asm/bootm.h twice, so remove one. Signed-off-by: Peng Fan diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index ef02972..b354f70 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include -- cgit v0.10.2 From 9d16c52f62a4cd017ac3530002ccc8ea9ffde58f Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Mon, 9 Mar 2015 14:48:48 +0100 Subject: mx6: soc: Switch to cold reset Disable the warm reset and enable the cold reset for a more reliable restart ('reset'). This is taken from the Linux kernel, see imx_src_init() in arch/arm/mach-imx/src.c. Signed-off-by: Dirk Behme diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index b354f70..dd34138 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -288,6 +288,22 @@ static void set_preclk_from_osc(void) } #endif +#define SRC_SCR_WARM_RESET_ENABLE 0 + +static void init_src(void) +{ + struct src *src_regs = (struct src *)SRC_BASE_ADDR; + u32 val; + + /* + * force warm reset sources to generate cold reset + * for a more reliable restart + */ + val = readl(&src_regs->scr); + val &= ~(1 << SRC_SCR_WARM_RESET_ENABLE); + writel(val, &src_regs->scr); +} + int arch_cpu_init(void) { init_aips(); @@ -322,6 +338,8 @@ int arch_cpu_init(void) mxs_dma_init(); #endif + init_src(); + return 0; } -- cgit v0.10.2 From 14a380a8f3059a8e66446d0462a39978946c564c Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 10 Mar 2015 08:04:36 +0100 Subject: common/board_f.c: Enable IMX watchdog in init_func_watchdog_init() Without this patch, the IMX watchdog will not be initialized. And therefor not active. This patch fixes this by calling hw_watchdog_init() also when CONFIG_IMX_WATCHDOG is defined. Signed-off-by: Stefan Roese Cc: Simon Glass Cc: Fabio Estevam Cc: Stefano Babic Cc: Heiko Schocher Acked-by: Heiko Schocher diff --git a/common/board_f.c b/common/board_f.c index 4d8b8a6..89ce795 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -111,7 +111,8 @@ static int init_func_watchdog_init(void) { # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \ defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ - defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG)) + defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \ + defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); # endif puts(" Watchdog enabled\n"); -- cgit v0.10.2 From fa481a83189a6a5d60264b476a6177e659f23146 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 9 Mar 2015 12:49:56 -0300 Subject: mx53ard: Use the standard U-boot prompt By not defining CONFIG_SYS_PROMPT, the standard "=>" prompt is used, so remove its definition. Signed-off-by: Fabio Estevam diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 134d680..9b003fc 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -186,7 +186,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT "MX53ARD U-Boot > " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -- cgit v0.10.2 From 06ca28eb3610a779619a57957df334f46c3ebe21 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 11 Mar 2015 22:52:14 -0300 Subject: mx6_common: Do not select esdhc DDR mode for all boards CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE should be selected only by boards that really have a DDR-capable eMMC, so remove this option from common code to avoid regressions. Reported-by: Stefan Roese Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador Reviewed-by: Volodymyr Riazantsev Tested-by: Stefan Roese diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 29b72b2..e0528ce 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_PL310_BASE L2_PL310_BASE #endif -#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE - #define CONFIG_MP #define CONFIG_MXC_GPT_HCLK -- cgit v0.10.2 From ed914302c7fc3bed1cf40bac584f9f6c8b49dc8b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 11 Mar 2015 22:52:15 -0300 Subject: warp: Select CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE Warp has a DDR eMMC, so enable CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE for better performance: reading zImage 5790288 bytes read in 117 ms (47.2 MiB/s) Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador diff --git a/include/configs/warp.h b/include/configs/warp.h index e851da0..2eb429e 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -42,6 +42,7 @@ #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 -- cgit v0.10.2 From d5eb6dcf44f5c889dd80c81cf3b06385a27f8baf Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 9 Mar 2015 18:44:39 -0300 Subject: mx6sabre: Do not enable UMS with SPL Since commit ad8aae82b20ac6a ("mx6sabre: Enable User Mass Storage") SPL target does not boot anymore due to the increased spl image size. Only enable USB Mass Storage for the non-SPL target. Signed-off-by: Fabio Estevam Reviewed-by: Tom Rini diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index cbd9a6c..b72522b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -276,6 +276,7 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#ifndef CONFIG_SPL #define CONFIG_CI_UDC #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED @@ -289,5 +290,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "FSL" +#endif #endif /* __MX6QSABRE_COMMON_CONFIG_H */ -- cgit v0.10.2