Series to move headers to a consistent include location

When the vendor common libraries exists, then board should be able to reference headers located from a generic base, rather than having to do weird logic such as '#include "../common/xyz.h"'.

There are multiple options of implementation, the current strategy expects that:
a) Vendor boards that need generic files will define build in:

	board/$(VENDOR)/common
b) Vendor boards that expose generic functions from (a) for usage
from other board specific files will provide these headers in:
	board/$(VENDOR)/common/include/board-common

c) Vendor board files that need these function services will refer

	#include <board-common/xyz.h>
	Where, xyz.h is an example header exposing generic vendor common
	functions.

Cc Simon Glass <[email protected]>

Cc Tom Rini <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Daniel Schwierzeck <[email protected]>

Cc Michal Marek <[email protected]>

Cc Stefan Roese <[email protected]>

Cc Bin Meng <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

Makefile +3 -0

index 61050adb13f5..e7a3e2b4de51 100644
@@ -626,6 +626,9 @@ c_flags := $(KBUILD_CFLAGS) $(cpp_flags)
 # U-Boot objects....order is important (i.e. start must be first)
 
 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n)
+# Include vendor headers - they should be in the following location.
+# board/$(VENDOR)/common/include/board-common
+UBOOTINCLUDE += $(if $(HAVE_VENDOR_COMMON_LIB:y=1), -I$(srctree)/board/$(VENDOR)/common/include)
 
 libs-y += lib/
 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/

Header files can be located in a generic location without needing to reference them with ../common/

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/keymile
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do

	echo "processing $header in $common"
	hbase=`basename $header`
	git mv $common/$hbase $common/include/board-common
	sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS]
	sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]

done

Cc Valentin Longchamp <[email protected]>

Cc Holger Brunck <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/keymile/common/common.c                            | 2 +-
 board/keymile/common/{ => include/board-common}/common.h | 0
 board/keymile/common/ivm.c                               | 2 +-
 board/keymile/km82xx/km82xx.c                            | 2 +-
 board/keymile/km83xx/km83xx.c                            | 2 +-
 board/keymile/km83xx/km83xx_i2c.c                        | 2 +-
 board/keymile/km_arm/km_arm.c                            | 2 +-
 board/keymile/kmp204x/kmp204x.c                          | 2 +-
 board/keymile/kmp204x/qrio.c                             | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename board/keymile/common/{ => include/board-common}/common.h (100%)

board/keymile/common/common.c +1 -1

index b9aff1a84dcb..4f8b68ee5ccd 100644
@@ -21,7 +21,7 @@
 #if defined(CONFIG_POST)
 #include "post.h"
 #endif
-#include "common.h"
+#include <board-common/common.h>
 #include <i2c.h>
 
 DECLARE_GLOBAL_DATA_PTR;

board/keymile/common/include/board-common/common.h renamed from board/keymile/common/common.h +0 -0

similarity index 100%
rename from board/keymile/common/common.h
rename to board/keymile/common/include/board-common/common.h

board/keymile/common/ivm.c +1 -1

index 42db54221bb3..4d2963ad5f84 100644
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <cli_hush.h>
 #include <i2c.h>
-#include "common.h"
+#include <board-common/common.h>
 
 #define MAC_STR_SZ	20
 

board/keymile/km82xx/km82xx.c +1 -1

index c599b4093626..73d22dc6ac19 100644
@@ -16,7 +16,7 @@
 #endif
 
 #include <i2c.h>
-#include "../common/common.h"
+#include <board-common/common.h>
 
 static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
 

board/keymile/km83xx/km83xx.c +1 -1

index 89e9e1e57c38..83deca56aebc 100644
@@ -26,7 +26,7 @@
 #include <libfdt.h>
 #include <post.h>
 
-#include "../common/common.h"
+#include <board-common/common.h>
 
 static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
 

board/keymile/km83xx/km83xx_i2c.c +1 -1

index c961937530ac..e702a5cf86e2 100644
@@ -9,7 +9,7 @@
 #include <i2c.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
-#include "../common/common.h"
+#include <board-common/common.h>
 
 static void i2c_write_start_seq(void)
 {

board/keymile/km_arm/km_arm.c +1 -1

index 2938861f368f..82fa31c2208d 100644
@@ -23,7 +23,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 
-#include "../common/common.h"
+#include <board-common/common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

board/keymile/kmp204x/kmp204x.c +1 -1

index eebb47fc21f1..fbe6d98af6ce 100644
@@ -21,7 +21,7 @@
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
 
-#include "../common/common.h"
+#include <board-common/common.h>
 #include "kmp204x.h"
 
 DECLARE_GLOBAL_DATA_PTR;

board/keymile/kmp204x/qrio.c +1 -1

index edf3bf11a894..a4c25e084846 100644
@@ -7,7 +7,7 @@
 
 #include <common.h>
 
-#include "../common/common.h"
+#include <board-common/common.h>
 #include "kmp204x.h"
 
 /* QRIO GPIO register offsets */

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do

	echo "processing $header in $common"
	hbase=`basename $header`
	git mv $common/$hbase $common/include/board-common
	sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS]
	sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]

done

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/LaCie/common/cpld-gpio-bus.c                            | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h        | 0

 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0

 board/LaCie/edminiv2/edminiv2.c                               | 2 +-
 board/LaCie/net2big_v2/net2big_v2.c                           | 4 ++--
 board/LaCie/netspace_v2/netspace_v2.c                         | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename board/LaCie/common/{ => include/board-common}/common.h (100%)
 rename board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h (100%)

board/LaCie/common/cpld-gpio-bus.c +1 -1

index 9b24dc535c04..92a80243c5e0 100644
@@ -13,7 +13,7 @@
  */
 
 #include <asm/arch/gpio.h>
