imx_common: check for Serial Downloader in spl_boot_device
Subsystems (2)
PATCH v2 1/1 imx_common: check for Serial Downloader in spl_boot_device
Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if CONFIG_SPL_YMODEM_SUPPORT is set.
This allows to load again a SPL based board with imx_usb_loader together with a tool such as kermit.
---
Changes in v2:
- Add documentation (S. Roese)
- Check just bits 24-25 because reserved bits are set on some variants (E. Nelson)
- Set boot device to UARt if USB is set to let bmode working as suggested by Eric
arch/arm/imx-common/spl.c | 8 ++++++++ doc/README.imx6 | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)
arch/arm/imx-common/spl.c +8 -0
@@ -20,7 +20,15 @@ u32 spl_boot_device(void)struct src *psrc = (struct src *)SRC_BASE_ADDR ;unsigned int gpr10_boot =readl (&psrc->gpr10) & (1 <<28 );unsigned reg = gpr10_boot ?readl (&psrc->gpr9) :readl (&psrc->sbmr1); +unsigned int bmode =readl (&psrc->sbmr2); +/* +* Check for BMODE if serial downloader is enabled +* BOOT_MODE - see IMX6DQRM Table 8-1 +*/ +if ((((bmode >>24 ) &0x03 ) ==0x01 ) ||/* Serial Downloader */ + (gpr10_boot && (1 == reg))) +return BOOT_DEVICE_UART ;/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg &0x000000FF ) >>4 ) {/* EIM: See 8.5.1, Table 8-9 */
doc/README.imx6 +51 -0
54 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 1/1 imx_common: check for Serial Downloader in spl_boot_device
Hi Stefano,
Quoted 32 lines · Stefano Babic
Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if
CONFIG_SPL_YMODEM_SUPPORTis set.This allows to load again a SPL based board with
imx_usb_loadertogether with a tool such as kermit.Signed-off-by Stefano Babic <[email protected]>CC Tim Harvey <[email protected]>CC Fabio Estevam <[email protected]>CC Eric Nelson <[email protected]>---
Changes in v2:
- Add documentation (S. Roese)
- Check just bits 24-25 because reserved bits are set on some variants (E. Nelson)
- Set boot device to UARt if USB is set to let bmode working as suggested by Ericarch/arm/imx-common/spl.c | 8 ++++++++ doc/README.imx6 | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)arch/arm/imx-common/spl.c +0
-0
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 29
Quoted 10 lines
arch/arm/imx-common/spl.c +6
-0@@ -20,7 +20,15 @@ u32 spl_boot_device(void)struct src *psrc = (struct src *)SRC_BASE_ADDR ;unsigned int gpr10_boot =readl (&psrc->gpr10) & (1 <<28 );unsigned reg = gpr10_boot ?readl (&psrc->gpr9) :readl (&psrc->sbmr1); +unsigned int bmode =readl (&psrc->sbmr2); +/* +* Check for BMODE if serial downloader is enabled +* BOOT_MODE - see IMX6DQRM Table 8-1 +*/ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */
I think Marek will have a problem with the yoda conditional:
Quoted 26 lines
arch/arm/imx-common/spl.c +2
-0+ (gpr10_boot && (1 == reg))) +return BOOT_DEVICE_UART ;/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg &0x000000FF ) >>4 ) {/* EIM: See 8.5.1, Table 8-9 */ doc/README.imx6 +13
-0@@ -84,3 +84,54 @@ Address: Reading bank 4: Word 0x00000002: 9f027772 00000004 + +2. Using imx_usb_loader for first install with SPL +-------------------------------------------------- + +imx_usb_loader is a very nice tool by BoundaryDevice that +allow to install U-Boot without a JTAG debugger, using +the USB boot mode as described in the manual. It is +a replacement for Freescale's MFGTOOLS. + +The sources can be found here: + + https://github.com/boundarydevices/imx_usb_loader.git +
doc/README.imx6 Address: · line 109
Quoted 10 lines
doc/README.imx6 +10
-0+Booting in USB mode, the i.MX6 announces itself to the Linux Host as: + +Bus 001 Device 111: ID 15a2:0061 Freescale Semiconductor, Inc. + +imx_usb_loader is able to download a single file (u-boot.imx) +to the board. For boards without SPL support, it is enough to +issue the command: + + sudo ../imx_usb_loader/imx_usb -v u-boot.imx +
s/requires to use two communications/requires two downloads/
doc/README.imx6 Address: · line 115
Quoted 6 lines
doc/README.imx6 +6
-0+Getting U-Boot when SPL support is active, it requires to use +two communications. imx_usb_loader downloads the SPL into +OCRAM and starts it. SPL will check for a valid u-boot.img, and +because it is not found, it will wait for it using the y-modem +protocol via the console. +
I think "by combining" would be clearer:
Quoted 13 lines
doc/README.imx6 +12
-0+A first install is then possible combining imx_usb_loader with +another tool such as kermit. + +sudo ../imx_usb_loader/imx_usb -v SPL +kermit kermit_uboot + +and kermit_uboot contains something like this (set line should be adjusted): + +set line /dev/ttyUSB1 +set speed 115200 +SET CARRIER-WATCH OFF +set flow-control none
doc/README.imx6 Address: · line 137
Quoted 10 lines
doc/README.imx6 +10
-0+set handshake none +set prefixing all +set file type bin +set protocol ymodem +send u-boot.img +c + +The last "c" command tells kermit (from ckermit package in most distros) +to switch from command line mode to communication mode, and when the +script is finished, the U-Boot prompt is shown in the same shell.
By the way, besides the couple of nit-picks above, this documentation is really nice!
Otherwise:
PATCH v2 1/1 imx_common: check for Serial Downloader in spl_boot_device
Hi Eric,
Quoted 48 lines · Eric Nelson
Hi Stefano,
Quoted 32 lines · Stefano Babic
Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if
CONFIG_SPL_YMODEM_SUPPORTis set.This allows to load again a SPL based board with
imx_usb_loadertogether with a tool such as kermit.Signed-off-by Stefano Babic <[email protected]>CC Tim Harvey <[email protected]>CC Fabio Estevam <[email protected]>CC Eric Nelson <[email protected]>---
Changes in v2:
- Add documentation (S. Roese)
- Check just bits 24-25 because reserved bits are set on some variants (E. Nelson)
- Set boot device to UARt if USB is set to let bmode working as suggested by Ericarch/arm/imx-common/spl.c | 8 ++++++++ doc/README.imx6 | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)arch/arm/imx-common/spl.c +0
-0arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 29
Quoted 10 lines
arch/arm/imx-common/spl.c +6
-0@@ -20,7 +20,15 @@ u32 spl_boot_device(void)struct src *psrc = (struct src *)SRC_BASE_ADDR ;unsigned int gpr10_boot =readl (&psrc->gpr10) & (1 <<28 );unsigned reg = gpr10_boot ?readl (&psrc->gpr9) :readl (&psrc->sbmr1); +unsigned int bmode =readl (&psrc->sbmr2); +/* +* Check for BMODE if serial downloader is enabled +* BOOT_MODE - see IMX6DQRM Table 8-1 +*/ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */I think Marek will have a problem with the yoda conditional:
Quoted 1 line
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 30
Quoted 1 line
arch/arm/imx-common/spl.c +1
-0+ (gpr10_boot && (1 == reg)))
I fix it in V3 before Marek complains :-). I do not like yoda conditions, too.
Quoted 38 lines
Quoted 25 lines
arch/arm/imx-common/spl.c +1
-0+return BOOT_DEVICE_UART ;/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg &0x000000FF ) >>4 ) {/* EIM: See 8.5.1, Table 8-9 */ doc/README.imx6 +13
-0@@ -84,3 +84,54 @@ Address: Reading bank 4: Word 0x00000002: 9f027772 00000004 + +2. Using imx_usb_loader for first install with SPL +-------------------------------------------------- + +imx_usb_loader is a very nice tool by BoundaryDevice that +allow to install U-Boot without a JTAG debugger, using +the USB boot mode as described in the manual. It is +a replacement for Freescale's MFGTOOLS. + +The sources can be found here: + + https://github.com/boundarydevices/imx_usb_loader.git +doc/README.imx6 Address: · line 109
Quoted 10 lines
doc/README.imx6 +10
-0+Booting in USB mode, the i.MX6 announces itself to the Linux Host as: + +Bus 001 Device 111: ID 15a2:0061 Freescale Semiconductor, Inc. + +imx_usb_loader is able to download a single file (u-boot.imx) +to the board. For boards without SPL support, it is enough to +issue the command: + + sudo ../imx_usb_loader/imx_usb -v u-boot.imx +s/requires to use two communications/requires two downloads/
Quoted 8 lines
doc/README.imx6 Address: · line 115
Quoted 6 lines
doc/README.imx6 +6
-0+Getting U-Boot when SPL support is active, it requires to use +two communications. imx_usb_loader downloads the SPL into +OCRAM and starts it. SPL will check for a valid u-boot.img, and +because it is not found, it will wait for it using the y-modem +protocol via the console. +I think "by combining" would be clearer:
ok, thanks.
Quoted 28 lines
Quoted 14 lines
doc/README.imx6 +12
-0+A first install is then possible combining imx_usb_loader with +another tool such as kermit. + +sudo ../imx_usb_loader/imx_usb -v SPL +kermit kermit_uboot + +and kermit_uboot contains something like this (set line should be adjusted): + +set line /dev/ttyUSB1 +set speed 115200 +SET CARRIER-WATCH OFF +set flow-control nonedoc/README.imx6 Address: · line 137
Quoted 10 lines
doc/README.imx6 +10
-0+set handshake none +set prefixing all +set file type bin +set protocol ymodem +send u-boot.img +c + +The last "c" command tells kermit (from ckermit package in most distros) +to switch from command line mode to communication mode, and when the +script is finished, the U-Boot prompt is shown in the same shell.By the way, besides the couple of nit-picks above, this documentation is really nice!
Quoted 5 lines
Otherwise:
Reviewed-by Eric Nelson <[email protected]>Tested-by Eric Nelson <[email protected]>
Regards,
Stefano
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 1/1 imx_common: check for Serial Downloader in spl_boot_device
Quoted 56 lines · Stefano Babic
Hi Eric,
Quoted 53 lines · Eric Nelson
Hi Stefano,
Quoted 38 lines · Stefano Babic
Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if
CONFIG_SPL_YMODEM_SUPPORTis set.This allows to load again a SPL based board with
imx_usb_loadertogether with a tool such as kermit.Signed-off-by Stefano Babic <[email protected]>CC Tim Harvey <[email protected]>CC Fabio Estevam <[email protected]>CC Eric Nelson <[email protected]>---
Changes in v2:
- Add documentation (S. Roese)
- Check just bits 24-25 because reserved bits are set on some variants(E. Nelson)
- Set boot device to UARt if USB is set to let bmode working as
suggested by Eric
arch/arm/imx-common/spl.c | 8 ++++++++ doc/README.imx6 | 51+++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)
arch/arm/imx-common/spl.c +0
-0@@ -20,7 +20,15 @@ u32 spl_boot_device(void)struct src *psrc = (struct src *)SRC_BASE_ADDR ;arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 31
Quoted 10 lines
arch/arm/imx-common/spl.c +6
-0unsigned int gpr10_boot =readl (&psrc->gpr10) & (1 <<28 );unsigned reg = gpr10_boot ?readl (&psrc->gpr9) :readl (&psrc->sbmr1); +unsigned int bmode =readl (&psrc->sbmr2); +/* +* Check for BMODE if serial downloader is enabled +* BOOT_MODE - see IMX6DQRM Table 8-1 +*/ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */I think Marek will have a problem with the yoda conditional:
Quoted 4 lines
Quoted 1 line
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 30
Quoted 1 line
arch/arm/imx-common/spl.c +1
-0+ (gpr10_boot && (1 == reg)))I fix it in V3 before Marek complains :-). I do not like yoda conditions, too.
Problem, I have ;-)
PATCH v2 1/1 imx_common: check for Serial Downloader in spl_boot_device
Quoted 4 lines · Marek Vasut
Quoted 3 lines · Stefano Babic
Hi Eric,
On 11/12/2015 15:40, Eric Nelson wrote:
...
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 29
Quoted 5 lines
arch/arm/imx-common/spl.c +5
-0+/* +* Check for BMODE if serial downloader is enabled +* BOOT_MODE - see IMX6DQRM Table 8-1 +*/ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */I think Marek will have a problem with the yoda conditional:
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 30
Quoted 1 line
arch/arm/imx-common/spl.c +1
-0+ (gpr10_boot && (1 == reg)))I fix it in V3 before Marek complains :-). I do not like yoda conditions, too.
Problem, I have ;-)
Even this week?
You guys have never had the compiler catch an erroneous assignment like this one:
if (i = 1) ...
I got in this habit many years ago after reading "Code Complete", and it's saved me many a time...
I need to figure out how to get checkpatch.pl to watch it for me when pushing stuff up-stream.
PATCH v2 1/1 imx_common: check for Serial Downloader in spl_boot_device
Quoted 23 lines · Eric Nelson
Quoted 4 lines · Marek Vasut
Quoted 3 lines · Stefano Babic
Hi Eric,
On 11/12/2015 15:40, Eric Nelson wrote:
...
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 29
Quoted 5 lines
arch/arm/imx-common/spl.c +5
-0+/* +* Check for BMODE if serial downloader is enabled +* BOOT_MODE - see IMX6DQRM Table 8-1 +*/ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */I think Marek will have a problem with the yoda conditional:
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
arch/arm/imx-common/spl.c u32 spl_boot_device(void) · line 30
Quoted 1 line
arch/arm/imx-common/spl.c +1
-0+ (gpr10_boot && (1 == reg)))I fix it in V3 before Marek complains :-). I do not like yoda conditions, too.
Problem, I have ;-)
Even this week?
Quoted 8 lines
You guys have never had the compiler catch an erroneous assignment like this one:
if (i = 1) ...I got in this habit many years ago after reading "Code Complete", and it's saved me many a time...
The compiler should really be catching these. The condition if (1 == foo) is extremely unnatural.
Quoted 2 lines
I need to figure out how to get checkpatch.pl to watch it for me when pushing stuff up-stream.
Best regards,
Marek Vasut