mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox
@ 2014-11-06 13:20 Jan Luebbe
  2014-11-06 13:20 ` [PATCH 2/2] sandbox: avoid symbol conflict for fstat Jan Luebbe
  2014-11-07  7:02 ` [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox Sascha Hauer
  0 siblings, 2 replies; 3+ messages in thread
From: Jan Luebbe @ 2014-11-06 13:20 UTC (permalink / raw)
  To: barebox

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 drivers/of/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 97378ab59f41..90475cfbcae4 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -4,7 +4,7 @@ config OFTREE
 
 config OFTREE_MEM_GENERIC
 	depends on OFTREE
-	depends on PPC || ARM || ARCH_EFI || OPENRISC
+	depends on PPC || ARM || ARCH_EFI || OPENRISC || SANDBOX
 	def_bool y
 
 config DTC
-- 
2.1.1


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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] sandbox: avoid symbol conflict for fstat
  2014-11-06 13:20 [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox Jan Luebbe
@ 2014-11-06 13:20 ` Jan Luebbe
  2014-11-07  7:02 ` [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Jan Luebbe @ 2014-11-06 13:20 UTC (permalink / raw)
  To: barebox

Recently, a fstat function was added to barebox. Redefine it as usual
to avoid problems for the sandbox. This fixes loading files into the
sandbox.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/sandbox/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 596c8f8309f0..ed5d3a3dab2f 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -20,7 +20,7 @@ CFLAGS += -Dmalloc=barebox_malloc -Dcalloc=barebox_calloc \
 		-Dfputs=barebox_fputs -Dsetenv=barebox_setenv \
 		-Dgetenv=barebox_getenv -Dprintf=barebox_printf \
 		-Dglob=barebox_glob -Dglobfree=barebox_globfree \
-		-Dioctl=barebox_ioctl
+		-Dioctl=barebox_ioctl -Dfstat=barebox_fstat
 
 machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
 
-- 
2.1.1


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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox
  2014-11-06 13:20 [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox Jan Luebbe
  2014-11-06 13:20 ` [PATCH 2/2] sandbox: avoid symbol conflict for fstat Jan Luebbe
@ 2014-11-07  7:02 ` Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2014-11-07  7:02 UTC (permalink / raw)
  To: Jan Luebbe; +Cc: barebox

On Thu, Nov 06, 2014 at 02:20:27PM +0100, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Applied both, thanks

Sascha

> ---
>  drivers/of/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> index 97378ab59f41..90475cfbcae4 100644
> --- a/drivers/of/Kconfig
> +++ b/drivers/of/Kconfig
> @@ -4,7 +4,7 @@ config OFTREE
>  
>  config OFTREE_MEM_GENERIC
>  	depends on OFTREE
> -	depends on PPC || ARM || ARCH_EFI || OPENRISC
> +	depends on PPC || ARM || ARCH_EFI || OPENRISC || SANDBOX
>  	def_bool y
>  
>  config DTC
> -- 
> 2.1.1
> 
> 
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-11-07  7:02 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-06 13:20 [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox Jan Luebbe
2014-11-06 13:20 ` [PATCH 2/2] sandbox: avoid symbol conflict for fstat Jan Luebbe
2014-11-07  7:02 ` [PATCH 1/2] of: use OFTREE_MEM_GENERIC for the sandbox Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox