[PATCH 1/4] common: BLSPEC needs boot infrastructure and at least simple command support

[PATCH 1/4] common: BLSPEC needs boot infrastructure and at least simple command support

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/Kconfig b/common/Kconfig
index b075e582adae..8d026b41f9a1 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -645,6 +645,9 @@ config BOOTM_FORCE_SIGNED_IMAGES
 config BLSPEC
 	depends on BLOCK
 	depends on FLEXIBLE_BOOTARGS
+	depends on !SHELL_NONE
+	select BOOT
+	select BOOTM
 	select OFTREE
 	bool
 	prompt "Support bootloader spec"
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/4] HAB: don't reference unused HAB ops

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/hab/hab.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c
index 512ff7ecf2ac..0d71f5bf264c 100644
--- a/drivers/hab/hab.c
+++ b/drivers/hab/hab.c
@@ -209,9 +209,9 @@ static struct imx_hab_ops *imx_get_hab_ops(void)
 	if (ops)
 		return ops;
 
-	if (cpu_is_mx25() || cpu_is_mx35())
+	if (IS_ENABLED(CONFIG_HABV3) && (cpu_is_mx25() || cpu_is_mx35()))
 		tmp = &imx_hab_ops_iim;
-	else if (cpu_is_mx6())
+	else if (IS_ENABLED(CONFIG_HABV4) && cpu_is_mx6())
 		tmp = &imx_hab_ops_ocotp;
 	else
 		return NULL;
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/4] net: ifup needs to be able to run commands

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 net/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/Kconfig b/net/Kconfig
index f6ef0ce89c58..12b6bdb56d6d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -20,6 +20,7 @@ config NET_RESOLV
 
 config NET_IFUP
 	default y
+	depends on !SHELL_NONE
 	bool
 
 config NET_DHCP
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/4] param: fix stub prototype const annotation

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/param.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/param.h b/include/param.h
index f9f3398cae51..23abb524068c 100644
--- a/include/param.h
+++ b/include/param.h
@@ -98,7 +98,7 @@ static inline struct param_d *get_param_by_name(struct device_d *dev,
 	return NULL;
 }
 
-static inline struct param_d *dev_add_param(struct device_d *dev, char *name,
+static inline struct param_d *dev_add_param(struct device_d *dev, const char *name,
 		int (*set)(struct device_d *dev, struct param_d *p, const char *val),
 		const char *(*get)(struct device_d *, struct param_d *p),
 		unsigned long flags)
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/4] common: BLSPEC needs boot infrastructure and at least simple command support

[Sascha Hauer]

On Tue, Apr 25, 2017 at 10:55:23AM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  common/Kconfig | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/common/Kconfig b/common/Kconfig
> index b075e582adae..8d026b41f9a1 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -645,6 +645,9 @@ config BOOTM_FORCE_SIGNED_IMAGES
>  config BLSPEC
>  	depends on BLOCK
>  	depends on FLEXIBLE_BOOTARGS
> +	depends on !SHELL_NONE
> +	select BOOT
> +	select BOOTM
>  	select OFTREE
>  	bool
>  	prompt "Support bootloader spec"
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox