| Message ID | 1344475594-10630-1-git-send-email-troy.kisky@boundarydevices.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
On 09/08/2012 03:26, Troy Kisky wrote: > This is useful for forcing the ROM's > usb downloader to activate upon a watchdog reset. > Or, you can boot from either SD Card. > Hi Troy, > Currently, support added for MX53 and MX6Q > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> > > Note: MX53 support untested. It can help me to understand your implementation if I can find in the documentation where this feature is implemented. I started wit MX53 and well, in the manual I see only that LPGR is a "general purpose register" and contains "user specific data". Maybe I am searching in wrong places. Where can I find the description for the feature you have implemented ? > diff --git a/arch/arm/cpu/armv7/imx-common/Makefile b/arch/arm/cpu/armv7/imx-common/Makefile > index bf36be5..24f490e 100644 > --- a/arch/arm/cpu/armv7/imx-common/Makefile > +++ b/arch/arm/cpu/armv7/imx-common/Makefile > @@ -29,6 +29,7 @@ LIB = $(obj)libimx-common.o > > COBJS-y = iomux-v3.o timer.o cpu.o speed.o > COBJS-$(CONFIG_I2C_MXC) += i2c.o > +COBJS-$(CONFIG_CMD_RESETMODE) += cmd_resetmode.o > COBJS := $(sort $(COBJS-y)) > > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > diff --git a/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c b/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c > new file mode 100644 > index 0000000..d1c50e1 > --- /dev/null > +++ b/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c > @@ -0,0 +1,152 @@ > +/* > + * Copyright (C) 2012 Boundary Devices Inc. > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > +#include <common.h> > +#include <asm/errno.h> > +#include <asm/io.h> > +#include <asm/imx-common/resetmode.h> > +#include <malloc.h> > + > +const struct reset_mode *modes[2]; > + > +const struct reset_mode *search_modes(char *arg) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(modes); i++) { > + const struct reset_mode *p = modes[i]; > + if (p) { > + while (p->name) { > + if (!strcmp(p->name, arg)) > + return p; > + p++; > + } > + } > + } > + return NULL; > +} > + > +int create_usage(char *dest) > +{ > + int i; > + int size = 0; > + > + for (i = 0; i < ARRAY_SIZE(modes); i++) { > + const struct reset_mode *p = modes[i]; > + if (p) { > + while (p->name) { > + int len = strlen(p->name); > + if (dest) { > + memcpy(dest, p->name, len); > + dest += len; > + *dest++ = '|'; > + } > + size += len + 1; > + p++; > + } > + } > + } > + if (dest) > + dest[-1] = 0; > + return size; > +} > + > +int do_resetmode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > +{ > + const struct reset_mode *p; > + > + if (argc < 2) > + return CMD_RET_USAGE; > + p = search_modes(argv[1]); > + if (!p) > + return CMD_RET_USAGE; > + reset_mode_apply(p->cfg_val); > + return 0; > +} > + > +U_BOOT_CMD( > + resetmode, 2, 0, do_resetmode, > + NULL, > + ""); > + > +void add_board_resetmodes(const struct reset_mode *p) > +{ > + int size; > + char *dest; > + > + if (__u_boot_cmd_resetmode.usage) { > + free(__u_boot_cmd_resetmode.usage); > + __u_boot_cmd_resetmode.usage = NULL; > + } > + > + modes[0] = p; > + modes[1] = soc_reset_modes; > + size = create_usage(NULL); > + dest = malloc(size); > + if (dest) { > + create_usage(dest); > + __u_boot_cmd_resetmode.usage = dest; > + } > +} > + > +int do_resetmode_cmd(char *arg) > +{ > + const struct reset_mode *p; > + > + p = search_modes(arg); > + if (!p) { > + printf("%s not found\n", arg); > + return CMD_RET_FAILURE; > + } > + reset_mode_apply(p->cfg_val); > + do_reset(NULL, 0, 0, NULL); > + return 0; > +} > + > +int do_bootmmc0(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > +{ > + return do_resetmode_cmd("mmc0"); > +} > + > +int do_bootmmc1(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > +{ > + return do_resetmode_cmd("mmc1"); > +} Why do you not pass the mode to do_resetmode_cmd() and let this function parse the argument, without these help functions ? Then we do not need to add new functions if we have, for example, mmc2 or mmc3. Best regards, Stefano Babic
On 8/9/2012 12:21 AM, Stefano Babic wrote: > On 09/08/2012 03:26, Troy Kisky wrote: >> This is useful for forcing the ROM's >> usb downloader to activate upon a watchdog reset. >> Or, you can boot from either SD Card. >> > Hi Troy, > >> Currently, support added for MX53 and MX6Q >> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> >> >> Note: MX53 support untested. > It can help me to understand your implementation if I can find in the > documentation where this feature is implemented. I started wit MX53 and > well, in the manual I see only that LPGR is a "general purpose register" > and contains "user specific data". > > Maybe I am searching in wrong places. Where can I find the description > for the feature you have implemented ? The only documentations I've found are in the freescale release of u-boot. cpu/arm_cortexa8/mx53/generic.c void do_switch_mfgmode(void) { u32 reg; reg = readl(SRTC_BASE_ADDR + SRTC_LPGR); /* After set bit 28 of LPGR register of SRTC to 1, Set bit * [25:0] to specified value according to format of SBMR, * after trigger a watchdog reset, ROM will read Bit 28 and * then copy bit [25:0] of LPGR to SBMR, then ROM can enter * serial download mode.*/ reg |= 0x12000000; writel(reg, SRTC_BASE_ADDR + SRTC_LPGR); /* this watchdog reset will let chip enter mfgtool download * mode. */ do_reset(NULL, 0, 0, NULL); } U_BOOT_CMD( download_mode, 1, 1, do_switch_mfgmode, "download_mode - enter i.MX serial/usb download mode\n", ""); and for mx6q by disassembling iMX6DQ_SPI_to_uSDHC3.bin and iMX6DQ_SPI_to_uSDHC4.bin > >> diff --git a/arch/arm/cpu/armv7/imx-common/Makefile b/arch/arm/cpu/armv7/imx-common/Makefile >> index bf36be5..24f490e 100644 >> --- a/arch/arm/cpu/armv7/imx-common/Makefile >> +++ b/arch/arm/cpu/armv7/imx-common/Makefile >> @@ -29,6 +29,7 @@ LIB = $(obj)libimx-common.o >> >> COBJS-y = iomux-v3.o timer.o cpu.o speed.o >> COBJS-$(CONFIG_I2C_MXC) += i2c.o >> +COBJS-$(CONFIG_CMD_RESETMODE) += cmd_resetmode.o >> COBJS := $(sort $(COBJS-y)) >> >> SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) >> diff --git a/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c b/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c >> new file mode 100644 >> index 0000000..d1c50e1 >> --- /dev/null >> +++ b/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c >> @@ -0,0 +1,152 @@ >> +/* >> + * Copyright (C) 2012 Boundary Devices Inc. >> + * >> + * See file CREDITS for list of people who contributed to this >> + * project. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License as >> + * published by the Free Software Foundation; either version 2 of >> + * the License, or (at your option) any later version. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, >> + * MA 02111-1307 USA >> + */ >> +#include <common.h> >> +#include <asm/errno.h> >> +#include <asm/io.h> >> +#include <asm/imx-common/resetmode.h> >> +#include <malloc.h> >> + >> +const struct reset_mode *modes[2]; >> + >> +const struct reset_mode *search_modes(char *arg) >> +{ >> + int i; >> + >> + for (i = 0; i < ARRAY_SIZE(modes); i++) { >> + const struct reset_mode *p = modes[i]; >> + if (p) { >> + while (p->name) { >> + if (!strcmp(p->name, arg)) >> + return p; >> + p++; >> + } >> + } >> + } >> + return NULL; >> +} >> + >> +int create_usage(char *dest) >> +{ >> + int i; >> + int size = 0; >> + >> + for (i = 0; i < ARRAY_SIZE(modes); i++) { >> + const struct reset_mode *p = modes[i]; >> + if (p) { >> + while (p->name) { >> + int len = strlen(p->name); >> + if (dest) { >> + memcpy(dest, p->name, len); >> + dest += len; >> + *dest++ = '|'; >> + } >> + size += len + 1; >> + p++; >> + } >> + } >> + } >> + if (dest) >> + dest[-1] = 0; >> + return size; >> +} >> + >> +int do_resetmode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >> +{ >> + const struct reset_mode *p; >> + >> + if (argc < 2) >> + return CMD_RET_USAGE; >> + p = search_modes(argv[1]); >> + if (!p) >> + return CMD_RET_USAGE; >> + reset_mode_apply(p->cfg_val); >> + return 0; >> +} >> + >> +U_BOOT_CMD( >> + resetmode, 2, 0, do_resetmode, >> + NULL, >> + ""); >> + >> +void add_board_resetmodes(const struct reset_mode *p) >> +{ >> + int size; >> + char *dest; >> + >> + if (__u_boot_cmd_resetmode.usage) { >> + free(__u_boot_cmd_resetmode.usage); >> + __u_boot_cmd_resetmode.usage = NULL; >> + } >> + >> + modes[0] = p; >> + modes[1] = soc_reset_modes; >> + size = create_usage(NULL); >> + dest = malloc(size); >> + if (dest) { >> + create_usage(dest); >> + __u_boot_cmd_resetmode.usage = dest; >> + } >> +} >> + >> +int do_resetmode_cmd(char *arg) >> +{ >> + const struct reset_mode *p; >> + >> + p = search_modes(arg); >> + if (!p) { >> + printf("%s not found\n", arg); >> + return CMD_RET_FAILURE; >> + } >> + reset_mode_apply(p->cfg_val); >> + do_reset(NULL, 0, 0, NULL); >> + return 0; >> +} >> + >> +int do_bootmmc0(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >> +{ >> + return do_resetmode_cmd("mmc0"); >> +} >> + >> +int do_bootmmc1(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >> +{ >> + return do_resetmode_cmd("mmc1"); >> +} > Why do you not pass the mode to do_resetmode_cmd() and let this function > parse the argument, without these help functions ? Then we do not need > to add new functions if we have, for example, mmc2 or mmc3. These functions are requested shortcuts. "bootmmc0" is the same as "resetmode mmc0 && reset" > > Best regards, > Stefano Babic >
On 08/09/2012 11:48 AM, Troy Kisky wrote: > On 8/9/2012 12:21 AM, Stefano Babic wrote: >> On 09/08/2012 03:26, Troy Kisky wrote: >>> >>> <snip> >>> >>> +int do_bootmmc0(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >>> +{ >>> + return do_resetmode_cmd("mmc0"); >>> +} >>> + >>> +int do_bootmmc1(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >>> +{ >>> + return do_resetmode_cmd("mmc1"); >>> +} >> >> Why do you not pass the mode to do_resetmode_cmd() and let this function >> parse the argument, without these help functions ? Then we do not need >> to add new functions if we have, for example, mmc2 or mmc3. > > These functions are requested shortcuts. > "bootmmc0" is the same as "resetmode mmc0 && reset" > Hi Troy, As one of the few that made this request: I take it back... I was mostly after a single command that also performs 'reset', and agree with Stefano that an argument for the mode is a better implementation. U-Boot> bootto usb U-Boot> bootto mmc I'm also rethinking the request for 'resetmode' because of the conflict with 'reset' (i.e. 'res' is no longer a unique command-complete). The first implementation with 'rsmode' seemed to be an odd abbreviation. Anybody else have a suggestion? U-Boot> rstmode usb && reset U-Boot> bmode usb && reset Regards, Eric
Am 09/08/2012 20:48, schrieb Troy Kisky: >> Maybe I am searching in wrong places. Where can I find the description >> for the feature you have implemented ? > > The only documentations I've found are in the freescale release of u-boot. > cpu/arm_cortexa8/mx53/generic.c > > void do_switch_mfgmode(void) > { > u32 reg; > reg = readl(SRTC_BASE_ADDR + SRTC_LPGR); > /* After set bit 28 of LPGR register of SRTC to 1, Set bit > * [25:0] to specified value according to format of SBMR, > * after trigger a watchdog reset, ROM will read Bit 28 and > * then copy bit [25:0] of LPGR to SBMR, then ROM can enter > * serial download mode.*/ > reg |= 0x12000000; > writel(reg, SRTC_BASE_ADDR + SRTC_LPGR); > /* this watchdog reset will let chip enter mfgtool download > * mode. */ > do_reset(NULL, 0, 0, NULL); > } > > U_BOOT_CMD( > download_mode, 1, 1, do_switch_mfgmode, > "download_mode - enter i.MX serial/usb download mode\n", > ""); > > > and for mx6q by disassembling iMX6DQ_SPI_to_uSDHC3.bin > and iMX6DQ_SPI_to_uSDHC4.bin Well, it is sounds odd that we have to do reverse-engineering to implement features. Can some Freescalers here point out to some docs ? This feature is surely very useful - any hints to have more information ? Best regards, Stefano Babic
Am 09/08/2012 21:29, schrieb Eric Nelson: >>> Why do you not pass the mode to do_resetmode_cmd() and let this function >>> parse the argument, without these help functions ? Then we do not need >>> to add new functions if we have, for example, mmc2 or mmc3. >> >> These functions are requested shortcuts. >> "bootmmc0" is the same as "resetmode mmc0 && reset" >> > Hi Troy, > > As one of the few that made this request: > > I take it back... > > I was mostly after a single command that also performs 'reset', > and agree with Stefano that an argument for the mode is a better > implementation. +1 > > U-Boot> bootto usb > U-Boot> bootto mmc > > I'm also rethinking the request for 'resetmode' because > of the conflict with 'reset' (i.e. 'res' is no longer a > unique command-complete). Yes, there is no reason to have a conflict with "reset" > The first implementation with > 'rsmode' seemed to be an odd abbreviation. > > Anybody else have a suggestion? > > U-Boot> rstmode usb && reset > U-Boot> bmode usb && reset In Freescale documentation this is called "boot mode" - using the same terminology can reduce confusion. I do not discuss which name is better, but if someone reads the SOC's manual and then find a command for "boot mode", it is normal that he automatically knows what is going on. "Boot" conflicts with other u-boot command, then "bmode" is my first choice. Best regards, Stefano Babic
On 8/9/2012 12:29 PM, Eric Nelson wrote: > On 08/09/2012 11:48 AM, Troy Kisky wrote: >> On 8/9/2012 12:21 AM, Stefano Babic wrote: >>> On 09/08/2012 03:26, Troy Kisky wrote: >>>> > >>> <snip> > >>> >>>> +int do_bootmmc0(cmd_tbl_t *cmdtp, int flag, int argc, char * const >>>> argv[]) >>>> +{ >>>> + return do_resetmode_cmd("mmc0"); >>>> +} >>>> + >>>> +int do_bootmmc1(cmd_tbl_t *cmdtp, int flag, int argc, char * const >>>> argv[]) >>>> +{ >>>> + return do_resetmode_cmd("mmc1"); >>>> +} > >> >>> Why do you not pass the mode to do_resetmode_cmd() and let this >>> function >>> parse the argument, without these help functions ? Then we do not need >>> to add new functions if we have, for example, mmc2 or mmc3. >> >> These functions are requested shortcuts. >> "bootmmc0" is the same as "resetmode mmc0 && reset" >> > Hi Troy, > > As one of the few that made this request: > > I take it back... > > I was mostly after a single command that also performs 'reset', > and agree with Stefano that an argument for the mode is a better > implementation. > > U-Boot> bootto usb > U-Boot> bootto mmc > > I'm also rethinking the request for 'resetmode' because > of the conflict with 'reset' (i.e. 'res' is no longer a > unique command-complete). The first implementation with > 'rsmode' seemed to be an odd abbreviation. > > Anybody else have a suggestion? > > U-Boot> rstmode usb && reset > U-Boot> bmode usb && reset > > Regards, > > > Eric > How difficult would it be for someone to implement a general "alias" command ? ie. 'alias bootto "resetmode $1 && reset"' Troy
On 8/9/2012 2:12 PM, stefano babic wrote: > Am 09/08/2012 21:29, schrieb Eric Nelson: > >>>> Why do you not pass the mode to do_resetmode_cmd() and let this function >>>> parse the argument, without these help functions ? Then we do not need >>>> to add new functions if we have, for example, mmc2 or mmc3. >>> These functions are requested shortcuts. >>> "bootmmc0" is the same as "resetmode mmc0 && reset" >>> >> Hi Troy, >> >> As one of the few that made this request: >> >> I take it back... >> >> I was mostly after a single command that also performs 'reset', >> and agree with Stefano that an argument for the mode is a better >> implementation. > +1 > >> U-Boot> bootto usb >> U-Boot> bootto mmc >> >> I'm also rethinking the request for 'resetmode' because >> of the conflict with 'reset' (i.e. 'res' is no longer a >> unique command-complete). > Yes, there is no reason to have a conflict with "reset" > >> The first implementation with >> 'rsmode' seemed to be an odd abbreviation. >> >> Anybody else have a suggestion? >> >> U-Boot> rstmode usb && reset >> U-Boot> bmode usb && reset > In Freescale documentation this is called "boot mode" - using the same > terminology can reduce confusion. I do not discuss which name is better, > but if someone reads the SOC's manual and then find a command for "boot > mode", it is normal that he automatically knows what is going on. "Boot" > conflicts with other u-boot command, then "bmode" is my first choice. > > Best regards, > Stefano Babic > > O.K., how about this syntax bmode mmc0|mmc1|usb|normal [noreset] with immediate reset being the default. Perhaps, unless normal is specified, which won't reset? Troy
On 08/09/2012 02:15 PM, Troy Kisky wrote: > On 8/9/2012 12:29 PM, Eric Nelson wrote: >> On 08/09/2012 11:48 AM, Troy Kisky wrote: >>> On 8/9/2012 12:21 AM, Stefano Babic wrote: >>>> On 09/08/2012 03:26, Troy Kisky wrote: >>>>> >> >>> <snip> >> >>> >>>>> +int do_bootmmc0(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >>>>> +{ >>>>> + return do_resetmode_cmd("mmc0"); >>>>> +} >>>>> + >>>>> +int do_bootmmc1(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) >>>>> +{ >>>>> + return do_resetmode_cmd("mmc1"); >>>>> +} >> >> >>>> Why do you not pass the mode to do_resetmode_cmd() and let this function >>>> parse the argument, without these help functions ? Then we do not need >>>> to add new functions if we have, for example, mmc2 or mmc3. >>> >>> These functions are requested shortcuts. >>> "bootmmc0" is the same as "resetmode mmc0 && reset" >>> >> Hi Troy, >> >> As one of the few that made this request: >> >> I take it back... >> >> I was mostly after a single command that also performs 'reset', >> and agree with Stefano that an argument for the mode is a better >> implementation. >> >> U-Boot> bootto usb >> U-Boot> bootto mmc >> >> I'm also rethinking the request for 'resetmode' because >> of the conflict with 'reset' (i.e. 'res' is no longer a >> unique command-complete). The first implementation with >> 'rsmode' seemed to be an odd abbreviation. >> >> Anybody else have a suggestion? >> >> U-Boot> rstmode usb && reset >> U-Boot> bmode usb && reset >> >> Regards, >> >> >> Eric >> > > How difficult would it be for someone to implement a general "alias" command ? > ie. 'alias bootto "resetmode $1 && reset"' > It's usually a customer that asks the "How hard would it be?" question, but you can almost get there like this: U-Boot> set mynewcommand "echo Hello" U-Boot> $mynewcommand Hello U-Boot> $mynewcommand World Hello World That trailing "&&" is a problem though.
On 10/08/2012 03:09, Eric Nelson wrote: >> How difficult would it be for someone to implement a general "alias" >> command ? >> ie. 'alias bootto "resetmode $1 && reset"' >> > > It's usually a customer that asks the "How hard would it be?" question, > but you can almost get there like this: > > U-Boot> set mynewcommand "echo Hello" > U-Boot> $mynewcommand > Hello > U-Boot> $mynewcommand World > Hello World This does not work: you should issue "run $mynewcommand World" And this let me slowly remember at: http://www.denx.de/wiki/U-Boot/TaskHandleVarsLikeCommands I completely forgotten this issue, and I have never update the status of my patch. Is ther estill some interest on this or have I missed something and now is the behavior in shell as in your example ? Best regards, Stefano Babic
diff --git a/arch/arm/cpu/armv7/imx-common/Makefile b/arch/arm/cpu/armv7/imx-common/Makefile index bf36be5..24f490e 100644 --- a/arch/arm/cpu/armv7/imx-common/Makefile +++ b/arch/arm/cpu/armv7/imx-common/Makefile @@ -29,6 +29,7 @@ LIB = $(obj)libimx-common.o COBJS-y = iomux-v3.o timer.o cpu.o speed.o COBJS-$(CONFIG_I2C_MXC) += i2c.o +COBJS-$(CONFIG_CMD_RESETMODE) += cmd_resetmode.o COBJS := $(sort $(COBJS-y)) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c b/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c new file mode 100644 index 0000000..d1c50e1 --- /dev/null +++ b/arch/arm/cpu/armv7/imx-common/cmd_resetmode.c @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2012 Boundary Devices Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#include <common.h> +#include <asm/errno.h> +#include <asm/io.h> +#include <asm/imx-common/resetmode.h> +#include <malloc.h> + +const struct reset_mode *modes[2]; + +const struct reset_mode *search_modes(char *arg) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(modes); i++) { + const struct reset_mode *p = modes[i]; + if (p) { + while (p->name) { + if (!strcmp(p->name, arg)) + return p; + p++; + } + } + } + return NULL; +} + +int create_usage(char *dest) +{ + int i; + int size = 0; + + for (i = 0; i < ARRAY_SIZE(modes); i++) { + const struct reset_mode *p = modes[i]; + if (p) { + while (p->name) { + int len = strlen(p->name); + if (dest) { + memcpy(dest, p->name, len); + dest += len; + *dest++ = '|'; + } + size += len + 1; + p++; + } + } + } + if (dest) + dest[-1] = 0; + return size; +} + +int do_resetmode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + const struct reset_mode *p; + + if (argc < 2) + return CMD_RET_USAGE; + p = search_modes(argv[1]); + if (!p) + return CMD_RET_USAGE; + reset_mode_apply(p->cfg_val); + return 0; +} + +U_BOOT_CMD( + resetmode, 2, 0, do_resetmode, + NULL, + ""); + +void add_board_resetmodes(const struct reset_mode *p) +{ + int size; + char *dest; + + if (__u_boot_cmd_resetmode.usage) { + free(__u_boot_cmd_resetmode.usage); + __u_boot_cmd_resetmode.usage = NULL; + } + + modes[0] = p; + modes[1] = soc_reset_modes; + size = create_usage(NULL); + dest = malloc(size); + if (dest) { + create_usage(dest); + __u_boot_cmd_resetmode.usage = dest; + } +} + +int do_resetmode_cmd(char *arg) +{ + const struct reset_mode *p; + + p = search_modes(arg); + if (!p) { + printf("%s not found\n", arg); + return CMD_RET_FAILURE; + } + reset_mode_apply(p->cfg_val); + do_reset(NULL, 0, 0, NULL); + return 0; +} + +int do_bootmmc0(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + return do_resetmode_cmd("mmc0"); +} + +int do_bootmmc1(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + return do_resetmode_cmd("mmc1"); +} + +int do_download_mode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + return do_resetmode_cmd("usb"); +} + +U_BOOT_CMD( + bootmmc0, 1, 0, do_bootmmc0, + "boot to mmc 0", + ""); + +U_BOOT_CMD( + bootmmc1, 1, 0, do_bootmmc1, + "boot to mmc 1", + ""); + +U_BOOT_CMD( + download_mode, 1, 0, do_download_mode, + "start rom loader", + ""); diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c index 3f5a4f7..9cd363b 100644 --- a/arch/arm/cpu/armv7/mx5/soc.c +++ b/arch/arm/cpu/armv7/mx5/soc.c @@ -30,6 +30,7 @@ #include <asm/errno.h> #include <asm/io.h> +#include <asm/imx-common/resetmode.h> #if !(defined(CONFIG_MX51) || defined(CONFIG_MX53)) #error "CPU_TYPE not defined" @@ -115,3 +116,33 @@ void set_chipselect_size(int const cs_size) writel(reg, &iomuxc_regs->gpr1); } + +#ifdef CONFIG_MX53 +void reset_mode_apply(unsigned cfg_val) +{ + writel(cfg_val, &((struct srtc_regs *)SRTC_BASE_ADDR)->lpgr); +} +/* + * cfg_val will be used for + * Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0] + * + * If bit 28 of LPGR is set upon watchdog reset, + * bits[25:0] of LPGR will move to SBMR. + */ +const struct reset_mode soc_reset_modes[] = { + {"normal", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)}, + /* usb or serial download */ + {"usb", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x13)}, + {"sata", MAKE_CFGVAL(0x28, 0x00, 0x00, 0x12)}, + {"escpi1:0", MAKE_CFGVAL(0x38, 0x20, 0x00, 0x12)}, + {"escpi1:1", MAKE_CFGVAL(0x38, 0x20, 0x04, 0x12)}, + {"escpi1:2", MAKE_CFGVAL(0x38, 0x20, 0x08, 0x12)}, + {"escpi1:3", MAKE_CFGVAL(0x38, 0x20, 0x0c, 0x12)}, + /* 4 bit bus width */ + {"esdhc1", MAKE_CFGVAL(0x40, 0x20, 0x00, 0x12)}, + {"esdhc2", MAKE_CFGVAL(0x40, 0x20, 0x08, 0x12)}, + {"esdhc3", MAKE_CFGVAL(0x40, 0x20, 0x10, 0x12)}, + {"esdhc4", MAKE_CFGVAL(0x40, 0x20, 0x18, 0x12)}, + {NULL, 0}, +}; +#endif diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 84b458c..7a7fb35 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -29,6 +29,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> +#include <asm/imx-common/resetmode.h> u32 get_cpu_rev(void) { @@ -141,3 +142,38 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) } #endif + +void reset_mode_apply(unsigned cfg_val) +{ + unsigned reg; + struct src_regs *psrc = (struct src_regs *)SRC_BASE_ADDR; + writel(cfg_val, &psrc->gpr9); + reg = readl(&psrc->gpr10); + if (cfg_val) + reg |= 1 << 28; + else + reg &= ~(1 << 28); + writel(reg, &psrc->gpr10); +} +/* + * cfg_val will be used for + * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0] + * After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0] + * to SBMR1, which will determine the boot device. + */ +const struct reset_mode soc_reset_modes[] = { + {"normal", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)}, + /* reserved value should start rom usb */ + {"usb", MAKE_CFGVAL(0x01, 0x00, 0x00, 0x00)}, + {"sata", MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)}, + {"escpi1:0", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x08)}, + {"escpi1:1", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x18)}, + {"escpi1:2", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x28)}, + {"escpi1:3", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x38)}, + /* 4 bit bus width */ + {"esdhc1", MAKE_CFGVAL(0x40, 0x20, 0x00, 0x00)}, + {"esdhc2", MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)}, + {"esdhc3", MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)}, + {"esdhc4", MAKE_CFGVAL(0x40, 0x38, 0x00, 0x00)}, + {NULL, 0}, +}; diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 7f66b61..c53465f 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -459,6 +459,24 @@ struct src { u32 simr; }; +struct srtc_regs { + u32 lpscmr; /* 0x00 */ + u32 lpsclr; /* 0x04 */ + u32 lpsar; /* 0x08 */ + u32 lpsmcr; /* 0x0c */ + u32 lpcr; /* 0x10 */ + u32 lpsr; /* 0x14 */ + u32 lppdr; /* 0x18 */ + u32 lpgr; /* 0x1c */ + u32 hpcmr; /* 0x20 */ + u32 hpclr; /* 0x24 */ + u32 hpamr; /* 0x28 */ + u32 hpalr; /* 0x2c */ + u32 hpcr; /* 0x30 */ + u32 hpisr; /* 0x34 */ + u32 hpienr; /* 0x38 */ +}; + /* CSPI registers */ struct cspi_regs { u32 rxdata; diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 5d77603..dacb9ea 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -448,5 +448,26 @@ struct iomuxc_base_regs { u32 daisy[104]; /* 0x7b0..94c */ }; +struct src_regs { + u32 scr; /* 0x00 */ + u32 sbmr1; /* 0x04 */ + u32 srsr; /* 0x08 */ + u32 reserved1; /* 0x0c */ + u32 reserved2; /* 0x10 */ + u32 sisr; /* 0x14 */ + u32 simr; /* 0x18 */ + u32 sbmr2; /* 0x1c */ + u32 gpr1; /* 0x20 */ + u32 gpr2; /* 0x24 */ + u32 gpr3; /* 0x28 */ + u32 gpr4; /* 0x2c */ + u32 gpr5; /* 0x30 */ + u32 gpr6; /* 0x34 */ + u32 gpr7; /* 0x38 */ + u32 gpr8; /* 0x3c */ + u32 gpr9; /* 0x40 */ + u32 gpr10; /* 0x44 */ +}; + #endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */ diff --git a/arch/arm/include/asm/imx-common/resetmode.h b/arch/arm/include/asm/imx-common/resetmode.h new file mode 100644 index 0000000..76216d0 --- /dev/null +++ b/arch/arm/include/asm/imx-common/resetmode.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2012 Boundary Devices Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _ASM_RESETMODE_H +#define _ASM_RESETMODE_H +#define MAKE_CFGVAL(cfg1, cfg2, cfg3, cfg4) \ + ((cfg4) << 24) | ((cfg3) << 16) | ((cfg2) << 8) | (cfg1) + +struct reset_mode { + const char *name; + unsigned cfg_val; +}; + +void add_board_resetmodes(const struct reset_mode *p); +void reset_mode_apply(unsigned cfg_val); +extern const struct reset_mode soc_reset_modes[]; +#endif
This is useful for forcing the ROM's usb downloader to activate upon a watchdog reset. Or, you can boot from either SD Card. Currently, support added for MX53 and MX6Q Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Note: MX53 support untested. --- arch/arm/cpu/armv7/imx-common/Makefile | 1 + arch/arm/cpu/armv7/imx-common/cmd_resetmode.c | 152 +++++++++++++++++++++++++ arch/arm/cpu/armv7/mx5/soc.c | 31 +++++ arch/arm/cpu/armv7/mx6/soc.c | 36 ++++++ arch/arm/include/asm/arch-mx5/imx-regs.h | 18 +++ arch/arm/include/asm/arch-mx6/imx-regs.h | 21 ++++ arch/arm/include/asm/imx-common/resetmode.h | 36 ++++++ 7 files changed, 295 insertions(+) create mode 100644 arch/arm/cpu/armv7/imx-common/cmd_resetmode.c create mode 100644 arch/arm/include/asm/imx-common/resetmode.h V3 is same as V2, only a rebase.