[U-Boot] [PATCH v7 01/21] include: Add log2 header from the kernel

Fabio Estevam festevam at gmail.com
Thu Nov 5 18:53:30 CET 2015


Hi Tom,

On Thu, Nov 5, 2015 at 2:35 PM, Tom Rini <trini at konsulko.com> wrote:

> For tqma6s_mba6_spi, at91sam9261ek_dataflash_cs0 this is not bisectable.
> I'm going to see how the things are at the end of the series only now.

Ok, I have a fix for this issue. We just need the following patch to
be applied after the second patch of this series.

>From a435dfc50f03bb861c6aab0e8f5c3d9587a16268 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam at freescale.com>
Date: Thu, 5 Nov 2015 15:44:56 -0200
Subject: [PATCH] bitops: Add linux/compiler header file

We need to add <linux/compiler.h> so that __always_inline can
be understood.

Otherwise we can get errors like:

include/asm-generic/bitops/__fls.h:12:24: error: expected ‘=’, ‘,’,
‘;’, ‘asm’ or ‘__attribute__’ before ‘unsigned’
include/asm-generic/bitops/__ffs.h:12:24: error: expected ‘=’, ‘,’,
‘;’, ‘asm’ or ‘__attribute__’ before ‘un
include/asm-generic/bitops/fls.h:12:24: error: expected ‘=’, ‘,’, ‘;’,
‘asm’ or ‘__attribute__’ before ‘int’
include/asm-generic/bitops/fls64.h:18:24: error: expected ‘=’, ‘,’,
‘;’, ‘asm’ or ‘__attribute__’ before ‘int’
make[1]: *** [arch/arm/lib/asm-offsets.s] Error 1

Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
---
 include/linux/bitops.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 7b4011f..5a6672f 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -2,6 +2,7 @@
 #define _LINUX_BITOPS_H

 #include <asm/types.h>
+#include <linux/compiler.h>

 #define BIT(nr)            (1UL << (nr))
 #define BIT_MASK(nr)        (1UL << ((nr) % BITS_PER_LONG))
-- 
1.9.1

and then patch 17 just needs to remove the #include <linux/compiler.h>.

I can fix it in v8 if you want. I will wait to see your build result
for the entire series.

Thanks


More information about the U-Boot mailing list