[PATCH] MIPS: don't include generated header files into MIPS asm files

[PATCH] MIPS: don't include generated header files into MIPS asm files

[Antony Pavlov]

This patch came out of discussions in the 'MIPS parallel build breakage' e-mail thread:

    http://lists.infradead.org/pipermail/barebox/2018-March/032251.html

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/include/asm/pbl_macros.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/mips/include/asm/pbl_macros.h b/arch/mips/include/asm/pbl_macros.h
index 18115c8489..bb3182cda9 100644
--- a/arch/mips/include/asm/pbl_macros.h
+++ b/arch/mips/include/asm/pbl_macros.h
@@ -25,8 +25,6 @@
 #include <asm/mipsregs.h>
 #include <asm/asm.h>
 #include <asm-generic/memory_layout.h>
-#include <generated/compile.h>
-#include <generated/utsrelease.h>
 #include <asm/addrspace.h>
 #include <asm/cacheops.h>
 
@@ -174,7 +172,7 @@ copy_loop_exit:
 	 nop
 
 	.org	0x10
-	.ascii	"barebox " UTS_RELEASE " " UTS_VERSION
+	.ascii	"barebox"
 	.byte	0
 
 	.align	4
-- 
2.18.0


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

Re: [PATCH] MIPS: don't include generated header files into MIPS asm files

[Sascha Hauer]

On Fri, Jun 29, 2018 at 01:58:23PM +0300, Antony Pavlov wrote:
> This patch came out of discussions in the 'MIPS parallel build breakage' e-mail thread:
> 
>     http://lists.infradead.org/pipermail/barebox/2018-March/032251.html
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  arch/mips/include/asm/pbl_macros.h | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

\o/ Applied, thanks

I'll add MIPS back to my autobuilder then.

Sascha

> 
> diff --git a/arch/mips/include/asm/pbl_macros.h b/arch/mips/include/asm/pbl_macros.h
> index 18115c8489..bb3182cda9 100644
> --- a/arch/mips/include/asm/pbl_macros.h
> +++ b/arch/mips/include/asm/pbl_macros.h
> @@ -25,8 +25,6 @@
>  #include <asm/mipsregs.h>
>  #include <asm/asm.h>
>  #include <asm-generic/memory_layout.h>
> -#include <generated/compile.h>
> -#include <generated/utsrelease.h>
>  #include <asm/addrspace.h>
>  #include <asm/cacheops.h>
>  
> @@ -174,7 +172,7 @@ copy_loop_exit:
>  	 nop
>  
>  	.org	0x10
> -	.ascii	"barebox " UTS_RELEASE " " UTS_VERSION
> +	.ascii	"barebox"
>  	.byte	0
>  
>  	.align	4
> -- 
> 2.18.0
> 
> 

-- 
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