Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d3e488eaf48c49980adb8509a76f8577b1cf2599

Authored by Guillaume GARDET
Committed by Tom Rini
1 parent 878cd63e02
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

spl: Fix SPL EXT support 

Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support.
This patch update error code check to get SPL EXT support working again.

Tested on a Pandaboard (rev. A3).

Reviewed-by: Suriyan Ramasami <suriyan.r@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

common/spl/spl_ext.c
Diff comments   View file @ d3e488e
... ... @@ -43,7 +43,7 @@
43 43 goto end;
44 44 }
45 45 err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen);
46   - if (err <= 0) {
  46 + if (err < 0) {
47 47 puts("spl: ext4fs_read failed\n");
48 48 goto end;
49 49 }
50 50  
... ... @@ -54,12 +54,12 @@
54 54  
55 55 end:
56 56 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
57   - if (err <= 0)
  57 + if (err < 0)
58 58 printf("%s: error reading image %s, err - %d\n",
59 59 __func__, filename, err);
60 60 #endif
61 61  
62   - return err <= 0;
  62 + return err < 0;
63 63 }
64 64  
65 65 #ifdef CONFIG_SPL_OS_BOOT
... ... @@ -95,7 +95,7 @@
95 95 goto defaults;
96 96 }
97 97 err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen);
98   - if (err <= 0) {
  98 + if (err < 0) {
99 99 printf("spl: error reading image %s, err - %d, falling back to default\n",
100 100 file, err);
101 101 goto defaults;
... ... @@ -124,7 +124,7 @@
124 124 puts("spl: ext4fs_open failed\n");
125 125  
126 126 err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen);
127   - if (err <= 0) {
  127 + if (err < 0) {
128 128 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
129 129 printf("%s: error reading image %s, err - %d\n",
130 130 __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);