diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:22 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:22 +0200 |
commit | c59d7ab7317014cc14a98c47e91c2b582d5d08a7 (patch) | |
tree | 1a2b48b1f1eede56502eea748b4467ec8ab2d586 /include | |
parent | cde6a62a9d994087ff2d42239c1f370f98122c1c (diff) | |
parent | fbf03e24b9111aea4a11fea1ac67fee446ad2c63 (diff) | |
download | barebox-c59d7ab7317014cc14a98c47e91c2b582d5d08a7.tar.gz barebox-c59d7ab7317014cc14a98c47e91c2b582d5d08a7.tar.xz |
Merge branch 'for-next/machine-id'
Diffstat (limited to 'include')
-rw-r--r-- | include/bootm.h | 5 | ||||
-rw-r--r-- | include/digest.h | 1 | ||||
-rw-r--r-- | include/machine_id.h | 16 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/bootm.h b/include/bootm.h index 5ce3318ecc..a041aa35b9 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -26,6 +26,11 @@ struct bootm_data { * mount the rootfs from the same device as the Kernel comes from. */ bool appendroot; + /* + * provide_machine_id - if true, try to add systemd.machine_id= with + * value of global.machine_id to Kernel. + */ + bool provide_machine_id; unsigned long initrd_address; unsigned long os_address; unsigned long os_entry; diff --git a/include/digest.h b/include/digest.h index 474bdd160a..176084146b 100644 --- a/include/digest.h +++ b/include/digest.h @@ -20,6 +20,7 @@ #define __DIGEST_H__ #include <linux/list.h> +#include <errno.h> struct digest; diff --git a/include/machine_id.h b/include/machine_id.h new file mode 100644 index 0000000000..31d5e0bb28 --- /dev/null +++ b/include/machine_id.h @@ -0,0 +1,16 @@ +#ifndef __MACHINE_ID_H__ +#define __MACHINE_ID_H__ + +#if IS_ENABLED(CONFIG_MACHINE_ID) + +void machine_id_set_hashable(const void *hashable, size_t len); + +#else + +static inline void machine_id_set_hashable(const void *hashable, size_t len) +{ +} + +#endif /* CONFIG_MACHINE_ID */ + +#endif /* __MACHINE_ID_H__ */ |