When barebox concatenates all dynamic bootargs string for linux, if they are empty, the resulting string might be composed of only spaces. Currently, there is no check for such string and it leads to overwriting bootargs in the device tree by an empty string. To avoid this behavior, use skip_spaces to trim leading spaces and then check if the string is empty. If so, simply returns and don't patch device tree bootargs. Signed-off-by: Clement Leger <cleger@xxxxxxxxx> --- common/oftree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/oftree.c b/common/oftree.c index 09cb66021..36906e86f 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -151,6 +151,10 @@ static int of_fixup_bootargs(struct device_node *root, void *unused) if (!str) return 0; + str = skip_spaces(str); + if (strlen(str) == 0) + return 0; + node = of_create_node(root, "/chosen"); if (!node) return -ENOMEM; -- 2.15.0.276.g89ea799 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