-#include "cpld-gpio-bus.h"
+#include <board-common/cpld-gpio-bus.h>
 
 static void cpld_gpio_bus_set_addr(struct cpld_gpio_bus *bus, unsigned addr)
 {

board/LaCie/common/include/board-common/common.h renamed from board/LaCie/common/common.h +0 -0

similarity index 100%
rename from board/LaCie/common/common.h
rename to board/LaCie/common/include/board-common/common.h

board/LaCie/common/include/board-common/cpld-gpio-bus.h renamed from board/LaCie/common/cpld-gpio-bus.h +0 -0

similarity index 100%
rename from board/LaCie/common/cpld-gpio-bus.h
rename to board/LaCie/common/include/board-common/cpld-gpio-bus.h

board/LaCie/edminiv2/edminiv2.c +1 -1

index edf6281797bf..66d0e8502256 100644
@@ -11,7 +11,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <asm/arch/orion5x.h>
-#include "../common/common.h"
+#include <board-common/common.h>
 #include <spl.h>
 #include <ns16550.h>
 

board/LaCie/net2big_v2/net2big_v2.c +2 -2

index 263bb5426c0d..0bfe76fde334 100644
@@ -18,8 +18,8 @@
 #include <asm/arch/gpio.h>
 
 #include "net2big_v2.h"
-#include "../common/common.h"
-#include "../common/cpld-gpio-bus.h"
+#include <board-common/common.h>
+#include <board-common/cpld-gpio-bus.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

board/LaCie/netspace_v2/netspace_v2.c +1 -1

index 17e629622ff7..4ea76d152e6b 100644
@@ -17,7 +17,7 @@
 #include <asm/arch/gpio.h>
 
 #include "netspace_v2.h"
-#include "../common/common.h"
+#include <board-common/common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

Signature · 1 line

2.6.2.402.g2635c2b

Hi Nishanth,

Quoted 23 lines · Nishanth Menon

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do

	echo "processing $header in $common"
	hbase=`basename $header`
	git mv $common/$hbase $common/include/board-common
	sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS]
	sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]

done

Quoted 7 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/LaCie/common/cpld-gpio-bus.c                            | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h        | 0

Is that really a good idea to move a LaCie-specific file named common.h to a place shared with other boards ?

Quoted 1 line

 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0

IMO, this headers are specific to LaCie boards and it don't make much sense to move them to a shared place. Moreover it is quite convenient to have them close from the board setup files.

Please don't move them.

Quoted 39 lines · Simon Guinot

Hi Nishanth,

Quoted 23 lines · Nishanth Menon

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do

	echo "processing $header in $common"
	hbase=`basename $header`
	git mv $common/$hbase $common/include/board-common
	sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS]
	sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]

done

Quoted 7 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/LaCie/common/cpld-gpio-bus.c                            | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h        | 0

Is that really a good idea to move a LaCie-specific file named common.h to a place shared with other boards ?

Quoted 1 line

 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0

Quoted 5 lines

IMO, this headers are specific to LaCie boards and it don't make much sense to move them to a shared place. Moreover it is quite convenient to have them close from the board setup files.

Please don't move them.

Please read and then suggest changes in the "Makefile: Include vendor common library in include search path" thread. Thanks!

Quoted 40 lines · Tom Rini

Quoted 39 lines · Simon Guinot

Hi Nishanth,

Quoted 23 lines · Nishanth Menon

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do

	echo "processing $header in $common"
	hbase=`basename $header`
	git mv $common/$hbase $common/include/board-common
	sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS]
	sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]

done

Quoted 7 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/LaCie/common/cpld-gpio-bus.c                            | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h        | 0

Is that really a good idea to move a LaCie-specific file named common.h to a place shared with other boards ?

Quoted 1 line

 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0

Quoted 8 lines

Quoted 5 lines

IMO, this headers are specific to LaCie boards and it don't make much sense to move them to a shared place. Moreover it is quite convenient to have them close from the board setup files.

Please don't move them.

Please read and then suggest changes in the "Makefile: Include vendor common library in include search path" thread. Thanks!

Hi Tom,

Do you mean I answered without even really looking at the suggested change ? Well, it is true :)

Sorry about that. I have been confused by the "git move file" notation which I am not familiar with. So, I withdraw my previous objections.

Now, I have to say that I am still not convinced by the change.

After applying this patch, I can see that:

#include "../common/cpld-gpio-bus.h"

have been replaced with:

#include <board-common/cpld-gpio-bus.h>

While this change is fine, I can also see that the header file has been moved from:

board/LaCie/common/cpld-gpio-bus.h

to:

board/LaCie/common/include/board-common/cpld-gpio-bus.h

With both the strings "board" and "common" duplicated, I am definitively not a big fan of this new path. Moreover I think that moving the headers away from the board setup files will harm a little bit the code reading.

Maybe it would be better to have a shorter path like:

board/LaCie/include/board-common/cpld-gpio-bus.h

Anyway, IMHO things are fine as they are. But if anyone thinks this change is needed or valuable, then I am OK with it.

Quoted 50 lines · Simon Guinot

Quoted 40 lines · Tom Rini

Quoted 39 lines · Simon Guinot

Hi Nishanth,

Quoted 23 lines · Nishanth Menon

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Quoted 7 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/LaCie/common/cpld-gpio-bus.c                            | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h        | 0

Is that really a good idea to move a LaCie-specific file named common.h to a place shared with other boards ?

Quoted 1 line

 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0

Quoted 8 lines

Quoted 5 lines

IMO, this headers are specific to LaCie boards and it don't make much sense to move them to a shared place. Moreover it is quite convenient to have them close from the board setup files.

Please don't move them.

Please read and then suggest changes in the "Makefile: Include vendor common library in include search path" thread. Thanks!

Quoted 8 lines

Hi Tom,

Do you mean I answered without even really looking at the suggested change ? Well, it is true :)

Sorry about that. I have been confused by the "git move file" notation which I am not familiar with. So, I withdraw my previous objections.

Thanks.

Quoted 19 lines

Now, I have to say that I am still not convinced by the change.

After applying this patch, I can see that:

#include "../common/cpld-gpio-bus.h"

have been replaced with:

#include <board-common/cpld-gpio-bus.h>

While this change is fine, I can also see that the header file has been moved from:

board/LaCie/common/cpld-gpio-bus.h

to:

board/LaCie/common/include/board-common/cpld-gpio-bus.h

Quoted 7 lines

With both the strings "board" and "common" duplicated, I am definitively not a big fan of this new path. Moreover I think that moving the headers away from the board setup files will harm a little bit the code reading.

Maybe it would be better to have a shorter path like:

board/LaCie/include/board-common/cpld-gpio-bus.h

That can easily be done as well. for me, it is just regenerating the scripts..

I strongly suggest to comment on the original patch
https://patchwork.ozlabs.org/patch/544030/ and suggest this so that other platform folks have the discussion context as well.

Quoted 3 lines

Anyway, IMHO things are fine as they are. But if anyone thinks this change is needed or valuable, then I am OK with it.

IMHO, I started on this story, because we have a need to have a board/ti/common directory and adding more cruft on top of what is already a bunch of crufty includes is just painful.

If you are interested in the complete history:

        https://patchwork.ozlabs.org/patch/540280/
        https://patchwork.ozlabs.org/patch/541068/
        https://patchwork.ozlabs.org/patch/542424/

Tom, Simon,

Are you guys ok with board/$(VENDOR)/include?

Hi Nishanth,

Quoted 110 lines · Nishanth Menon

Quoted 50 lines · Simon Guinot

Quoted 40 lines · Tom Rini

Quoted 39 lines · Simon Guinot

Hi Nishanth,

Quoted 23 lines · Nishanth Menon

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Quoted 7 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/LaCie/common/cpld-gpio-bus.c                            | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h        | 0

Is that really a good idea to move a LaCie-specific file named common.h to a place shared with other boards ?

Quoted 1 line

 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0

Quoted 8 lines

Quoted 5 lines

IMO, this headers are specific to LaCie boards and it don't make much sense to move them to a shared place. Moreover it is quite convenient to have them close from the board setup files.

Please don't move them.

Please read and then suggest changes in the "Makefile: Include vendor common library in include search path" thread. Thanks!

Quoted 8 lines

Hi Tom,

Do you mean I answered without even really looking at the suggested change ? Well, it is true :)

Sorry about that. I have been confused by the "git move file" notation which I am not familiar with. So, I withdraw my previous objections.

Thanks.

Quoted 19 lines

Now, I have to say that I am still not convinced by the change.

After applying this patch, I can see that:

#include "../common/cpld-gpio-bus.h"

have been replaced with:

#include <board-common/cpld-gpio-bus.h>

While this change is fine, I can also see that the header file has been moved from:

board/LaCie/common/cpld-gpio-bus.h

to:

board/LaCie/common/include/board-common/cpld-gpio-bus.h

Quoted 7 lines

With both the strings "board" and "common" duplicated, I am definitively not a big fan of this new path. Moreover I think that moving the headers away from the board setup files will harm a little bit the code reading.

Maybe it would be better to have a shorter path like:

board/LaCie/include/board-common/cpld-gpio-bus.h

That can easily be done as well. for me, it is just regenerating the scripts..

I strongly suggest to comment on the original patch
https://patchwork.ozlabs.org/patch/544030/ and suggest this so that other platform folks have the discussion context as well.

Quoted 3 lines

Anyway, IMHO things are fine as they are. But if anyone thinks this change is needed or valuable, then I am OK with it.

IMHO, I started on this story, because we have a need to have a board/ti/common directory and adding more cruft on top of what is already a bunch of crufty includes is just painful.

If you are interested in the complete history:

        https://patchwork.ozlabs.org/patch/540280/
        https://patchwork.ozlabs.org/patch/541068/
        https://patchwork.ozlabs.org/patch/542424/

Quoted 3 lines

Tom, Simon,

Are you guys ok with board/$(VENDOR)/include?

Yes.

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---

2015-11-13 14:43 GMT+09:00 Nishanth Menon <[email protected]>:

Quoted 23 lines

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Quoted 5 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---

As far as I understood from 02 to 12,
the effect of this series is:

either
replace "../common/foo.h" with <board-common/foo.h>

or
replace "bar.h" with <board-common/bar.h>

Vendor common headers are referenced within their own directory. #include "..." is better than #include <...> in such cases.

I still do not understand what problem this series wants to solve.

Quoted 31 lines

2015-11-13 14:43 GMT+09:00 Nishanth Menon <[email protected]>:

Quoted 23 lines

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Quoted 5 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---

Quoted 5 lines

As far as I understood from 02 to 12,
the effect of this series is:

either
replace "../common/foo.h" with <board-common/foo.h>

for board/specific board files.

Quoted 2 lines

or
replace "bar.h" with <board-common/bar.h>

yes - for board/common headers which are exposed.

Quoted 3 lines

Vendor common headers are referenced within their own directory. #include "..." is better than #include <...> in such cases.

Not after this series, which is what is the 3rd change done by this
series: The headers are moved to a common location away from the board/common directory.

This is more inline with what you did with mach.

Quoted 1 line

I still do not understand what problem this series wants to solve.

standardize board common header inclusion strategy across boards in a consistent manner similar to what mach/ changes have been doing.

Overall, you did mention in https://patchwork.ozlabs.org/patch/541068/

[step 1] move SoC-specific headers to arch/<arch>/mach-<soc>/include/mach

[step 2] change #include <asm/arch/foo.h> to #include <mach/foo.h>

Why did we not let folks user relative includes such as #include "../../mach/xyz.h" ? because it constraints us from changing the directory architecture in the future.

This is exactly the same problem that board/<vendor>/ folders have.

Why is it that you dont see that as a problem?

2015-11-15 14:38 GMT+09:00 Nishanth Menon <[email protected]>:

Quoted 67 lines · Masahiro Yamada

Quoted 31 lines

2015-11-13 14:43 GMT+09:00 Nishanth Menon <[email protected]>:

Quoted 23 lines

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Quoted 5 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---

Quoted 5 lines

As far as I understood from 02 to 12,
the effect of this series is:

either
replace "../common/foo.h" with <board-common/foo.h>

for board/specific board files.

Quoted 2 lines

or
replace "bar.h" with <board-common/bar.h>

yes - for board/common headers which are exposed.

Quoted 3 lines

Vendor common headers are referenced within their own directory. #include "..." is better than #include <...> in such cases.

Not after this series, which is what is the 3rd change done by this
series: The headers are moved to a common location away from the board/common directory.

This is more inline with what you did with mach.

Quoted 1 line

I still do not understand what problem this series wants to solve.

standardize board common header inclusion strategy across boards in a consistent manner similar to what mach/ changes have been doing.

Overall, you did mention in https://patchwork.ozlabs.org/patch/541068/

[step 1] move SoC-specific headers to arch/<arch>/mach-<soc>/include/mach

[step 2] change #include <asm/arch/foo.h> to #include <mach/foo.h>

Quoted 9 lines

Why did we not let folks user relative includes such as #include "../../mach/xyz.h" ? because it constraints us from changing the directory architecture in the future.

This is exactly the same problem that board/<vendor>/ folders have.

Why is it that you dont see that as a problem?

You are misunderstanding.

