mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] MIPS: fix out-of-tree build
@ 2012-11-30  2:53 Antony Pavlov
  2012-12-03  8:39 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Antony Pavlov @ 2012-11-30  2:53 UTC (permalink / raw)
  To: barebox

The commit

  commit d25d94bea67308e29db895d418f3f1f8153ae2ea
  Author: Antony Pavlov <antonynpavlov@gmail.com>
  Date:   Fri Jun 1 13:23:20 2012 +0400

      MIPS: make possible board-specific header files

      This patch makes possible to put a board-specific
      header file (e. g. foobar.h) to arch/mips/boards/*/include/board/.

breaks the out-of-tree build for the boards that use it (rzx50).

Reported-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/mips/Makefile |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 5e40de7..f32089d 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -88,14 +88,18 @@ else
 BOARD :=
 endif
 
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += -I$(BOARD)/include
+else
+CPPFLAGS += -I$(srctree)/$(BOARD)/include
+endif
+
 ifneq ($(machine-y),)
 MACH  := arch/mips/mach-$(machine-y)/
 else
 MACH  :=
 endif
 
-CPPFLAGS += -I$(BOARD)/include
-
 common-y += $(BOARD) $(MACH)
 common-y += arch/mips/lib/
 common-y += arch/mips/boot/
-- 
1.7.10.4


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

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

* Re: [PATCH] MIPS: fix out-of-tree build
  2012-11-30  2:53 [PATCH] MIPS: fix out-of-tree build Antony Pavlov
@ 2012-12-03  8:39 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-12-03  8:39 UTC (permalink / raw)
  To: Antony Pavlov; +Cc: barebox

On Fri, Nov 30, 2012 at 06:53:53AM +0400, Antony Pavlov wrote:
> The commit
> 
>   commit d25d94bea67308e29db895d418f3f1f8153ae2ea
>   Author: Antony Pavlov <antonynpavlov@gmail.com>
>   Date:   Fri Jun 1 13:23:20 2012 +0400
> 
>       MIPS: make possible board-specific header files
> 
>       This patch makes possible to put a board-specific
>       header file (e. g. foobar.h) to arch/mips/boards/*/include/board/.
> 
> breaks the out-of-tree build for the boards that use it (rzx50).

Applied, thanks

Sascha

> 
> Reported-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  arch/mips/Makefile |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/Makefile b/arch/mips/Makefile
> index 5e40de7..f32089d 100644
> --- a/arch/mips/Makefile
> +++ b/arch/mips/Makefile
> @@ -88,14 +88,18 @@ else
>  BOARD :=
>  endif
>  
> +ifeq ($(KBUILD_SRC),)
> +CPPFLAGS += -I$(BOARD)/include
> +else
> +CPPFLAGS += -I$(srctree)/$(BOARD)/include
> +endif
> +
>  ifneq ($(machine-y),)
>  MACH  := arch/mips/mach-$(machine-y)/
>  else
>  MACH  :=
>  endif
>  
> -CPPFLAGS += -I$(BOARD)/include
> -
>  common-y += $(BOARD) $(MACH)
>  common-y += arch/mips/lib/
>  common-y += arch/mips/boot/
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> 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] 2+ messages in thread

end of thread, other threads:[~2012-12-03  8:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-30  2:53 [PATCH] MIPS: fix out-of-tree build Antony Pavlov
2012-12-03  8:39 ` Sascha Hauer

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