summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
commit5ed435f33dc6a31cd93b6f38a14dd775977cf1cc (patch)
treea5679efee0260214cece15ba83938e4c6f007f11 /commands
parent05f49fa0edb6166f80b8a37a172d6b83db2d92d1 (diff)
parentba927c778091295310fdb105e10c257a0cfc61a3 (diff)
downloadbarebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/fbtest.c5
-rw-r--r--commands/mmc_extcsd.c8
-rw-r--r--commands/splash.c5
3 files changed, 10 insertions, 8 deletions
diff --git a/commands/fbtest.c b/commands/fbtest.c
index e5dd8ba..ff24a82 100644
--- a/commands/fbtest.c
+++ b/commands/fbtest.c
@@ -271,8 +271,9 @@ static int do_fbtest(int argc, char *argv[])
sc = fb_open(fbdev);
if (IS_ERR(sc)) {
- perror("fd_open");
- return PTR_ERR(sc);
+ int ret = -PTR_ERR(sc);
+ printf("fb_open: %s\n", strerror(ret));
+ return ret;
}
if (!pattern_name) {
diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c
index 889a6c6..c27bb72 100644
--- a/commands/mmc_extcsd.c
+++ b/commands/mmc_extcsd.c
@@ -861,10 +861,10 @@ static int print_field(u8 *reg, int index)
str);
val = get_field_val(EXT_CSD_BOOT_BUS_CONDITIONS, 2, 0x1);
if (val)
- str = "Reset bus width to x1, SDR and backward compatible timings after boot operation";
- else
str = "Retain BOOT_BUS_WIDTH and BOOT_MODE values after boot operation";
- printf("\t[2] RESET_BOOT_BUS_CONDITIONS: %s", str);
+ else
+ str = "Reset bus width to x1, SDR and backward compatible timings after boot operation";
+ printf("\t[2] RESET_BOOT_BUS_CONDITIONS: %s\n", str);
val = get_field_val(EXT_CSD_BOOT_BUS_CONDITIONS, 3, 0x3);
switch (val) {
case 0x0:
@@ -877,7 +877,7 @@ static int print_field(u8 *reg, int index)
str = "Use DDR in boot operation";
break;
}
- printf("\t[3] BOOT_MODE: %s\n", str);
+ printf("\t[4-3] BOOT_MODE: %s\n", str);
return 1;
case EXT_CSD_BOOT_CONFIG_PROT:
diff --git a/commands/splash.c b/commands/splash.c
index 2b70b29..abd8287 100644
--- a/commands/splash.c
+++ b/commands/splash.c
@@ -54,8 +54,9 @@ static int do_splash(int argc, char *argv[])
sc = fb_open(fbdev);
if (IS_ERR(sc)) {
- perror("fd_open");
- return PTR_ERR(sc);
+ int ret = -PTR_ERR(sc);
+ printf("fb_open: %s\n", strerror(ret));
+ return ret;
}
buf = gui_screen_render_buffer(sc);