linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* CPU_V6K build failure in next-20110223
@ 2011-02-23 14:40 Jamie Iles
  2011-02-23 15:02 ` Russell King - ARM Linux
  0 siblings, 1 reply; 2+ messages in thread
From: Jamie Iles @ 2011-02-23 14:40 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Russell,

Building todays next tree for my board (CPU_V6K) results in the 
following build error:

  CC      arch/arm/kernel/asm-offsets.s
In file included from /home/jamiei/src/linux-2.6/arch/arm/include/asm/cacheflush.h:15,
                 from arch/arm/kernel/asm-offsets.c:16:
/home/jamiei/src/linux-2.6/arch/arm/include/asm/glue-cache.h:129:2: error: #error Unknown cache maintainence model
make[1]: *** [arch/arm/kernel/asm-offsets.s] Error 1
make: *** [prepare0] Error 2

Building dove_defconfig also results in the same error.  The patch below 
appears to fix the issue.

Jamie

8<----

diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index 0591d35..c7afbc5 100644
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -109,7 +109,7 @@
 # define MULTI_CACHE 1
 #endif
 
-#if defined(CONFIG_CPU_V6)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
 //# ifdef _CACHE
 #  define MULTI_CACHE 1
 //# else
 //
---->8

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

* CPU_V6K build failure in next-20110223
  2011-02-23 14:40 CPU_V6K build failure in next-20110223 Jamie Iles
@ 2011-02-23 15:02 ` Russell King - ARM Linux
  0 siblings, 0 replies; 2+ messages in thread
From: Russell King - ARM Linux @ 2011-02-23 15:02 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Feb 23, 2011 at 02:40:20PM +0000, Jamie Iles wrote:
> Hi Russell,
> 
> Building todays next tree for my board (CPU_V6K) results in the 
> following build error:
> 
>   CC      arch/arm/kernel/asm-offsets.s
> In file included from /home/jamiei/src/linux-2.6/arch/arm/include/asm/cacheflush.h:15,
>                  from arch/arm/kernel/asm-offsets.c:16:
> /home/jamiei/src/linux-2.6/arch/arm/include/asm/glue-cache.h:129:2: error: #error Unknown cache maintainence model
> make[1]: *** [arch/arm/kernel/asm-offsets.s] Error 1
> make: *** [prepare0] Error 2
> 
> Building dove_defconfig also results in the same error.  The patch below 
> appears to fix the issue.

Welcome to the wonderful world of git conflicts with fixes needed in
non-conflicting files...

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

end of thread, other threads:[~2011-02-23 15:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 14:40 CPU_V6K build failure in next-20110223 Jamie Iles
2011-02-23 15:02 ` Russell King - ARM Linux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).