* [PATCH 07/10] ARM: socfpga: fix compiler warning
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
Fixes:
arch/arm/mach-socfpga/xload.c:121:13: warning: assignment discards 'const' qualifier from pointer target type
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-socfpga/xload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c
index 0e584c3..d24944b 100644
--- a/arch/arm/mach-socfpga/xload.c
+++ b/arch/arm/mach-socfpga/xload.c
@@ -111,7 +111,7 @@ static void socfpga_timer_init(void)
static __noreturn int socfpga_xload(void)
{
enum bootsource bootsource = bootsource_get();
- struct socfpga_barebox_part *part;
+ const struct socfpga_barebox_part *part;
void *buf = NULL;
switch (bootsource) {
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 04/10] globalvar: Fix compiler warning
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
Fixes:
common/globalvar.c:393:7: warning: 'pname' may be used uninitialized in this function [-Wmaybe-uninitialized]
This is a false positive, pname cannot be uninitialized. Silence this
warning.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/globalvar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/globalvar.c b/common/globalvar.c
index 85d0795..52808f8 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -382,7 +382,7 @@ void globalvar_set_match(const char *match, const char *val)
static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct device_d *rdev;
- const char *pname;
+ const char *pname = NULL;
int ret;
ret = nvvar_device_dispatch(p->name, &rdev, &pname);
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 01/10] ARM: socfpga: fix compiler warning
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
Fixes:
arm/mach-socfpga/xload.c:31:52: warning: initialization from incompatible pointer type
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-socfpga/xload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c
index 9936269..0e584c3 100644
--- a/arch/arm/mach-socfpga/xload.c
+++ b/arch/arm/mach-socfpga/xload.c
@@ -28,7 +28,7 @@ static struct socfpga_barebox_part default_parts[] = {
},
{ /* sentinel */ }
};
-const struct socfpga_barebox_part *barebox_parts = &default_parts;
+const struct socfpga_barebox_part *barebox_parts = default_parts;
enum socfpga_clks {
timer, mmc, qspi_clk, uart, clk_max
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 06/10] mtd: peb: Fix format specifier
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
The correct format specifier for size_t is %zu. Use it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mtd/peb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/peb.c b/drivers/mtd/peb.c
index 73f90bb..66227d4 100644
--- a/drivers/mtd/peb.c
+++ b/drivers/mtd/peb.c
@@ -397,7 +397,7 @@ int mtd_peb_write(struct mtd_info *mtd, const void *buf, int pnum, int offset,
addr = (loff_t)pnum * mtd->erasesize + offset;
err = mtd_write(mtd, addr, len, &written, buf);
if (err) {
- dev_err(&mtd->class_dev, "error %d while writing %d bytes to PEB %d:%d, written %zd bytes\n",
+ dev_err(&mtd->class_dev, "error %d while writing %d bytes to PEB %d:%d, written %zu bytes\n",
err, len, pnum, offset, written);
} else {
if (written != len)
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 05/10] mtd: peb: fix usage of uninitialized variable
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
'read' is used in an error message but never assigned a value to. Remove
the variable.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mtd/peb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/peb.c b/drivers/mtd/peb.c
index 639dc0e..73f90bb 100644
--- a/drivers/mtd/peb.c
+++ b/drivers/mtd/peb.c
@@ -252,7 +252,6 @@ retry:
int mtd_peb_check_all_ff(struct mtd_info *mtd, int pnum, int offset, int len,
int warn)
{
- size_t read;
int err;
void *buf;
@@ -263,8 +262,8 @@ int mtd_peb_check_all_ff(struct mtd_info *mtd, int pnum, int offset, int len,
err = mtd_peb_read(mtd, buf, pnum, offset, len);
if (err && !mtd_is_bitflip(err)) {
dev_err(&mtd->class_dev,
- "error %d while reading %d bytes from PEB %d:%d, read %zd bytes\n",
- err, len, pnum, offset, read);
+ "error %d while reading %d bytes from PEB %d:%d\n",
+ err, len, pnum, offset);
goto out;
}
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 09/10] menu: sanitize menu_add_title
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
passing a string to menu_add_title() which then gets free by this
function is just plain ugly. Pass it a const char * which gets
duplicated in menu_add_title() when necessary.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/menu.c | 2 +-
common/boot.c | 2 +-
| 12 +++++-------
| 2 +-
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/commands/menu.c b/commands/menu.c
index 72db26e..ddc9c3a 100644
--- a/commands/menu.c
+++ b/commands/menu.c
@@ -147,7 +147,7 @@ static int do_menu_add(struct cmd_menu *cm)
if (!m->name)
goto free;
- menu_add_title(m, strdup(cm->description));
+ menu_add_title(m, cm->description);
ret = menu_add(m);
diff --git a/common/boot.c b/common/boot.c
index 123b874..4306319 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -44,7 +44,7 @@ struct bootentries *bootentries_alloc(void)
if (IS_ENABLED(CONFIG_MENU)) {
bootentries->menu = menu_alloc();
- menu_add_title(bootentries->menu, basprintf("boot"));
+ menu_add_title(bootentries->menu, "boot");
}
return bootentries;
--git a/common/menu.c b/common/menu.c
index 64df458..e757216 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -526,18 +526,17 @@ EXPORT_SYMBOL(menu_add_command_entry);
* @display: NULL or pointer to the string which will be freed in this function.
* If NULL or zero length string is provided, default title will be added.
*/
-void menu_add_title(struct menu *m, char *display)
+void menu_add_title(struct menu *m, const char *display)
{
char *tmp, *src, *dst;
int lines = 1;
int i;
- if (!display || !strlen(display)) {
- free(display);
- display = xasprintf("Menu : %s", m->name ? m->name : "");
- }
+ if (!display || !strlen(display))
+ src = dst = tmp = xasprintf("Menu : %s", m->name ? m->name : "");
+ else
+ src = dst = tmp = xstrdup(display);
- src = dst = tmp = xstrdup(display);
/* Count lines and separate single string into multiple strings */
while (*src) {
if (*src == '\\') {
@@ -575,6 +574,5 @@ void menu_add_title(struct menu *m, char *display)
}
free(tmp);
- free(display);
}
EXPORT_SYMBOL(menu_add_title);
--git a/include/menu.h b/include/menu.h
index 3e704a8..2fef064 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -91,7 +91,7 @@ int menu_set_selected_entry(struct menu *m, struct menu_entry* me);
int menu_set_selected(struct menu *m, int num);
int menu_set_auto_select(struct menu *m, int delay);
struct menu* menu_get_menus(void);
-void menu_add_title(struct menu *m, char *display);
+void menu_add_title(struct menu *m, const char *display);
/*
* menu entry functions
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 02/10] nios2: Fix out of tree build
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
nios2 links the board specific nios_sopc.h to include/. The relative
pathes used do not work with an out of tree build. Use absolute pathes
instead.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/nios2/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index 681944f..3e97155 100644
--- a/arch/nios2/Makefile
+++ b/arch/nios2/Makefile
@@ -7,7 +7,7 @@ KALLSYMS += --symbol-prefix=_
archprepare: maketools
@$(kecho) " SYMLINK include/nios_sopc.h -> arch/nios2/boards/$(board-y)/nios_sopc.h"
- @ln -fsn ../arch/nios2/boards/$(board-y)/nios_sopc.h include/nios_sopc.h
+ @ln -fsn $(src)/arch/nios2/boards/$(board-y)/nios_sopc.h $(obj)/include/nios_sopc.h
PHONY += maketools
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 08/10] of: Use %pa to print resource_size_t type
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/of/platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 3f848a4..c9157cd 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -271,7 +271,7 @@ static struct device_d *of_amba_device_create(struct device_node *np)
/* Allow the HW Peripheral ID to be overridden */
of_property_read_u32(np, "arm,primecell-periphid", &dev->periphid);
- debug("register device 0x%08x\n", dev->dev.resource[0].start);
+ debug("register device %pa\n", &dev->dev.resource[0].start);
ret = amba_device_add(dev);
if (ret)
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 10/10] arm: at91 bootstrap: Fix menu title
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
It's no longer possible to assign a string to menu->display, instead
menu_add_title() must be called. Fix this.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-at91/bootstrap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/bootstrap.c b/arch/arm/mach-at91/bootstrap.c
index 8502bb0..9dd575b 100644
--- a/arch/arm/mach-at91/bootstrap.c
+++ b/arch/arm/mach-at91/bootstrap.c
@@ -155,7 +155,8 @@ void at91_bootstrap_menu(void)
struct menu_entry *me;
m = menu_alloc();
- m->display = m->name = "boot";
+ m->name = "boot";
+ menu_add_title(m, m->name);
menu_add(m);
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 03/10] nios2: Fix compiler warning
From: Sascha Hauer @ 2016-11-23 9:39 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123093937.15711-1-s.hauer@pengutronix.de>
An initcall function needs to return a value, so return one.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/nios2/cpu/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index b2164af..77fde6b 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -33,7 +33,7 @@ static void __noreturn nios2_restart_soc(struct restart_handler *rst)
static int restart_register_feature(void)
{
- restart_handler_register_fn(nios2_restart_soc);
+ return restart_handler_register_fn(nios2_restart_soc);
}
coredevice_initcall(restart_register_feature);
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH] environment: fix typo
From: Ulrich Ölmann @ 2016-11-23 7:58 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
common/environment.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/environment.c b/common/environment.c
index c9cef6322a06..0edf34b661d9 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -382,7 +382,7 @@ EXPORT_SYMBOL(envfs_save);
static int envfs_check_super(struct envfs_super *super, size_t *size)
{
if (ENVFS_32(super->magic) != ENVFS_MAGIC) {
- printf("envfs: no envfs (magic mismatch) - envfs newer written?\n");
+ printf("envfs: no envfs (magic mismatch) - envfs never written?\n");
return -EIO;
}
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 1/3] input: Fix compiler warning
From: Sascha Hauer @ 2016-11-23 7:50 UTC (permalink / raw)
To: Barebox List
Fixes:
drivers/input/input.c:46:17: warning: passing argument 2 of '__set_bit' from incompatible pointer type [-Wincompatible-pointer-types]
idev->keys is an array, so we don't need to take the address of it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/input/input.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 31a9c22..14e44d1 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -43,9 +43,9 @@ void input_report_key_event(struct input_device *idev, unsigned int code, int va
return;
if (value)
- set_bit(code, &idev->keys);
+ set_bit(code, idev->keys);
else
- clear_bit(code, &idev->keys);
+ clear_bit(code, idev->keys);
event.code = code;
event.value = value;
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 2/3] globalvar: Make locally used function static
From: Sascha Hauer @ 2016-11-23 7:50 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123075034.21606-1-s.hauer@pengutronix.de>
Fixes:
common/globalvar.c:382:5: warning: no previous prototype for 'globalvar_simple_set' [-Wmissing-prototypes]
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/globalvar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/globalvar.c b/common/globalvar.c
index e75cac9..85d0795 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -379,7 +379,7 @@ void globalvar_set_match(const char *match, const char *val)
}
}
-int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val)
+static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val)
{
struct device_d *rdev;
const char *pname;
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 3/3] lib/int_sqrt.c: Fix compiler warning
From: Sascha Hauer @ 2016-11-23 7:50 UTC (permalink / raw)
To: Barebox List
In-Reply-To: <20161123075034.21606-1-s.hauer@pengutronix.de>
include int_sqrt.h to have the prototype for the function defined in
this file.
Fixes:
lib/int_sqrt.c:25:15: warning: no previous prototype for 'int_sqrt' [-Wmissing-prototypes]
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
lib/int_sqrt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/int_sqrt.c b/lib/int_sqrt.c
index 30ccafb..bf8b18f 100644
--- a/lib/int_sqrt.c
+++ b/lib/int_sqrt.c
@@ -15,6 +15,7 @@
*/
#include <common.h>
+#include <int_sqrt.h>
/**
* int_sqrt - rough approximation to sqrt
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH] Documentation: bootchooser: fix typos
From: Ulrich Ölmann @ 2016-11-23 7:38 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
Documentation/user/bootchooser.rst | 57 +++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/Documentation/user/bootchooser.rst b/Documentation/user/bootchooser.rst
index 5baa66d9b9f9..cef1d4abb090 100644
--- a/Documentation/user/bootchooser.rst
+++ b/Documentation/user/bootchooser.rst
@@ -67,7 +67,7 @@ Additionally the remaining_attempts counter can be reset manually using the
:ref:`command_bootchooser` command. This allows for custom conditions under which
a system is marked as good.
In case only the booted system itself knows when it is in a good state, the
-barebox-state tool from the dt-utils_ package can used to reset the remaining_attempts
+barebox-state tool from the dt-utils_ package can be used to reset the remaining_attempts
counter from the currently running system.
.. _dt-utils: http://git.pengutronix.de/?p=tools/dt-utils.git;a=summary
@@ -79,8 +79,8 @@ Additionally to the target options described above, bootchooser has some general
options not specific to any target.
``global.bootchooser.disable_on_zero_attempts``
- Boolean flag. if 1, bootchooser disables a target (sets priority to 0) whenever the
- remaining attempts counter reaches 0.
+ Boolean flag. If set to 1, bootchooser disables a target (sets priority to 0) whenever
+ the remaining attempts counter reaches 0.
``global.bootchooser.default_attempts``
The default number of attempts that a target shall be tried starting, used when not
overwritten with the target specific variable of the same name.
@@ -89,25 +89,28 @@ options not specific to any target.
of the same name.
``global.bootchooser.reset_attempts``
A space separated list of events that cause bootchooser to reset the
- remaining_attempts counters of each target that has a non zero priority. possible values:
- * empty: counters will never be reset``
+ remaining_attempts counters of each target that has a non zero priority. Possible values:
+
+ * empty: counters will never be reset``
* power-on: counters will be reset after power-on-reset
* all-zero: counters will be reset when all targets have zero remaining attempts
``global.bootchooser.reset_priorities``
A space separated list of events that cause bootchooser to reset the priorities of
all targets. Possible values:
+
* empty: priorities will never be reset
* all-zero: priorities will be reset when all targets have zero priority
``global.bootchooser.retry``
- If 1, bootchooser retries booting until one succeeds or no more valid targets exist.
+ If set to 1, bootchooser retries booting until one succeeds or no more valid targets
+ exist.
``global.bootchooser.state_prefix``
- Variable prefix when bootchooser used with state framework as backend for storing runtime
- data, see below.
+ Variable prefix when bootchooser is used with the state framework as backend for storing
+ runtime data, see below.
``global.bootchooser.targets``
Space separated list of targets that are used. For each entry in the list a corresponding
- set of ``global.bootchooser.<name>``. variables must exist.
+ set of ``global.bootchooser.<targetname>.<variablename>`` variables must exist.
``global.bootchooser.last_chosen``
- bootchooser sets this to the target that was chosen on last boot (index)
+ bootchooser sets this to the target that was chosen on last boot (index).
Using the State Framework as Backend for Runtime Variable Data
--------------------------------------------------------------
@@ -178,7 +181,7 @@ Settings
- ``global.bootchooser.disable_on_zero_attempts=0``
- ``global.bootchooser.retry=1``
- ``global.boot.default="bootchooser recovery"``
-- Userspace marks as good
+- Userspace marks as good.
Deployment
^^^^^^^^^^
@@ -208,21 +211,22 @@ Settings
- ``global.bootchooser.disable_on_zero_attempts=0``
- ``global.bootchooser.retry=1``
- ``global.boot.default="bootchooser recovery"``
-- Userspace marks as good
+- Userspace marks as good.
Deployment
^^^^^^^^^^
-#. barebox or flash robot fills all slots with valid systems
+#. barebox or flash robot fills all slots with valid systems.
#. barebox or flash robot marks slots as good or state contains non zero
- defaults for the remaining_attempts / priorities
+ defaults for the remaining_attempts/priorities.
Recovery
^^^^^^^^
done by 'recovery' boot target which is booted after the bootchooser falls through due to
the lack of bootable targets. This target can be:
-- A system that will be booted as recovery
-- A barebox script that will be started
+
+- A system that will be booted as recovery.
+- A barebox script that will be started.
Scenario 3
##########
@@ -238,21 +242,22 @@ Settings
- ``global.bootchooser.disable_on_zero_attempts=1``
- ``global.bootchooser.retry=1``
- ``global.boot.default="bootchooser recovery"``
-- Userspace marks as good
+- Userspace marks as good.
Deployment
^^^^^^^^^^
-- barebox or flash robot fills all slots with valid systems
-- barebox or flash robot marks slots as good
+#. barebox or flash robot fills all slots with valid systems.
+#. barebox or flash robot marks slots as good.
Recovery
^^^^^^^^
Done by 'recovery' boot target which is booted after the bootchooser falls through
due to the lack of bootable targets. This target can be:
-- A system that will be booted as recovery
-- A barebox script that will be started
+
+- A system that will be booted as recovery.
+- A barebox script that will be started.
Updating systems
----------------
@@ -262,11 +267,11 @@ update is done under a running Linux system which can be one of the regular boot
slots or a dedicated recovery system. For the regular slots updating is done like:
- Set the priority of the inactive slot to 0.
-- Update the inactive slot
-- Set priority of the inactive slot to a higher value than the active slot
-- Set remaining_attempts of the inactive slot to nonzero
-- Reboot
-- If necessary update the now inactive, not yet updated slot the same way
+- Update the inactive slot.
+- Set priority of the inactive slot to a higher value than the active slot.
+- Set remaining_attempts of the inactive slot to nonzero.
+- Reboot.
+- If necessary update the now inactive, not yet updated slot the same way.
One way of updating systems is using RAUC_ which integrates well with the bootchooser
in barebox.
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH] ubi: Only read necessary size when reading the VID header
From: Ulrich Ölmann @ 2016-11-22 15:21 UTC (permalink / raw)
To: Barebox List
Based on kernel commit 8a8e8d2fdbab ("ubi: Only read necessary size when reading
the VID header") by Sascha Hauer <s.hauer@pengutronix.de>:
When reading the vid hdr from the device UBI always reads a whole
page. Instead, read only the data we actually need and speed up
attachment of UBI devices by potentially making use of reading
subpages if the NAND driver supports it.
Since the VID header may be at offset vid_hdr_shift in the page and
we can only read from the beginning of a page we have to add that
offset to the read size.
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
drivers/mtd/ubi/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 43af4a52dff9..6d08f92ea647 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -711,7 +711,7 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
p = (char *)vid_hdr - ubi->vid_hdr_shift;
read_err = ubi_io_read(ubi, p, pnum, ubi->vid_hdr_aloffset,
- ubi->vid_hdr_alsize);
+ ubi->vid_hdr_shift + UBI_VID_HDR_SIZE);
if (read_err && read_err != UBI_IO_BITFLIPS && !mtd_is_eccerr(read_err))
return read_err;
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH] spi: i.MX: reset controller on init
From: Sascha Hauer @ 2016-11-22 11:51 UTC (permalink / raw)
To: Barebox List; +Cc: uol
In rare cases the controller is does not work right after probe. When
this happens the registers show that the TXFIFO contains words, but
the transfer is never started. We observed that on some boards which
boot from SPI NOR. The xload SPI code leaves the controller enabled,
so the SPI controller is enabled during probe(). Disabling it before
usage (and thus resetting it) helps. We haven't found out why exactly
this happens.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/spi/imx_spi.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 806ca67..876699a 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -348,6 +348,13 @@ static u32 imx_xchg_single(struct spi_device *spi, u32 tx_val)
return imx_spi_maybe_reverse_bits(spi, rx_val);
}
+static void cspi_2_3_init(struct imx_spi *imx)
+{
+ void __iomem *base = imx->regs;
+
+ writel(0, base + CSPI_2_3_CTRL);
+}
+
static void imx_spi_do_transfer(struct spi_device *spi)
{
struct imx_spi *imx = container_of(spi->master, struct imx_spi, master);
@@ -519,6 +526,7 @@ static __maybe_unused struct spi_imx_devtype_data spi_imx_devtype_data_2_3 = {
.chipselect = cspi_2_3_chipselect,
.do_transfer = cspi_2_3_do_transfer,
.xchg_single = cspi_2_3_xchg_single,
+ .init = cspi_2_3_init,
};
static int imx_spi_dt_probe(struct imx_spi *imx)
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCHv2] ARM: i.MX25/35: Fix bootsource detection
From: Daniel Krüger @ 2016-11-22 11:08 UTC (permalink / raw)
To: barebox, s.hauer
This fixes commit 0b47f95340d801a26643e5e1f4ee05287e8ae90e for i.MX25/35.
Otherwise the bootsource was just "unknown".
Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
---
arch/arm/mach-imx/boot.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index b66c29d..4893060 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -69,13 +69,13 @@ static const enum bootsource locations[4][4] = {
* Note also that I suspect that the boot source pins are only sampled at
* power up.
*/
-static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
+static enum bootsource imx25_35_boot_source(unsigned int ctrl, unsigned int type)
{
enum bootsource src;
src = locations[ctrl][type];
- bootsource_set(src);
+ return src;
}
void imx25_get_boot_source(enum bootsource *src, int *instance)
@@ -84,8 +84,8 @@ void imx25_get_boot_source(enum bootsource *src, int *instance)
uint32_t val;
val = readl(ccm_base + MX25_CCM_RCSR);
- imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
- (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
+ *src = imx25_35_boot_source((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
+ (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
}
void imx25_boot_save_loc(void)
@@ -105,8 +105,8 @@ void imx35_get_boot_source(enum bootsource *src, int *instance)
uint32_t val;
val = readl(ccm_base + MX35_CCM_RCSR);
- imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
- (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
+ *src = imx25_35_boot_source((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
+ (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
}
void imx35_boot_save_loc(void)
--
1.7.9.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* Re: [PATCH] ARM: i.MX25/35: Fix bootsource detection
From: Daniel Krüger @ 2016-11-21 15:52 UTC (permalink / raw)
To: barebox, s.hauer
In-Reply-To: <e424cfb4-6cf8-294f-9192-a6e13135f195@systec-electronic.com>
Hi,
I suspect, that the patch got scrambled by Thunderbird. Sorry for that.
I will try it again. Hopefully, then it will be OK.
Best regards,
Daniel Krüger
Am 21.11.2016 um 13:41 schrieb Daniel Krüger:
> This fixes commit 0b47f95340d801a26643e5e1f4ee05287e8ae90e for i.MX25/35.
> Otherwise it was just "unknown".
>
> Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
> ---
> arch/arm/mach-imx/boot.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index b66c29d..4893060 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -69,13 +69,13 @@ static const enum bootsource locations[4][4] = {
> * Note also that I suspect that the boot source pins are only sampled at
> * power up.
> */
> -static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
> +static enum bootsource imx25_35_boot_source(unsigned int ctrl, unsigned int type)
> {
> enum bootsource src;
>
> src = locations[ctrl][type];
>
> - bootsource_set(src);
> + return src;
> }
>
> void imx25_get_boot_source(enum bootsource *src, int *instance)
> @@ -84,8 +84,8 @@ void imx25_get_boot_source(enum bootsource *src, int *instance)
> uint32_t val;
>
> val = readl(ccm_base + MX25_CCM_RCSR);
> - imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> - (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> + *src = imx25_35_boot_source((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> + (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> }
>
> void imx25_boot_save_loc(void)
> @@ -105,8 +105,8 @@ void imx35_get_boot_source(enum bootsource *src, int *instance)
> uint32_t val;
>
> val = readl(ccm_base + MX35_CCM_RCSR);
> - imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> - (val >> MX36_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> + *src = imx25_35_boot_source((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> + (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> }
>
> void imx35_boot_save_loc(void)
--
SYS TEC electronic GmbH
Am Windrad 2
08468 Heinsdorfergrund
Telefon : +49 (0) 3765 38600-0
Fax : +49 (0) 3765 38600-4100
Email : daniel.krueger@systec-electronic.com
Website : http://www.systec-electronic.com
Managing Directors :
Dipl.-Phys. Siegmar Schmidt, Dipl. Ing. (FH) Armin von Collrepp
Commercial registry : Amtsgericht Chemnitz, HRB 28082
USt.-Id Nr. : DE150534010
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply
* [PATCH] ARM: i.MX25/35: Fix bootsource detection
From: Daniel Krüger @ 2016-11-21 12:41 UTC (permalink / raw)
To: barebox, s.hauer
This fixes commit 0b47f95340d801a26643e5e1f4ee05287e8ae90e for i.MX25/35.
Otherwise it was just "unknown".
Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
---
arch/arm/mach-imx/boot.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index b66c29d..4893060 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -69,13 +69,13 @@ static const enum bootsource locations[4][4] = {
* Note also that I suspect that the boot source pins are only sampled at
* power up.
*/
-static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
+static enum bootsource imx25_35_boot_source(unsigned int ctrl, unsigned
int type)
{
enum bootsource src;
src = locations[ctrl][type];
- bootsource_set(src);
+ return src;
}
void imx25_get_boot_source(enum bootsource *src, int *instance)
@@ -84,8 +84,8 @@ void imx25_get_boot_source(enum bootsource *src, int
*instance)
uint32_t val;
val = readl(ccm_base + MX25_CCM_RCSR);
- imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
- (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
+ *src = imx25_35_boot_source((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
+ (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
}
void imx25_boot_save_loc(void)
@@ -105,8 +105,8 @@ void imx35_get_boot_source(enum bootsource *src, int
*instance)
uint32_t val;
val = readl(ccm_base + MX35_CCM_RCSR);
- imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
- (val >> MX36_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
+ *src = imx25_35_boot_source((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
+ (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
}
void imx35_boot_save_loc(void)
--
1.7.9.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* Re: [PATCH 1/2] scripts: imx imx-usb-loader: sort USB id list
From: Sascha Hauer @ 2016-11-21 8:04 UTC (permalink / raw)
To: Alexander Kurz; +Cc: barebox
In-Reply-To: <1479713713-17241-1-git-send-email-akurz@blala.de>
On Mon, Nov 21, 2016 at 08:35:12AM +0100, Alexander Kurz wrote:
> For better readability sort the list of known USB ids by VID and PID.
>
> Signed-off-by: Alexander Kurz <akurz@blala.de>
> ---
> scripts/imx/imx-usb-loader.c | 56 ++++++++++++++++++++++----------------------
> 1 file changed, 28 insertions(+), 28 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
> index c0aaa7d..fb80e0e 100644
> --- a/scripts/imx/imx-usb-loader.c
> +++ b/scripts/imx/imx-usb-loader.c
> @@ -84,6 +84,34 @@ struct mach_id imx_ids[] = {
> .mode = MODE_BULK,
> }, {
> .vid = 0x15a2,
> + .pid = 0x0030,
> + .name = "i.MX35",
> + .header_type = HDR_MX51,
> + .mode = MODE_BULK,
> + .max_transfer = 64,
> + }, {
> + .vid = 0x15a2,
> + .pid = 0x003a,
> + .name = "i.MX25",
> + .header_type = HDR_MX51,
> + .mode = MODE_BULK,
> + .max_transfer = 64,
> + }, {
> + .vid = 0x15a2,
> + .pid = 0x0041,
> + .name = "i.MX51",
> + .header_type = HDR_MX51,
> + .mode = MODE_BULK,
> + .max_transfer = 64,
> + }, {
> + .vid = 0x15a2,
> + .pid = 0x004e,
> + .name = "i.MX53",
> + .header_type = HDR_MX53,
> + .mode = MODE_BULK,
> + .max_transfer = 512,
> + }, {
> + .vid = 0x15a2,
> .pid = 0x004f,
> .name = "i.MX28",
> }, {
> @@ -121,34 +149,6 @@ struct mach_id imx_ids[] = {
> .header_type = HDR_MX53,
> .mode = MODE_HID,
> .max_transfer = 1024,
> - }, {
> - .vid = 0x15a2,
> - .pid = 0x0041,
> - .name = "i.MX51",
> - .header_type = HDR_MX51,
> - .mode = MODE_BULK,
> - .max_transfer = 64,
> - }, {
> - .vid = 0x15a2,
> - .pid = 0x004e,
> - .name = "i.MX53",
> - .header_type = HDR_MX53,
> - .mode = MODE_BULK,
> - .max_transfer = 512,
> - }, {
> - .vid = 0x15a2,
> - .pid = 0x0030,
> - .name = "i.MX35",
> - .header_type = HDR_MX51,
> - .mode = MODE_BULK,
> - .max_transfer = 64,
> - }, {
> - .vid = 0x15a2,
> - .pid = 0x003a,
> - .name = "i.MX25",
> - .header_type = HDR_MX51,
> - .mode = MODE_BULK,
> - .max_transfer = 64,
> },
> };
>
> --
> 2.1.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply
* Re: [PATCH] docs: fix typos in memcmp help text
From: Sascha Hauer @ 2016-11-21 8:03 UTC (permalink / raw)
To: Moritz Warning; +Cc: barebox
In-Reply-To: <20161120000910.10503-1-moritzwarning@web.de>
On Sun, Nov 20, 2016 at 01:09:10AM +0100, Moritz Warning wrote:
> Signed-off-by: Moritz Warning <moritzwarning@web.de>
> ---
> commands/memcmp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/commands/memcmp.c b/commands/memcmp.c
> index ce044df..7be0033 100644
> --- a/commands/memcmp.c
> +++ b/commands/memcmp.c
> @@ -130,8 +130,8 @@ out:
> }
>
> BAREBOX_CMD_HELP_START(memcmp)
> -BAREBOX_CMD_HELP_TEXT("Compare memory regions specified with ADDR and ADDR2")
> -BAREBOX_CMD_HELP_TEXT("of size COUNT bytes. If source is a file COUNT can")
> +BAREBOX_CMD_HELP_TEXT("Compare memory regions specified with ADDR1 and ADDR2")
> +BAREBOX_CMD_HELP_TEXT("of size COUNT bytes. If source is a file, COUNT can")
> BAREBOX_CMD_HELP_TEXT("be left unspecified, in which case the whole file is")
> BAREBOX_CMD_HELP_TEXT("compared.")
> BAREBOX_CMD_HELP_TEXT("")
> --
> 2.10.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply
* [PATCH 1/2] scripts: imx imx-usb-loader: sort USB id list
From: Alexander Kurz @ 2016-11-21 7:35 UTC (permalink / raw)
To: barebox; +Cc: Alexander Kurz
For better readability sort the list of known USB ids by VID and PID.
Signed-off-by: Alexander Kurz <akurz@blala.de>
---
scripts/imx/imx-usb-loader.c | 56 ++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index c0aaa7d..fb80e0e 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -84,6 +84,34 @@ struct mach_id imx_ids[] = {
.mode = MODE_BULK,
}, {
.vid = 0x15a2,
+ .pid = 0x0030,
+ .name = "i.MX35",
+ .header_type = HDR_MX51,
+ .mode = MODE_BULK,
+ .max_transfer = 64,
+ }, {
+ .vid = 0x15a2,
+ .pid = 0x003a,
+ .name = "i.MX25",
+ .header_type = HDR_MX51,
+ .mode = MODE_BULK,
+ .max_transfer = 64,
+ }, {
+ .vid = 0x15a2,
+ .pid = 0x0041,
+ .name = "i.MX51",
+ .header_type = HDR_MX51,
+ .mode = MODE_BULK,
+ .max_transfer = 64,
+ }, {
+ .vid = 0x15a2,
+ .pid = 0x004e,
+ .name = "i.MX53",
+ .header_type = HDR_MX53,
+ .mode = MODE_BULK,
+ .max_transfer = 512,
+ }, {
+ .vid = 0x15a2,
.pid = 0x004f,
.name = "i.MX28",
}, {
@@ -121,34 +149,6 @@ struct mach_id imx_ids[] = {
.header_type = HDR_MX53,
.mode = MODE_HID,
.max_transfer = 1024,
- }, {
- .vid = 0x15a2,
- .pid = 0x0041,
- .name = "i.MX51",
- .header_type = HDR_MX51,
- .mode = MODE_BULK,
- .max_transfer = 64,
- }, {
- .vid = 0x15a2,
- .pid = 0x004e,
- .name = "i.MX53",
- .header_type = HDR_MX53,
- .mode = MODE_BULK,
- .max_transfer = 512,
- }, {
- .vid = 0x15a2,
- .pid = 0x0030,
- .name = "i.MX35",
- .header_type = HDR_MX51,
- .mode = MODE_BULK,
- .max_transfer = 64,
- }, {
- .vid = 0x15a2,
- .pid = 0x003a,
- .name = "i.MX25",
- .header_type = HDR_MX51,
- .mode = MODE_BULK,
- .max_transfer = 64,
},
};
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH 2/2] scripts: imx imx-usb-loader: add i.MX6SL support
From: Alexander Kurz @ 2016-11-21 7:35 UTC (permalink / raw)
To: barebox; +Cc: Alexander Kurz
In-Reply-To: <1479713713-17241-1-git-send-email-akurz@blala.de>
Add the i.MX6SL USB id to the list of known ids.
Signed-off-by: Alexander Kurz <akurz@blala.de>
---
scripts/imx/imx-usb-loader.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index fb80e0e..be0894f 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -137,6 +137,13 @@ struct mach_id imx_ids[] = {
.max_transfer = 1024,
}, {
.vid = 0x15a2,
+ .pid = 0x0063,
+ .name = "i.MX6sl",
+ .header_type = HDR_MX53,
+ .mode = MODE_HID,
+ .max_transfer = 1024,
+ }, {
+ .vid = 0x15a2,
.pid = 0x0071,
.name = "i.MX6 SoloX",
.header_type = HDR_MX53,
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
* [PATCH] docs: fix typos in memcmp help text
From: Moritz Warning @ 2016-11-20 0:09 UTC (permalink / raw)
To: barebox
Signed-off-by: Moritz Warning <moritzwarning@web.de>
---
commands/memcmp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/commands/memcmp.c b/commands/memcmp.c
index ce044df..7be0033 100644
--- a/commands/memcmp.c
+++ b/commands/memcmp.c
@@ -130,8 +130,8 @@ out:
}
BAREBOX_CMD_HELP_START(memcmp)
-BAREBOX_CMD_HELP_TEXT("Compare memory regions specified with ADDR and ADDR2")
-BAREBOX_CMD_HELP_TEXT("of size COUNT bytes. If source is a file COUNT can")
+BAREBOX_CMD_HELP_TEXT("Compare memory regions specified with ADDR1 and ADDR2")
+BAREBOX_CMD_HELP_TEXT("of size COUNT bytes. If source is a file, COUNT can")
BAREBOX_CMD_HELP_TEXT("be left unspecified, in which case the whole file is")
BAREBOX_CMD_HELP_TEXT("compared.")
BAREBOX_CMD_HELP_TEXT("")
--
2.10.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox