summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-11-09 10:55:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-11-09 10:55:04 +0100
commitb2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d (patch)
treec7bf18bd3f6eef491dd62d383f836e4536c811cb /common
parentac9c1beb361e3c71e0b9b59d38e5022f12c263c6 (diff)
parent459bf1fd31da2c091c6c1e3a7e0f6a1b1cbf588b (diff)
downloadbarebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.gz
barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig1
-rw-r--r--common/partitions/efi.c2
-rw-r--r--common/state/state.c3
-rw-r--r--common/state/state_variables.c6
4 files changed, 5 insertions, 7 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 4909c82322..eddd99ea3b 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -653,7 +653,6 @@ config BOOTM_FORCE_SIGNED_IMAGES
since they are the only supported image type that support signing.
config BLSPEC
- depends on BLOCK
depends on FLEXIBLE_BOOTARGS
depends on !SHELL_NONE
select BOOT
diff --git a/common/partitions/efi.c b/common/partitions/efi.c
index 88734f166b..3c1077fd0c 100644
--- a/common/partitions/efi.c
+++ b/common/partitions/efi.c
@@ -23,7 +23,7 @@
#include "efi.h"
#include "parser.h"
-static int force_gpt = IS_ENABLED(CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE);
+static const int force_gpt = IS_ENABLED(CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE);
/**
* efi_crc32() - EFI version of crc32 function
diff --git a/common/state/state.c b/common/state/state.c
index 25d9502111..089d8f50d5 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -311,7 +311,7 @@ static int state_convert_node_variable(struct state *state,
if ((conv == STATE_CONVERT_TO_NODE)
|| (conv == STATE_CONVERT_FIXUP)) {
ret = of_property_write_string(new_node, "type",
- vtype->type_name);
+ vtype->type_name);
if (ret)
goto out;
@@ -583,6 +583,7 @@ void state_release(struct state *state)
/*
* state_new_from_node - create a new state instance from a device_node
*
+ * @node The device_node describing the new state instance
* @readonly This is a read-only state. Note that with this option set,
* there are no repairs done.
*/
diff --git a/common/state/state_variables.c b/common/state/state_variables.c
index de9ba4ab61..abd714ceda 100644
--- a/common/state/state_variables.c
+++ b/common/state/state_variables.c
@@ -339,8 +339,7 @@ static int state_string_export(struct state_variable *var,
int ret = 0;
if (string->value_default) {
- ret = of_set_property(node, "default", string->value_default,
- strlen(string->value_default) + 1, 1);
+ ret = of_property_write_string(node, "default", string->value_default);
if (ret)
return ret;
@@ -350,8 +349,7 @@ static int state_string_export(struct state_variable *var,
return 0;
if (string->value)
- ret = of_set_property(node, "value", string->value,
- strlen(string->value) + 1, 1);
+ ret = of_property_write_string(node, "value", string->value);
return ret;
}