| Message ID | 20201130191034.795-1-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | 25c5b6517854ffc80d4cc3a86d0e69942abb8e2c |
| Delegated to: | Lokesh Vutla |
| Headers | show |
| Series | Nokia RX-51: Do not try calling both ext2load and ext4load | expand |
On Mon 2020-11-30 20:10:34, Pali Rohár wrote: > Those two commands now doing same thing, reading from ext2/3/4 filesystem. > So remove useless duplicated call. > > Signed-off-by: Pali Rohár <pali@kernel.org> Acked-by: Pavel Machek <pavel@ucw.cz>
On 01/12/20 12:40 am, Pali Rohár wrote: > Those two commands now doing same thing, reading from ext2/3/4 filesystem. > So remove useless duplicated call. > > Signed-off-by: Pali Rohár <pali@kernel.org> Applied to u-boot-ti/for-next branch Thanks and regards, Lokesh > --- > include/configs/nokia_rx51.h | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h > index 6879f52a0c..3f2700d8e2 100644 > --- a/include/configs/nokia_rx51.h > +++ b/include/configs/nokia_rx51.h > @@ -169,8 +169,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); > "trymmcboot=if run switchmmc; then " \ > "setenv mmctype fat;" \ > "run trymmcallpartboot;" \ > - "setenv mmctype ext2;" \ > - "run trymmcallpartboot;" \ > "setenv mmctype ext4;" \ > "run trymmcallpartboot;" \ > "fi\0" \ > @@ -179,19 +177,10 @@ int rx51_kp_getc(struct stdio_dev *sdev); > "preboot=setenv mmcnum 1; setenv mmcpart 1;" \ > "setenv mmcscriptfile bootmenu.scr;" \ > "if run switchmmc; then " \ > - "setenv mmcdone true;" \ > "setenv mmctype fat;" \ > - "if run scriptload; then true; else " \ > - "setenv mmctype ext2;" \ > - "if run scriptload; then true; else " \ > - "setenv mmctype ext4;" \ > - "if run scriptload; then true; else " \ > - "setenv mmcdone false;" \ > - "fi;" \ > - "fi;" \ > - "fi;" \ > - "if ${mmcdone}; then " \ > - "run scriptboot;" \ > + "if run scriptload; then run scriptboot; else " \ > + "setenv mmctype ext4;" \ > + "if run scriptload; then run scriptboot; fi;" \ > "fi;" \ > "fi;" \ > "if run slide; then true; else " \ >
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 6879f52a0c..3f2700d8e2 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -169,8 +169,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "trymmcboot=if run switchmmc; then " \ "setenv mmctype fat;" \ "run trymmcallpartboot;" \ - "setenv mmctype ext2;" \ - "run trymmcallpartboot;" \ "setenv mmctype ext4;" \ "run trymmcallpartboot;" \ "fi\0" \ @@ -179,19 +177,10 @@ int rx51_kp_getc(struct stdio_dev *sdev); "preboot=setenv mmcnum 1; setenv mmcpart 1;" \ "setenv mmcscriptfile bootmenu.scr;" \ "if run switchmmc; then " \ - "setenv mmcdone true;" \ "setenv mmctype fat;" \ - "if run scriptload; then true; else " \ - "setenv mmctype ext2;" \ - "if run scriptload; then true; else " \ - "setenv mmctype ext4;" \ - "if run scriptload; then true; else " \ - "setenv mmcdone false;" \ - "fi;" \ - "fi;" \ - "fi;" \ - "if ${mmcdone}; then " \ - "run scriptboot;" \ + "if run scriptload; then run scriptboot; else " \ + "setenv mmctype ext4;" \ + "if run scriptload; then run scriptboot; fi;" \ "fi;" \ "fi;" \ "if run slide; then true; else " \
Those two commands now doing same thing, reading from ext2/3/4 filesystem. So remove useless duplicated call. Signed-off-by: Pali Rohár <pali@kernel.org> --- include/configs/nokia_rx51.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)