summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2024-02-28 18:51:28 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2024-03-13 12:00:29 +0100
commitf47fd1184c8b8bf3484e8bd31915716e1d169fd5 (patch)
treeb62e355bb9cc5e331b5b33d6bc39380e8539c849
parent313ac72c3aa0626837e0a1e595c2db7e08699ef5 (diff)
downloadbarebox-f47fd1184c8b8bf3484e8bd31915716e1d169fd5.tar.gz
barebox-f47fd1184c8b8bf3484e8bd31915716e1d169fd5.tar.xz
env: export getenv_ullx() helper
getenv_ull() will parse values according to prefix: - If it starts with 0x, it's hexadecimal - If it's just 0, it's octal - otherwise, it's decimal Some variables like i.MX8M soc0.soc_uid are hexadecimal without leading 0x. Therefore add a getenv_ullx helper, so code that used to do: uid = imx8m_uid(); can be replaced with getenv_ullx("soc0.soc_uid", &uid); Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20240228175128.2734265-2-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/env.c15
-rw-r--r--include/environment.h6
2 files changed, 19 insertions, 2 deletions
diff --git a/common/env.c b/common/env.c
index d673b061ab..7a213cadb2 100644
--- a/common/env.c
+++ b/common/env.c
@@ -343,19 +343,30 @@ const char *getenv_nonempty(const char *var)
}
EXPORT_SYMBOL(getenv_nonempty);
-int getenv_ull(const char *var , unsigned long long *val)
+static int getenv_ull_base(const char *var, int base, unsigned long long *val)
{
const char *valstr = getenv(var);
if (!valstr || !*valstr)
return -EINVAL;
- *val = simple_strtoull(valstr, NULL, 0);
+ *val = simple_strtoull(valstr, NULL, base);
return 0;
}
+
+int getenv_ull(const char *var , unsigned long long *val)
+{
+ return getenv_ull_base(var, 0, val);
+}
EXPORT_SYMBOL(getenv_ull);
+int getenv_ullx(const char *var , unsigned long long *val)
+{
+ return getenv_ull_base(var, 16, val);
+}
+EXPORT_SYMBOL(getenv_ullx);
+
int getenv_ul(const char *var , unsigned long *val)
{
const char *valstr = getenv(var);
diff --git a/include/environment.h b/include/environment.h
index 1557c3a1d7..8b143c16b7 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -35,6 +35,7 @@ int setenv(const char *, const char *);
int pr_setenv(const char *, const char *fmt, ...) __attribute__ ((format(__printf__, 2, 3)));
void export_env_ull(const char *name, unsigned long long val);
int getenv_ull(const char *name, unsigned long long *val);
+int getenv_ullx(const char *name, unsigned long long *val);
int getenv_ul(const char *name, unsigned long *val);
int getenv_uint(const char *name, unsigned int *val);
int getenv_bool(const char *var, int *val);
@@ -63,6 +64,11 @@ static inline int getenv_ull(const char *name, unsigned long long *val)
return -EINVAL;
}
+static inline int getenv_ullx(const char *name, unsigned long long *val)
+{
+ return -EINVAL;
+}
+
static inline int getenv_ul(const char *name, unsigned long *val)
{
return -EINVAL;