SoC headers (either <asm/arch/*.h> in old style, or <mach/*.h> in new style) are exported.

For example, arch/asm/include/asm/gpio.h includes <asm/arch/gpio.h>. Also, many files under drivers/ include <asm/arch/*.h>

I do not think any drivers should depend on SoC specific headers, but it is the place where we stand now.

OTOH, vendor headers should be only referenced locally.
We should not expand the scope. No need to standardize the include path.

Relative path is a correct way to include a header file with local scope.

Even Linux does so.

For example

drivers/pinctrl/sunxi/pinctrl-sunxi.c

Quoted 88 lines · Masahiro Yamada

2015-11-15 14:38 GMT+09:00 Nishanth Menon <[email protected]>:

Quoted 67 lines · Masahiro Yamada

Quoted 31 lines

2015-11-13 14:43 GMT+09:00 Nishanth Menon <[email protected]>:

Quoted 23 lines

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/LaCie
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Quoted 5 lines

Cc Simon Guinot <[email protected]>

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---

Quoted 5 lines

As far as I understood from 02 to 12,
the effect of this series is:

either
replace "../common/foo.h" with <board-common/foo.h>

for board/specific board files.

Quoted 2 lines

or
replace "bar.h" with <board-common/bar.h>

yes - for board/common headers which are exposed.

Quoted 3 lines

Vendor common headers are referenced within their own directory. #include "..." is better than #include <...> in such cases.

Not after this series, which is what is the 3rd change done by this
series: The headers are moved to a common location away from the board/common directory.

This is more inline with what you did with mach.

Quoted 1 line

I still do not understand what problem this series wants to solve.

standardize board common header inclusion strategy across boards in a consistent manner similar to what mach/ changes have been doing.

Overall, you did mention in https://patchwork.ozlabs.org/patch/541068/

[step 1] move SoC-specific headers to arch/<arch>/mach-<soc>/include/mach

[step 2] change #include <asm/arch/foo.h> to #include <mach/foo.h>

Quoted 9 lines

Why did we not let folks user relative includes such as #include "../../mach/xyz.h" ? because it constraints us from changing the directory architecture in the future.

This is exactly the same problem that board/<vendor>/ folders have.

Why is it that you dont see that as a problem?

You are misunderstanding.

SoC headers (either <asm/arch/*.h> in old style, or <mach/*.h> in new style) are exported.

For example, arch/asm/include/asm/gpio.h includes <asm/arch/gpio.h>. Also, many files under drivers/ include <asm/arch/*.h>

Quoted 7 lines

I do not think any drivers should depend on SoC specific headers, but it is the place where we stand now.

OTOH, vendor headers should be only referenced locally.
We should not expand the scope. No need to standardize the include path.

^^^

Quoted 9 lines

Relative path is a correct way to include a header file with local scope.

Even Linux does so.

For example

drivers/pinctrl/sunxi/pinctrl-sunxi.c

Hmm... so, lets review our status currently:
a) board/$(VENDOR)/board_X, board/$(VENDOR)/board_Y, board/$(VENDOR)/board_Z all need a common function, this is currently in board/$(VENDOR)/common/xyz.c.
b) the function prototype for the function needs to be in xyz.h so that board/$(VENDOR)/board_[XYZ] can use the function.
c) your suggestion is to stay in local scope for board/$(VENDOR)/board_[XYZ] by "../common/xyz.h"

So much I have understood. I dont understand *why* you feel that vendor headers should only be referenced locally. Could you elaborate a little more on that? Is it because of the risk that drivers will now be able to do <board-common/xyz.h> ?

If that is the case, and Tom, Simon, you folks agree as well, I can drop the entire series.

Header files can be located in a generic location without needing to reference them with ../common/

board/mpl/common/{ => include/board-common}/common_util.h (100%) rename board/mpl/common/{ => include/board-common}/isa.h (100%)

Hello

Quoted 3 lines · Nishanth Menon

Header files can be located in a generic location without needing to reference them with ../common/

Quoted 2 lines

board/mpl/common/{ => include/board-common}/common_util.h (100%) rename board/mpl/common/{ => include/board-common}/isa.h (100%)

Correct me if I'm missing something here but I don't see the actual gain of doing this. "board/mpl/common" contains MPL specific things which should be kept as locally to the MPL boards directory as possible.

For example how is a potential other "isa.h" file from another vendor and/or board handled? By using a <VENDOR><BOARD> prefix/suffix?

[...]
Building rut board...
arm-none-linux-gnueabi-size: './u-boot': No such file board/siemens/rut/board.c:35:37: fatal error: board-common/factoryset.h: No such file or directory make[1]: *** [board/siemens/rut/board.o] Error 1
make: *** [board/siemens/rut] Error 2
board/siemens/rut/board.c:35:37: fatal error: board-common/factoryset.h: No such file or directory compilation terminated.
make[1]: *** [board/siemens/rut/board.o] Error 1
make: *** [board/siemens/rut] Error 2
make: *** Waiting for unfinished jobs....

--------------------- SUMMARY ---------------------------- Boards compiled: 9
Boards with errors: 5 ( draco rastaban thuban pxm2 rut )
----------------------------------------------------------
** Note: MAKEALL is deprecated - please use buildman instead ** See tools/buildman/README for details

-----Original Message-----
From: Nishanth Menon [mailto:nm at ti.com]
Sent: Freitag, 13. November 2015 06:44
To: Simon Glass; Tom Rini; Masahiro Yamada; Daniel Schwierzeck; Michal Marek; Stefan Roese; Bin Meng
Cc: u-boot at lists.denx.de; Nishanth Menon; Paul Kocialkowski; Joe Hershberger; Egli, Samuel; Heiko Schocher; Meier, Roger
Subject: [PATCH V2 10/12] board: siemens: Move common headers to board- common directory

Header files can be located in a generic location without needing to reference them with ../common/

Generated with the following script

#!/bin/bash
vendor=board/siemens
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort - u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common" hbase=basename $header
git mv $common/$hbase $common/include/board-common sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g"
$vendor/*/*.[chS]

	sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g"

$vendor/common/*.[chS] done

Cc Paul Kocialkowski <[email protected]>

Cc Joe Hershberger <[email protected]>

Cc Simon Glass <[email protected]>

Cc Samuel Egli <[email protected]>

Cc Heiko Schocher <[email protected]>

Cc Roger Meier <[email protected]>

Signed-off-by Nishanth Menon <[email protected]>

---
 board/siemens/common/board.c                                 | 2 +-
 board/siemens/common/factoryset.c                            | 2 +-
 board/siemens/common/{ => include/board-common}/factoryset.h | 0
 board/siemens/draco/board.c                                  | 2 +-
 board/siemens/pxm2/board.c                                   | 2 +-
 board/siemens/rut/board.c                                    | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)  rename

board/siemens/common/{ => include/board-common}/factoryset.h (100%)

board/siemens/common/board.c +1 -1

index c127f6ca271d..00f4e355720a 100644
@@ -28,7 +28,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <watchdog.h>
-#include "../common/factoryset.h"
+#include <board-common/factoryset.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

board/siemens/common/factoryset.c +1 -1

index 6c869ed2b035..827e2a17eb8f 100644
@@ -17,7 +17,7 @@
 #include <net.h>
 #include <errno.h>
 #include <g_dnl.h>
-#include "factoryset.h"
+#include <board-common/factoryset.h>
 
 #define EEPR_PG_SZ		0x80
 #define EEPROM_FATORYSET_OFFSET	0x400

board/siemens/common/include/board-common/factoryset.h renamed from board/siemens/common/factoryset.h rename to +0 -0

similarity index 100%
rename from board/siemens/common/factoryset.h rename to

board/siemens/common/include/board-common/factoryset.h

board/siemens/draco/board.c +1 -1

index 48823141daa3..05b10a93a342 100644
@@ -32,7 +32,7 @@
 #include <cpsw.h>
 #include <watchdog.h>
 #include "board.h"
-#include "../common/factoryset.h"
+#include <board-common/factoryset.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

board/siemens/pxm2/board.c index renamed from board/siemens/pxm2/board.c +0 -0

750f33889742..9998a3f52bf4 100644

board/siemens/pxm2/board.c +1 -1

@@ -33,7 +33,7 @@
 #include <cpsw.h>
 #include <watchdog.h>
 #include "board.h"
-#include "../common/factoryset.h"
+#include <board-common/factoryset.h>
 #include "pmic.h"
 #include <nand.h>
 #include <bmp_layout.h>

board/siemens/rut/board.c index renamed from board/siemens/rut/board.c +0 -0

f94e3e5736f3..cafcfbd3358f 100644

board/siemens/rut/board.c +1 -2

@@ -32,7 +32,7 @@
 #include <video.h>
 #include <watchdog.h>
 #include "board.h"
-#include "../common/factoryset.h"
+#include <board-common/factoryset.h>
 #include "../../../drivers/video/da8xx-fb.h"
 
 DECLARE_GLOBAL_DATA_PTR;
--

2.6.2.402.g2635c2b

Hi,
This series is hopefully to setup the stage for consolidation of board/vendor/common include header organization in u-boot.

Discussion thread:

        https://patchwork.ozlabs.org/patch/540280/
        https://patchwork.ozlabs.org/patch/541068/
        https://patchwork.ozlabs.org/patch/542424/

In short, we:
a) Dont want to have symlinks for include headers
b) Want to be able to reference headers in reuse by doing #include <board-common/xyz.h>

So, we follow the "option #6" discussed in the last of the threads above. Only the first patch in this series was pasted and discussed previously. The remaining 11 in the series is natural cleanups as a result.

The series is Based on:
master ade766acfb27 Merge branch 'next' of git://git.denx.de/u-boot-blackfin

Script 1: identifying the board/vendors impacted:
#!/bin/bash

for common in git grep "../common" board|grep "#include"|cut -d ':' -f1|cut -d '/' -f1,2|sort -u do

        cfiles=`git grep "../common" $common|grep "#include"|cut -d '"' -f2|sort -u|grep c$`
        headers=`git grep "../common" $common|grep "#include"|cut -d '"' -f2|sort -u|grep h$`
        if [ -z "$headers" ]; then
                continue;
        fi
        echo $common : $headers : $cfiles

done
Output:
board/BuR : ../common/bur_common.h :
board/compulab : ../common/common.h ../common/eeprom.h :
board/freescale : ../common/cadmus.h ../common/dcu_sii9022a.h ../common/diu_ch7301.h ../common/eeprom.h ../common/fman.h ../common/idt8t49n222a_serdes_clk.h ../common/ngpixis.h ../common/pfuze.h ../common/pixis.h ../common/pq-mds-pib.h ../common/qixis.h ../common/sgmii_riser.h ../common/sleep.h ../common/via.h ../common/vid.h ../common/vsc3316_3308.h ../common/zm7300.h :
board/gdsys : ../common/dp501.h ../common/mclink.h ../common/osd.h ../common/phy.h :
board/keymile : ../common/common.h :
board/LaCie : ../common/common.h ../common/cpld-gpio-bus.h :
board/mpl : ../common/common_util.h ../common/isa.h :
board/seco : ../common/mx6.h :
board/siemens : ../common/factoryset.h : ../common/board.c
board/varisys : ../common/eeprom.h :
board/xes : ../common/fsl_8xxx_misc.h :

Script2: this is used to move the headers to relevant locations:
#!/bin/bash
vendor=$1
common=$vendor/common

cfiles=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$ headers=git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$

mkdir -p $common/include/board-common
set -x
for header in $headers
do
echo "processing $header in $common"
hbase=basename $header
git mv $common/$hbase $common/include/board-common
sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS]
done

Build tested with the following with at least the ARM platforms:
MAKEALL -v compulab -v BuR -v LaCie -v seco -v siemens

NOTE: I know this series impacts a lot of platforms..
other than patch #1, they are probably nice to have.. but upto you guys if you'd like it or not.. it will be good to standardize things a bit here. I am *NOT* trying to fix the following code:

$ git grep "\.\./common" board/*/*/*.[chS]|sort -u
board/amcc/bamboo/flash.c:#include "../common/flash.c"
board/amcc/bubinga/flash.c:#include "../common/flash.c"
board/amcc/luan/flash.c:#include "../common/flash.c"
board/amcc/walnut/flash.c:#include "../common/flash.c"
board/esd/cpci2dp/flash.c:#include "../common/flash.c"
board/esd/cpci405/cpci405.c:#include "../common/fpga.c"
board/esd/cpci405/flash.c:#include "../common/flash.c"
board/esd/plu405/flash.c:#include "../common/flash.c"
board/esd/plu405/plu405.c:#include "../common/fpga.c"
board/esd/vom405/flash.c:#include "../common/flash.c"
board/siemens/draco/board.c:#include "../common/board.c"
board/siemens/pxm2/board.c:#include "../common/board.c"
board/siemens/rut/board.c:#include "../common/board.c"

Nishanth Menon (12):
Makefile: Include vendor common library in include search path
board: BuR: Move common headers to board-common directory
board: compulab: Move common headers to board-common directory
board: freescale: Move common headers to board-common directory
board: gdsys: Move common headers to board-common directory
board: keymile: Move common headers to board-common directory
board: LaCie: Move common headers to board-common directory
board: mpl: Move common headers to board-common directory
board: seco: Move common headers to board-common directory
board: siemens: Move common headers to board-common directory
board: varisys: Move common headers to board-common directory
board: xes: Move common headers to board-common directory

 Makefile                                                          | 3 +++
 board/BuR/common/common.c                                         | 2 +-
 board/BuR/common/{ => include/board-common}/bur_common.h          | 0
 board/BuR/kwb/board.c                                             | 2 +-
 board/BuR/tseries/board.c                                         | 2 +-
 board/LaCie/common/cpld-gpio-bus.c                                | 2 +-
 board/LaCie/common/{ => include/board-common}/common.h            | 0
 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h     | 0
 board/LaCie/edminiv2/edminiv2.c                                   | 2 +-
 board/LaCie/net2big_v2/net2big_v2.c                               | 4 ++--
 board/LaCie/netspace_v2/netspace_v2.c                             | 2 +-
 board/compulab/cm_fx6/cm_fx6.c                                    | 4 ++--
 board/compulab/cm_t335/cm_t335.c                                  | 2 +-
 board/compulab/cm_t35/cm_t35.c                                    | 4 ++--
 board/compulab/cm_t3517/cm_t3517.c                                | 4 ++--
 board/compulab/cm_t54/cm_t54.c                                    | 2 +-
 board/compulab/common/common.c                                    | 4 ++--
 board/compulab/common/eeprom.c                                    | 2 +-
 board/compulab/common/{ => include/board-common}/common.h         | 0
 board/compulab/common/{ => include/board-common}/eeprom.h         | 0
 board/compulab/common/omap3_smc911x.c                             | 2 +-
 board/freescale/b4860qds/b4860qds.c                               | 8 ++++----
 board/freescale/b4860qds/eth_b4860qds.c                           | 6 +++---
 board/freescale/b4860qds/spl.c                                    | 2 +-
 board/freescale/bsc9132qds/bsc9132qds.c                           | 2 +-
 board/freescale/common/arm_sleep.c                                | 2 +-
 board/freescale/common/cds_pci_ft.c                               | 2 +-
 board/freescale/common/ics307_clk.c                               | 6 +++---
 board/freescale/common/idt8t49n222a_serdes_clk.c                  | 2 +-
 board/freescale/common/{ => include/board-common}/cadmus.h        | 0
 board/freescale/common/{ => include/board-common}/dcu_sii9022a.h  | 0
 board/freescale/common/{ => include/board-common}/diu_ch7301.h    | 0
 board/freescale/common/{ => include/board-common}/eeprom.h        | 0
 board/freescale/common/{ => include/board-common}/fman.h          | 0
 .../common/{ => include/board-common}/idt8t49n222a_serdes_clk.h   | 0
 board/freescale/common/{ => include/board-common}/ngpixis.h       | 0
 board/freescale/common/{ => include/board-common}/pfuze.h         | 0
 board/freescale/common/{ => include/board-common}/pixis.h         | 0
 board/freescale/common/{ => include/board-common}/pq-mds-pib.h    | 0
 board/freescale/common/{ => include/board-common}/qixis.h         | 0
 board/freescale/common/{ => include/board-common}/sgmii_riser.h   | 0
 board/freescale/common/{ => include/board-common}/sleep.h         | 0
 board/freescale/common/{ => include/board-common}/via.h           | 0
 board/freescale/common/{ => include/board-common}/vid.h           | 0
 board/freescale/common/{ => include/board-common}/vsc3316_3308.h  | 0
 board/freescale/common/{ => include/board-common}/zm7300.h        | 0
 board/freescale/common/mpc85xx_sleep.c                            | 2 +-
 board/freescale/common/ngpixis.c                                  | 2 +-
 board/freescale/common/pq-mds-pib.c                               | 2 +-
 board/freescale/common/qixis.c                                    | 2 +-
 board/freescale/common/sys_eeprom.c                               | 2 +-
 board/freescale/common/vid.c                                      | 2 +-
 board/freescale/common/vsc3316_3308.c                             | 2 +-
 board/freescale/common/zm7300.c                                   | 2 +-
 board/freescale/corenet_ds/corenet_ds.c                           | 2 +-
 board/freescale/corenet_ds/eth_hydra.c                            | 4 ++--
 board/freescale/corenet_ds/eth_p4080.c                            | 4 ++--
 board/freescale/corenet_ds/eth_superhydra.c                       | 4 ++--
 board/freescale/ls1021aqds/dcu.c                                  | 2 +-
 board/freescale/ls1021aqds/eth.c                                  | 4 ++--
 board/freescale/ls1021aqds/ls1021aqds.c                           | 4 ++--
 board/freescale/ls1021atwr/dcu.c                                  | 2 +-
 board/freescale/ls1021atwr/ls1021atwr.c                           | 2 +-
 board/freescale/ls1043ardb/eth.c                                  | 2 +-
 board/freescale/ls2085aqds/eth.c                                  | 2 +-
 board/freescale/ls2085aqds/ls2085aqds.c                           | 2 +-
 board/freescale/ls2085ardb/ls2085ardb.c                           | 2 +-
 board/freescale/mpc832xemds/mpc832xemds.c                         | 2 +-
 board/freescale/mpc832xemds/pci.c                                 | 2 +-
 board/freescale/mpc837xemds/mpc837xemds.c                         | 2 +-
 board/freescale/mpc8536ds/mpc8536ds.c                             | 2 +-
 board/freescale/mpc8541cds/mpc8541cds.c                           | 6 +++---
 board/freescale/mpc8544ds/mpc8544ds.c                             | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c                           | 6 +++---
 board/freescale/mpc8555cds/mpc8555cds.c                           | 6 +++---
 board/freescale/mpc8569mds/mpc8569mds.c                           | 2 +-
 board/freescale/mpc8572ds/mpc8572ds.c                             | 2 +-
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c                     | 2 +-
 board/freescale/mx6qsabreauto/mx6qsabreauto.c                     | 2 +-
 board/freescale/mx6sabresd/mx6sabresd.c                           | 2 +-
 board/freescale/mx6slevk/mx6slevk.c                               | 2 +-
 board/freescale/mx6sxsabresd/mx6sxsabresd.c                       | 2 +-
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c                 | 2 +-
 board/freescale/mx7dsabresd/mx7dsabresd.c                         | 2 +-
 board/freescale/p1022ds/diu.c                                     | 2 +-
 board/freescale/p1022ds/p1022ds.c                                 | 2 +-
 board/freescale/p1022ds/spl.c                                     | 2 +-
 board/freescale/p2041rdb/eth.c                                    | 2 +-
 board/freescale/t102xqds/eth_t102xqds.c                           | 4 ++--
 board/freescale/t102xqds/spl.c                                    | 2 +-
 board/freescale/t102xqds/t102xqds.c                               | 4 ++--
 board/freescale/t102xrdb/eth_t102xrdb.c                           | 2 +-
 board/freescale/t102xrdb/spl.c                                    | 2 +-
 board/freescale/t102xrdb/t102xrdb.c                               | 2 +-
 board/freescale/t1040qds/diu.c                                    | 4 ++--
 board/freescale/t1040qds/eth.c                                    | 4 ++--
 board/freescale/t1040qds/t1040qds.c                               | 4 ++--
 board/freescale/t104xrdb/diu.c                                    | 2 +-
 board/freescale/t104xrdb/eth.c                                    | 2 +-
 board/freescale/t104xrdb/spl.c                                    | 2 +-
 board/freescale/t104xrdb/t104xrdb.c                               | 2 +-
 board/freescale/t208xqds/eth_t208xqds.c                           | 4 ++--
 board/freescale/t208xqds/spl.c                                    | 2 +-
 board/freescale/t208xqds/t208xqds.c                               | 6 +++---
 board/freescale/t208xrdb/t208xrdb.c                               | 2 +-
 board/freescale/t4qds/eth.c                                       | 4 ++--
 board/freescale/t4qds/spl.c                                       | 2 +-
 board/freescale/t4qds/t4240qds.c                                  | 4 ++--
 board/freescale/t4rdb/eth.c                                       | 2 +-
 board/gdsys/405ep/dlvision-10g.c                                  | 2 +-
 board/gdsys/405ep/iocon.c                                         | 6 +++---
 board/gdsys/common/{ => include/board-common}/dp501.h             | 0
 board/gdsys/common/{ => include/board-common}/mclink.h            | 0
 board/gdsys/common/{ => include/board-common}/osd.h               | 0
 board/gdsys/common/{ => include/board-common}/phy.h               | 0
 board/gdsys/common/osd.c                                          | 2 +-
 board/gdsys/mpc8308/hrcon.c                                       | 6 +++---
 board/gdsys/p1022/controlcenterd.c                                | 2 +-
 board/keymile/common/common.c                                     | 2 +-
 board/keymile/common/{ => include/board-common}/common.h          | 0
 board/keymile/common/ivm.c                                        | 2 +-
 board/keymile/km82xx/km82xx.c                                     | 2 +-
 board/keymile/km83xx/km83xx.c                                     | 2 +-
 board/keymile/km83xx/km83xx_i2c.c                                 | 2 +-
 board/keymile/km_arm/km_arm.c                                     | 2 +-
 board/keymile/kmp204x/kmp204x.c                                   | 2 +-
 board/keymile/kmp204x/qrio.c                                      | 2 +-
 board/mpl/common/common_util.c                                    | 2 +-
 board/mpl/common/{ => include/board-common}/common_util.h         | 0
 board/mpl/common/{ => include/board-common}/isa.h                 | 0
 board/mpl/common/isa.c                                            | 2 +-
 board/mpl/common/kbd.c                                            | 2 +-
 board/mpl/common/pci.c                                            | 2 +-
 board/mpl/mip405/cmd_mip405.c                                     | 2 +-
 board/mpl/mip405/mip405.c                                         | 2 +-
 board/mpl/pip405/cmd_pip405.c                                     | 2 +-
 board/mpl/pip405/pip405.c                                         | 4 ++--
 board/mpl/vcma9/cmd_vcma9.c                                       | 2 +-
 board/mpl/vcma9/vcma9.c                                           | 2 +-
 board/seco/common/{ => include/board-common}/mx6.h                | 0
 board/seco/mx6quq7/mx6quq7.c                                      | 2 +-
 board/siemens/common/board.c                                      | 2 +-
 board/siemens/common/factoryset.c                                 | 2 +-
 board/siemens/common/{ => include/board-common}/factoryset.h      | 0
 board/siemens/draco/board.c                                       | 2 +-
 board/siemens/pxm2/board.c                                        | 2 +-
 board/siemens/rut/board.c                                         | 2 +-
 board/varisys/common/{ => include/board-common}/eeprom.h          | 0
 board/varisys/common/sys_eeprom.c                                 | 2 +-
 board/varisys/cyrus/cyrus.c                                       | 2 +-
 board/xes/common/board.c                                          | 2 +-
 board/xes/common/{ => include/board-common}/fsl_8xxx_misc.h       | 0
 board/xes/xpedite517x/xpedite517x.c                               | 2 +-
 153 files changed, 160 insertions(+), 157 deletions(-)
 rename board/BuR/common/{ => include/board-common}/bur_common.h (100%)
 rename board/LaCie/common/{ => include/board-common}/common.h (100%)
 rename board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h (100%)
 rename board/compulab/common/{ => include/board-common}/common.h (100%)
 rename board/compulab/common/{ => include/board-common}/eeprom.h (100%)
 rename board/freescale/common/{ => include/board-common}/cadmus.h (100%)
 rename board/freescale/common/{ => include/board-common}/dcu_sii9022a.h (100%)
 rename board/freescale/common/{ => include/board-common}/diu_ch7301.h (100%)
 rename board/freescale/common/{ => include/board-common}/eeprom.h (100%)
 rename board/freescale/common/{ => include/board-common}/fman.h (100%)
 rename board/freescale/common/{ => include/board-common}/idt8t49n222a_serdes_clk.h (100%)
 rename board/freescale/common/{ => include/board-common}/ngpixis.h (100%)
 rename board/freescale/common/{ => include/board-common}/pfuze.h (100%)
 rename board/freescale/common/{ => include/board-common}/pixis.h (100%)
 rename board/freescale/common/{ => include/board-common}/pq-mds-pib.h (100%)
 rename board/freescale/common/{ => include/board-common}/qixis.h (100%)
 rename board/freescale/common/{ => include/board-common}/sgmii_riser.h (100%)
 rename board/freescale/common/{ => include/board-common}/sleep.h (100%)
 rename board/freescale/common/{ => include/board-common}/via.h (100%)
 rename board/freescale/common/{ => include/board-common}/vid.h (100%)
 rename board/freescale/common/{ => include/board-common}/vsc3316_3308.h (100%)
 rename board/freescale/common/{ => include/board-common}/zm7300.h (100%)
 rename board/gdsys/common/{ => include/board-common}/dp501.h (100%)
 rename board/gdsys/common/{ => include/board-common}/mclink.h (100%)
 rename board/gdsys/common/{ => include/board-common}/osd.h (100%)
 rename board/gdsys/common/{ => include/board-common}/phy.h (100%)
 rename board/keymile/common/{ => include/board-common}/common.h (100%)
 rename board/mpl/common/{ => include/board-common}/common_util.h (100%)
 rename board/mpl/common/{ => include/board-common}/isa.h (100%)
 rename board/seco/common/{ => include/board-common}/mx6.h (100%)
 rename board/siemens/common/{ => include/board-common}/factoryset.h (100%)
 rename board/varisys/common/{ => include/board-common}/eeprom.h (100%)
 rename board/xes/common/{ => include/board-common}/fsl_8xxx_misc.h (100%)

--
2.6.2.402.g2635c2b

Are you going to do a new version of this series? It seems like a good idea to me and I'd like to see it applied.

Hi Simon,

On Sat, Dec 19, 2015 at 5:07 PM, Simon Glass <[email protected]> wrote:

[...]

Quoted 1 line

Quoted 2 lines

Are you going to do a new version of this series? It seems like a good idea to me and I'd like to see it applied.

As per:

https://patchwork.ozlabs.org/patch/544032/

I think we agreed to just drop the entire series.