Merge branch 'for-next/misc'

Conflicts:
	commands/Makefile

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

2 files changed, 20 insertions, 1 deletions

diff --git a/lib/parameter.c b/lib/parameter.c
index b33ad1745..c00b82438 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -213,6 +213,24 @@ int dev_add_param_fixed(struct device_d *dev, char *name, char *value)
 }
 
 /**
+ * dev_remove_param - remove a parameter from a device and free its
+ * memory
+ * @param dev	The device
+ * @param name	The name of the parameter
+ */
+void dev_remove_param(struct device_d *dev, char *name)
+{
+	struct param_d *p = get_param_by_name(dev, name);
+
+	if (p) {
+		p->set(dev, p, NULL);
+		list_del(&p->list);
+		free(p->name);
+		free(p);
+	}
+}
+
+/**
  * dev_remove_parameters - remove all parameters from a device and free their
  * memory
  * @param dev	The device
diff --git a/lib/show_progress.c b/lib/show_progress.c
index d958a4468..bc067eac5 100644
--- a/lib/show_progress.c
+++ b/lib/show_progress.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <progress.h>
 #include <asm-generic/div64.h>
+#include <linux/stringify.h>
 
 #define HASHES_PER_LINE	65
 
@@ -56,7 +57,7 @@ void init_progression_bar(int max)
 	progress_max = max;
 	spin = 0;
 	if (progress_max)
-		printf("\t[%65s]\r\t[", "");
+		printf("\t[%"__stringify(HASHES_PER_LINE)"s]\r\t[", "");
 	else
 		printf("\t");
 }