| Message ID | 1484312646-736-1-git-send-email-mike.looijmans@topic.nl |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
Hi, On 13.1.2017 14:04, Mike Looijmans wrote: > The Zynq can also boot from QSPI or NAND, and environment scripting > uses "qspiboot" and "nandboot" already. Add these to the board init > routines so that modeboot is properly set to one of these values when > the mode bits indicate so. > > Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> > --- > board/xilinx/zynq/board.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c > index 5cd9bbf..cf80302 100644 > --- a/board/xilinx/zynq/board.c > +++ b/board/xilinx/zynq/board.c > @@ -85,9 +85,15 @@ int board_init(void) > int board_late_init(void) > { > switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { > + case ZYNQ_BM_QSPI: > + setenv("modeboot", "qspiboot"); > + break; > case ZYNQ_BM_NOR: > setenv("modeboot", "norboot"); > break; > + case ZYNQ_BM_NAND: > + setenv("modeboot", "nandboot"); > + break; > case ZYNQ_BM_SD: > setenv("modeboot", "sdboot"); > break; > The same patch was merged some days ago. Please check latest master branch. Thanks, Michal
Ah, missed that. I noticed that "run $modeboot" didn't work for QSPI in the 2017.1 tag, hadn't seen that one yet. On 13-01-17 14:18, Michal Simek wrote: > Hi, > > On 13.1.2017 14:04, Mike Looijmans wrote: >> The Zynq can also boot from QSPI or NAND, and environment scripting >> uses "qspiboot" and "nandboot" already. Add these to the board init >> routines so that modeboot is properly set to one of these values when >> the mode bits indicate so. >> >> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> >> --- >> board/xilinx/zynq/board.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c >> index 5cd9bbf..cf80302 100644 >> --- a/board/xilinx/zynq/board.c >> +++ b/board/xilinx/zynq/board.c >> @@ -85,9 +85,15 @@ int board_init(void) >> int board_late_init(void) >> { >> switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { >> + case ZYNQ_BM_QSPI: >> + setenv("modeboot", "qspiboot"); >> + break; >> case ZYNQ_BM_NOR: >> setenv("modeboot", "norboot"); >> break; >> + case ZYNQ_BM_NAND: >> + setenv("modeboot", "nandboot"); >> + break; >> case ZYNQ_BM_SD: >> setenv("modeboot", "sdboot"); >> break; >> > > The same patch was merged some days ago. Please check latest master branch. > > Thanks, > Michal > Kind regards, Mike Looijmans System Expert TOPIC Products Materiaalweg 4, NL-5681 RJ Best Postbus 440, NL-5680 AK Best Telefoon: +31 (0) 499 33 69 79 E-mail: mike.looijmans@topicproducts.com Website: www.topicproducts.com Please consider the environment before printing this e-mail
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 5cd9bbf..cf80302 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -85,9 +85,15 @@ int board_init(void) int board_late_init(void) { switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { + case ZYNQ_BM_QSPI: + setenv("modeboot", "qspiboot"); + break; case ZYNQ_BM_NOR: setenv("modeboot", "norboot"); break; + case ZYNQ_BM_NAND: + setenv("modeboot", "nandboot"); + break; case ZYNQ_BM_SD: setenv("modeboot", "sdboot"); break;
The Zynq can also boot from QSPI or NAND, and environment scripting uses "qspiboot" and "nandboot" already. Add these to the board init routines so that modeboot is properly set to one of these values when the mode bits indicate so. Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> --- board/xilinx/zynq/board.c | 6 ++++++ 1 file changed, 6 insertions(+)