All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location
@ 2015-11-13  5:43 Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path Nishanth Menon
                   ` (12 more replies)
  0 siblings, 13 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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

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

* [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-15 14:45   ` Igor Grinberg
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 02/12] board: BuR: Move common headers to board-common directory Nishanth Menon
                   ` (11 subsequent siblings)
  12 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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 <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Stefan Roese <sr@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 61050adb13f5..e7a3e2b4de51 100644
--- a/Makefile
+++ b/Makefile
@@ -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/
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 02/12] board: BuR: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 03/12] board: compulab: " Nishanth Menon
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/BuR
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: Joe Hershberger <joe.hershberger@ni.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Hannes Petermaier <oe5hpm@oevsv.at>
Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename board/BuR/common/{ => include/board-common}/bur_common.h (100%)

diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 441465c005ec..9ef7f3444758 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -31,7 +31,7 @@
 #ifdef CONFIG_USE_FDT
   #include <fdt_support.h>
 #endif
-#include "bur_common.h"
+#include <board-common/bur_common.h>
 #include "../../../drivers/video/am335x-fb.h"
 #include <nand.h>
 #include <fdt_simplefb.h>
diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/include/board-common/bur_common.h
similarity index 100%
rename from board/BuR/common/bur_common.h
rename to board/BuR/common/include/board-common/bur_common.h
diff --git a/board/BuR/kwb/board.c b/board/BuR/kwb/board.c
index 039ec207c26d..45b71a1ba811 100644
--- a/board/BuR/kwb/board.c
+++ b/board/BuR/kwb/board.c
@@ -25,7 +25,7 @@
 #include <asm/gpio.h>
 #include <i2c.h>
 #include <power/tps65217.h>
-#include "../common/bur_common.h"
+#include <board-common/bur_common.h>
 #include <lcd.h>
 
 /* -------------------------------------------------------------------------*/
diff --git a/board/BuR/tseries/board.c b/board/BuR/tseries/board.c
index bc119e69736e..8cd23aed52aa 100644
--- a/board/BuR/tseries/board.c
+++ b/board/BuR/tseries/board.c
@@ -26,7 +26,7 @@
 #include <asm/gpio.h>
 #include <i2c.h>
 #include <power/tps65217.h>
-#include "../common/bur_common.h"
+#include <board-common/bur_common.h>
 #include <lcd.h>
 #include <watchdog.h>
 
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 03/12] board: compulab: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 02/12] board: BuR: Move common headers to board-common directory Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 05/12] board: gdsys: " Nishanth Menon
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/compulab
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: Dmitry Lifshitz <lifshitz@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Nikita Kiryanov <nikita@compulab.co.il>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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 +-
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename board/compulab/common/{ => include/board-common}/common.h (100%)
 rename board/compulab/common/{ => include/board-common}/eeprom.h (100%)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 01871e100af3..ef50ce948f61 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -29,8 +29,8 @@
 #include <asm/gpio.h>
 #include <dm/platform_data/serial_mxc.h>
 #include "common.h"
-#include "../common/eeprom.h"
-#include "../common/common.h"
+#include <board-common/eeprom.h>
+#include <board-common/common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 428aee6d242f..b3d62472cdf2 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -18,7 +18,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 
-#include "../common/eeprom.h"
+#include <board-common/eeprom.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index ccefc40eb013..45452acf0323 100644
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -33,8 +33,8 @@
 #include <asm/ehci-omap.h>
 #include <asm/gpio.h>
 
-#include "../common/common.h"
-#include "../common/eeprom.h"
+#include <board-common/common.h>
+#include <board-common/eeprom.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/compulab/cm_t3517/cm_t3517.c b/board/compulab/cm_t3517/cm_t3517.c
index d1c74db0ade4..476cfdbbc1f6 100644
--- a/board/compulab/cm_t3517/cm_t3517.c
+++ b/board/compulab/cm_t3517/cm_t3517.c
@@ -24,8 +24,8 @@
 #include <asm/omap_musb.h>
 #include <asm/ehci-omap.h>
 
-#include "../common/common.h"
-#include "../common/eeprom.h"
+#include <board-common/common.h>
+#include <board-common/eeprom.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c
index 6d3b18ac1896..eefd813f7bae 100644
--- a/board/compulab/cm_t54/cm_t54.c
+++ b/board/compulab/cm_t54/cm_t54.c
@@ -22,7 +22,7 @@
 #include <asm/arch/ehci.h>
 #include <asm/ehci-omap.h>
 
-#include "../common/eeprom.h"
+#include <board-common/eeprom.h>
 
 #define DIE_ID_REG_BASE		(OMAP54XX_L4_CORE_BASE + 0x2000)
 #define DIE_ID_REG_OFFSET	0x200
diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c
index b25d9a20b403..7b64e40304c0 100644
--- a/board/compulab/common/common.c
+++ b/board/compulab/common/common.c
@@ -10,8 +10,8 @@
 #include <asm/bootm.h>
 #include <asm/gpio.h>
 
-#include "common.h"
-#include "eeprom.h"
+#include <board-common/common.h>
+#include <board-common/eeprom.h>
 
 void cl_print_pcb_info(void)
 {
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 630446820cc5..30aaf74d422f 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -9,7 +9,7 @@
 
 #include <common.h>
 #include <i2c.h>
-#include "eeprom.h"
+#include <board-common/eeprom.h>
 
 #ifndef CONFIG_SYS_I2C_EEPROM_ADDR
 # define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
diff --git a/board/compulab/common/common.h b/board/compulab/common/include/board-common/common.h
similarity index 100%
rename from board/compulab/common/common.h
rename to board/compulab/common/include/board-common/common.h
diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/include/board-common/eeprom.h
similarity index 100%
rename from board/compulab/common/eeprom.h
rename to board/compulab/common/include/board-common/eeprom.h
diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c
index 45616619877a..46564632db15 100644
--- a/board/compulab/common/omap3_smc911x.c
+++ b/board/compulab/common/omap3_smc911x.c
@@ -16,7 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 
-#include "common.h"
+#include <board-common/common.h>
 
 static u32 cl_omap3_smc911x_gpmc_net_config[GPMC_MAX_REG] = {
 	NET_GPMC_CONFIG1,
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 05/12] board: gdsys: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (2 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 03/12] board: compulab: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-16  8:01   ` Dirk Eibach
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 06/12] board: keymile: " Nishanth Menon
                   ` (8 subsequent siblings)
  12 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/gdsys
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: Stefan Roese <sr@denx.de>
Cc: Dirk Eibach <eibach@gdsys.de>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 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%)

diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c
index 35dfbbc577aa..c8eed0aacd90 100644
--- a/board/gdsys/405ep/dlvision-10g.c
+++ b/board/gdsys/405ep/dlvision-10g.c
@@ -15,7 +15,7 @@
 #include "405ep.h"
 #include <gdsys_fpga.h>
 
-#include "../common/osd.h"
+#include <board-common/osd.h>
 
 #define LATCH0_BASE (CONFIG_SYS_LATCH_BASE)
 #define LATCH1_BASE (CONFIG_SYS_LATCH_BASE + 0x100)
diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index 3a51d864cdb1..04799769b353 100644
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -15,9 +15,9 @@
 #include "405ep.h"
 #include <gdsys_fpga.h>
 
-#include "../common/osd.h"
-#include "../common/mclink.h"
-#include "../common/phy.h"
+#include <board-common/osd.h>
+#include <board-common/mclink.h>
+#include <board-common/phy.h>
 
 #include <i2c.h>
 #include <pca953x.h>
diff --git a/board/gdsys/common/dp501.h b/board/gdsys/common/include/board-common/dp501.h
similarity index 100%
rename from board/gdsys/common/dp501.h
rename to board/gdsys/common/include/board-common/dp501.h
diff --git a/board/gdsys/common/mclink.h b/board/gdsys/common/include/board-common/mclink.h
similarity index 100%
rename from board/gdsys/common/mclink.h
rename to board/gdsys/common/include/board-common/mclink.h
diff --git a/board/gdsys/common/osd.h b/board/gdsys/common/include/board-common/osd.h
similarity index 100%
rename from board/gdsys/common/osd.h
rename to board/gdsys/common/include/board-common/osd.h
diff --git a/board/gdsys/common/phy.h b/board/gdsys/common/include/board-common/phy.h
similarity index 100%
rename from board/gdsys/common/phy.h
rename to board/gdsys/common/include/board-common/phy.h
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 55ecdf10127e..f528a40e0c41 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -9,7 +9,7 @@
 #include <i2c.h>
 #include <malloc.h>
 
-#include "dp501.h"
+#include <board-common/dp501.h>
 #include <gdsys_fpga.h>
 
 #define CH7301_I2C_ADDR 0x75
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index e4434b3b6b71..3cbef71d5503 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -22,9 +22,9 @@
 
 #include <gdsys_fpga.h>
 
-#include "../common/osd.h"
-#include "../common/mclink.h"
-#include "../common/phy.h"
+#include <board-common/osd.h>
+#include <board-common/mclink.h>
+#include <board-common/phy.h>
 
 #include <pca953x.h>
 #include <pca9698.h>
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 64d90dd3fde0..2b1d8bafc51f 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -41,7 +41,7 @@
 #include <i2c.h>
 #include <pca9698.h>
 #include <watchdog.h>
-#include "../common/dp501.h"
+#include <board-common/dp501.h>
 #include "controlcenterd-id.h"
 
 DECLARE_GLOBAL_DATA_PTR;
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 06/12] board: keymile: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (3 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 05/12] board: gdsys: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-18 13:58   ` Valentin Longchamp
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 07/12] board: LaCie: " Nishanth Menon
                   ` (7 subsequent siblings)
  12 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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 <valentin.longchamp@keymile.com>
Cc: Holger Brunck <holger.brunck@keymile.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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%)

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index b9aff1a84dcb..4f8b68ee5ccd 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -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;
diff --git a/board/keymile/common/common.h b/board/keymile/common/include/board-common/common.h
similarity index 100%
rename from board/keymile/common/common.h
rename to board/keymile/common/include/board-common/common.h
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index 42db54221bb3..4d2963ad5f84 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -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
 
diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
index c599b4093626..73d22dc6ac19 100644
--- a/board/keymile/km82xx/km82xx.c
+++ b/board/keymile/km82xx/km82xx.c
@@ -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];
 
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 89e9e1e57c38..83deca56aebc 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -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];
 
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index c961937530ac..e702a5cf86e2 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -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)
 {
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 2938861f368f..82fa31c2208d 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -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;
 
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index eebb47fc21f1..fbe6d98af6ce 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -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;
diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
index edf3bf11a894..a4c25e084846 100644
--- a/board/keymile/kmp204x/qrio.c
+++ b/board/keymile/kmp204x/qrio.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 
-#include "../common/common.h"
+#include <board-common/common.h>
 #include "kmp204x.h"
 
 /* QRIO GPIO register offsets */
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (4 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 06/12] board: keymile: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-13 10:30   ` Simon Guinot
  2015-11-14 23:56   ` Masahiro Yamada
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 08/12] board: mpl: " Nishanth Menon
                   ` (6 subsequent siblings)
  12 siblings, 2 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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 <simon.guinot@sequanux.org>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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%)

diff --git a/board/LaCie/common/cpld-gpio-bus.c b/board/LaCie/common/cpld-gpio-bus.c
index 9b24dc535c04..92a80243c5e0 100644
--- a/board/LaCie/common/cpld-gpio-bus.c
+++ b/board/LaCie/common/cpld-gpio-bus.c
@@ -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)
 {
diff --git a/board/LaCie/common/common.h b/board/LaCie/common/include/board-common/common.h
similarity index 100%
rename from board/LaCie/common/common.h
rename to board/LaCie/common/include/board-common/common.h
diff --git a/board/LaCie/common/cpld-gpio-bus.h b/board/LaCie/common/include/board-common/cpld-gpio-bus.h
similarity index 100%
rename from board/LaCie/common/cpld-gpio-bus.h
rename to board/LaCie/common/include/board-common/cpld-gpio-bus.h
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index edf6281797bf..66d0e8502256 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -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>
 
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 263bb5426c0d..0bfe76fde334 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -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;
 
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 17e629622ff7..4ea76d152e6b 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -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;
 
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 08/12] board: mpl: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (5 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 07/12] board: LaCie: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-13  8:19   ` David Müller (ELSOFT AG)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 09/12] board: seco: " Nishanth Menon
                   ` (5 subsequent siblings)
  12 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/mpl
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: Bin Meng <bmeng.cn@gmail.com>
Cc: "David M?ller" <d.mueller@elsoft.ch>
Cc: Denis Peter <d.peter@mpl.ch>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename board/mpl/common/{ => include/board-common}/common_util.h (100%)
 rename board/mpl/common/{ => include/board-common}/isa.h (100%)

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 6b96bd526e80..5626ecdf8b48 100644
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <video_fb.h>
-#include "common_util.h"
+#include <board-common/common_util.h>
 #include <asm/processor.h>
 #include <asm/byteorder.h>
 #include <i2c.h>
diff --git a/board/mpl/common/common_util.h b/board/mpl/common/include/board-common/common_util.h
similarity index 100%
rename from board/mpl/common/common_util.h
rename to board/mpl/common/include/board-common/common_util.h
diff --git a/board/mpl/common/isa.h b/board/mpl/common/include/board-common/isa.h
similarity index 100%
rename from board/mpl/common/isa.h
rename to board/mpl/common/include/board-common/isa.h
diff --git a/board/mpl/common/isa.c b/board/mpl/common/isa.c
index 54ec66bd45b0..83628bba5d58 100644
--- a/board/mpl/common/isa.c
+++ b/board/mpl/common/isa.c
@@ -10,7 +10,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <stdio_dev.h>
-#include "isa.h"
+#include <board-common/isa.h>
 #include "piix4_pci.h"
 #include "kbd.h"
 #include "video.h"
diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c
index 1da72c53989c..cdcee1907dca 100644
--- a/board/mpl/common/kbd.c
+++ b/board/mpl/common/kbd.c
@@ -10,7 +10,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <stdio_dev.h>
-#include "isa.h"
+#include <board-common/isa.h>
 #include "kbd.h"
 
 
diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c
index cd969cb5182d..ff1822d1cc6f 100644
--- a/board/mpl/common/pci.c
+++ b/board/mpl/common/pci.c
@@ -10,7 +10,7 @@
 
 #include <common.h>
 #include <pci.h>
-#include "isa.h"
+#include <board-common/isa.h>
 
 #ifdef CONFIG_405GP
 #ifdef CONFIG_PCI
diff --git a/board/mpl/mip405/cmd_mip405.c b/board/mpl/mip405/cmd_mip405.c
index ca6f0affe48f..d71e6dbd3fbc 100644
--- a/board/mpl/mip405/cmd_mip405.c
+++ b/board/mpl/mip405/cmd_mip405.c
@@ -10,7 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include "mip405.h"
-#include "../common/common_util.h"
+#include <board-common/common_util.h>
 
 
 extern void print_mip405_info(void);
diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c
index 4a0d6966a6fa..e762f57ea1a1 100644
--- a/board/mpl/mip405/mip405.c
+++ b/board/mpl/mip405/mip405.c
@@ -51,7 +51,7 @@
 #include <asm/ppc4xx.h>
 #include <asm/ppc4xx-i2c.h>
 #include <miiphy.h>
-#include "../common/common_util.h"
+#include <board-common/common_util.h>
 #include <stdio_dev.h>
 #include <i2c.h>
 #include <rtc.h>
diff --git a/board/mpl/pip405/cmd_pip405.c b/board/mpl/pip405/cmd_pip405.c
index 43b182e57ebb..5a6e49ef07dd 100644
--- a/board/mpl/pip405/cmd_pip405.c
+++ b/board/mpl/pip405/cmd_pip405.c
@@ -10,7 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include "pip405.h"
-#include "../common/common_util.h"
+#include <board-common/common_util.h>
 
 
 extern void print_pip405_info(void);
diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c
index 7c7690ff555b..e46e8be9d9dd 100644
--- a/board/mpl/pip405/pip405.c
+++ b/board/mpl/pip405/pip405.c
@@ -12,8 +12,8 @@
 #include <asm/processor.h>
 #include <i2c.h>
 #include <stdio_dev.h>
-#include "../common/isa.h"
-#include "../common/common_util.h"
+#include <board-common/isa.h>
+#include <board-common/common_util.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c
index c2d62e4aaf4b..c70ae90e0b06 100644
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -12,7 +12,7 @@
 #include <command.h>
 #include <net.h>
 #include "vcma9.h"
-#include "../common/common_util.h"
+#include <board-common/common_util.h>
 
 #if defined(CONFIG_CS8900)
 #include <../drivers/net/cs8900.h>
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 43a3d47d2b03..2ddba0539837 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -16,7 +16,7 @@
 #include <asm/arch/s3c24x0_cpu.h>
 
 #include "vcma9.h"
-#include "../common/common_util.h"
+#include <board-common/common_util.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 09/12] board: seco: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (6 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 08/12] board: mpl: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 10/12] board: siemens: " Nishanth Menon
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/seco
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: Boris Brezillon <boris.brezillon@free-electrons.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 board/seco/common/{ => include/board-common}/mx6.h | 0
 board/seco/mx6quq7/mx6quq7.c                       | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename board/seco/common/{ => include/board-common}/mx6.h (100%)

diff --git a/board/seco/common/mx6.h b/board/seco/common/include/board-common/mx6.h
similarity index 100%
rename from board/seco/common/mx6.h
rename to board/seco/common/include/board-common/mx6.h
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index ea1d4b8e4972..fd8104c29398 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -31,7 +31,7 @@
 #include <asm/imx-common/mxc_i2c.h>
 #include <i2c.h>
 
-#include "../common/mx6.h"
+#include <board-common/mx6.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 10/12] board: siemens: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (7 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 09/12] board: seco: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-16  9:17   ` Egli, Samuel
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 11/12] board: varisys: " Nishanth Menon
                   ` (3 subsequent siblings)
  12 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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 <contact@paulk.fr>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Samuel Egli <samuel.egli@siemens.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Roger Meier <r.meier@siemens.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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%)

diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index c127f6ca271d..00f4e355720a 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -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;
 
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index 6c869ed2b035..827e2a17eb8f 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -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
diff --git a/board/siemens/common/factoryset.h b/board/siemens/common/include/board-common/factoryset.h
similarity index 100%
rename from board/siemens/common/factoryset.h
rename to board/siemens/common/include/board-common/factoryset.h
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 48823141daa3..05b10a93a342 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -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;
 
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 750f33889742..9998a3f52bf4 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -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>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index f94e3e5736f3..cafcfbd3358f 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -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

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

* [U-Boot] [PATCH V2 11/12] board: varisys: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (8 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 10/12] board: siemens: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-16  7:42   ` Andy Fleming
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 12/12] board: xes: " Nishanth Menon
                   ` (2 subsequent siblings)
  12 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/varisys
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: Alison Wang <b18965@freescale.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 board/varisys/common/{ => include/board-common}/eeprom.h | 0
 board/varisys/common/sys_eeprom.c                        | 2 +-
 board/varisys/cyrus/cyrus.c                              | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename board/varisys/common/{ => include/board-common}/eeprom.h (100%)

diff --git a/board/varisys/common/eeprom.h b/board/varisys/common/include/board-common/eeprom.h
similarity index 100%
rename from board/varisys/common/eeprom.h
rename to board/varisys/common/include/board-common/eeprom.h
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index b55ab818e698..cee0bbcf0bfb 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -16,7 +16,7 @@
 #include <i2c.h>
 #include <linux/ctype.h>
 
-#include "eeprom.h"
+#include <board-common/eeprom.h>
 
 #ifdef CONFIG_SYS_I2C_EEPROM_NXID_MAC
 #define MAX_NUM_PORTS	CONFIG_SYS_I2C_EEPROM_NXID_MAC
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index 79c363cf841a..6ce7814cb3b9 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -20,7 +20,7 @@
 #include <pci.h>
 
 #include "cyrus.h"
-#include "../common/eeprom.h"
+#include <board-common/eeprom.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 12/12] board: xes: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (9 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 11/12] board: varisys: " Nishanth Menon
@ 2015-11-13  5:43 ` Nishanth Menon
  2015-11-13  5:51 ` [U-Boot] [PATCH RESEND V2 04/12] board: freescale: " Nishanth Menon
  2015-12-19 23:07 ` [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Simon Glass
  12 siblings, 0 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:43 UTC (permalink / raw)
  To: u-boot

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/xes
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: Peter Tyser <ptyser@xes-inc.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 board/xes/common/board.c                                    | 2 +-
 board/xes/common/{ => include/board-common}/fsl_8xxx_misc.h | 0
 board/xes/xpedite517x/xpedite517x.c                         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename board/xes/common/{ => include/board-common}/fsl_8xxx_misc.h (100%)

diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index 4ed6f50e5cf8..ca156e60bec0 100644
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include "fsl_8xxx_misc.h"
+#include <board-common/fsl_8xxx_misc.h>
 
 int checkboard(void)
 {
diff --git a/board/xes/common/fsl_8xxx_misc.h b/board/xes/common/include/board-common/fsl_8xxx_misc.h
similarity index 100%
rename from board/xes/common/fsl_8xxx_misc.h
rename to board/xes/common/include/board-common/fsl_8xxx_misc.h
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 0028870db077..38c25ccf46b9 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -11,7 +11,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <pca953x.h>
-#include "../common/fsl_8xxx_misc.h"
+#include <board-common/fsl_8xxx_misc.h>
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_PCI)
 extern void ft_board_pci_setup(void *blob, bd_t *bd);
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH RESEND V2 04/12] board: freescale: Move common headers to board-common directory
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (10 preceding siblings ...)
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 12/12] board: xes: " Nishanth Menon
@ 2015-11-13  5:51 ` Nishanth Menon
  2015-12-19 23:07 ` [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Simon Glass
  12 siblings, 0 replies; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13  5:51 UTC (permalink / raw)
  To: u-boot

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/freescale
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: Minghuan Lian <Minghuan.Lian@freescale.com>
Cc: Ying Zhang <b40530@freescale.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: "?ukasz Majewski" <l.majewski@samsung.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Zhao Qiang <B45475@freescale.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: tang yuantian <Yuantian.Tang@freescale.com>
Cc: Gong Qianyu <Qianyu.Gong@freescale.com>
Cc: Suresh Gupta <suresh.gupta@freescale.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Shaveta Leekha <shaveta@freescale.com>
Cc: Chunhe Lan <Chunhe.Lan@freescale.com>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Priyanka Jain <Priyanka.Jain@freescale.com>
Cc: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Cc: Timur Tabi <timur@freescale.com>
Cc: Adrian Alonso <aalonso@freescale.com>
Cc: Peng Fan <Peng.Fan@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Dave Liu <daveliu@freescale.com>
Cc: Prabhakar Kushwaha <prabhakar@freescale.com>
Cc: Mingkai Hu <Mingkai.hu@freescale.com>
Cc: Alison Wang <alison.wang@freescale.com>
Cc: Naveen Burmi <NaveenBurmi@freescale.com>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
Too Many folks in Cc, so I am reposting with with --suppress-cc=all. Apologies on the spam

 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 +-
 88 files changed, 99 insertions(+), 99 deletions(-)
 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%)

diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c
index 6a8fca61a0d4..1d15e291a251 100644
--- a/board/freescale/b4860qds/b4860qds.c
+++ b/board/freescale/b4860qds/b4860qds.c
@@ -21,10 +21,10 @@
 #include <fm_eth.h>
 #include <hwconfig.h>
 
-#include "../common/qixis.h"
-#include "../common/vsc3316_3308.h"
-#include "../common/idt8t49n222a_serdes_clk.h"
-#include "../common/zm7300.h"
+#include <board-common/qixis.h>
+#include <board-common/vsc3316_3308.h>
+#include <board-common/idt8t49n222a_serdes_clk.h>
+#include <board-common/zm7300.h>
 #include "b4860qds.h"
 #include "b4860qds_qixis.h"
 #include "b4860qds_crossbar_con.h"
diff --git a/board/freescale/b4860qds/eth_b4860qds.c b/board/freescale/b4860qds/eth_b4860qds.c
index df90476a772c..6fc3dcce3a2f 100644
--- a/board/freescale/b4860qds/eth_b4860qds.c
+++ b/board/freescale/b4860qds/eth_b4860qds.c
@@ -28,9 +28,9 @@
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
 
-#include "../common/ngpixis.h"
-#include "../common/fman.h"
-#include "../common/qixis.h"
+#include <board-common/ngpixis.h>
+#include <board-common/fman.h>
+#include <board-common/qixis.h>
 #include "b4860qds_qixis.h"
 
 #define EMI_NONE       0xFFFFFFFF
diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c
index 3aa5a780f4bd..7b5773d5380a 100644
--- a/board/freescale/b4860qds/spl.c
+++ b/board/freescale/b4860qds/spl.c
@@ -9,7 +9,7 @@
 #include <ns16550.h>
 #include <nand.h>
 #include <i2c.h>
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "b4860qds_qixis.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c
index 586daccb4a0b..fa765a4d75f9 100644
--- a/board/freescale/bsc9132qds/bsc9132qds.c
+++ b/board/freescale/bsc9132qds/bsc9132qds.c
@@ -30,7 +30,7 @@
 #include <asm/fsl_pci.h>
 #endif
 
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index a498c65f040d..3db7b5f86f52 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -17,7 +17,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #endif
 
-#include "sleep.h"
+#include <board-common/sleep.h>
 #ifdef CONFIG_U_QE
 #include "../../../drivers/qe/qe.h"
 #endif
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index 571dfbbaada6..a937dba1ab81 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -7,7 +7,7 @@
 #include <common.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#include "cadmus.h"
+#include <board-common/cadmus.h>
 
 #if defined(CONFIG_OF_BOARD_SETUP)
 static void cds_pci_fixup(void *blob)
diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index e683be324a95..e69f676d0125 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -10,13 +10,13 @@
 #include "ics307_clk.h"
 
 #if defined(CONFIG_FSL_NGPIXIS)
-#include "ngpixis.h"
+#include <board-common/ngpixis.h>
 #define fpga_reg pixis
 #elif defined(CONFIG_FSL_QIXIS)
-#include "qixis.h"
+#include <board-common/qixis.h>
 #define fpga_reg ((struct qixis *)QIXIS_BASE)
 #else
-#include "pixis.h"
+#include <board-common/pixis.h>
 #define fpga_reg pixis
 #endif
 
diff --git a/board/freescale/common/idt8t49n222a_serdes_clk.c b/board/freescale/common/idt8t49n222a_serdes_clk.c
index d34716227735..405d9b622ac5 100644
--- a/board/freescale/common/idt8t49n222a_serdes_clk.c
+++ b/board/freescale/common/idt8t49n222a_serdes_clk.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include "idt8t49n222a_serdes_clk.h"
+#include <board-common/idt8t49n222a_serdes_clk.h>
 
 #define DEVICE_ID_REG		0x00
 
diff --git a/board/freescale/common/cadmus.h b/board/freescale/common/include/board-common/cadmus.h
similarity index 100%
rename from board/freescale/common/cadmus.h
rename to board/freescale/common/include/board-common/cadmus.h
diff --git a/board/freescale/common/dcu_sii9022a.h b/board/freescale/common/include/board-common/dcu_sii9022a.h
similarity index 100%
rename from board/freescale/common/dcu_sii9022a.h
rename to board/freescale/common/include/board-common/dcu_sii9022a.h
diff --git a/board/freescale/common/diu_ch7301.h b/board/freescale/common/include/board-common/diu_ch7301.h
similarity index 100%
rename from board/freescale/common/diu_ch7301.h
rename to board/freescale/common/include/board-common/diu_ch7301.h
diff --git a/board/freescale/common/eeprom.h b/board/freescale/common/include/board-common/eeprom.h
similarity index 100%
rename from board/freescale/common/eeprom.h
rename to board/freescale/common/include/board-common/eeprom.h
diff --git a/board/freescale/common/fman.h b/board/freescale/common/include/board-common/fman.h
similarity index 100%
rename from board/freescale/common/fman.h
rename to board/freescale/common/include/board-common/fman.h
diff --git a/board/freescale/common/idt8t49n222a_serdes_clk.h b/board/freescale/common/include/board-common/idt8t49n222a_serdes_clk.h
similarity index 100%
rename from board/freescale/common/idt8t49n222a_serdes_clk.h
rename to board/freescale/common/include/board-common/idt8t49n222a_serdes_clk.h
diff --git a/board/freescale/common/ngpixis.h b/board/freescale/common/include/board-common/ngpixis.h
similarity index 100%
rename from board/freescale/common/ngpixis.h
rename to board/freescale/common/include/board-common/ngpixis.h
diff --git a/board/freescale/common/pfuze.h b/board/freescale/common/include/board-common/pfuze.h
similarity index 100%
rename from board/freescale/common/pfuze.h
rename to board/freescale/common/include/board-common/pfuze.h
diff --git a/board/freescale/common/pixis.h b/board/freescale/common/include/board-common/pixis.h
similarity index 100%
rename from board/freescale/common/pixis.h
rename to board/freescale/common/include/board-common/pixis.h
diff --git a/board/freescale/common/pq-mds-pib.h b/board/freescale/common/include/board-common/pq-mds-pib.h
similarity index 100%
rename from board/freescale/common/pq-mds-pib.h
rename to board/freescale/common/include/board-common/pq-mds-pib.h
diff --git a/board/freescale/common/qixis.h b/board/freescale/common/include/board-common/qixis.h
similarity index 100%
rename from board/freescale/common/qixis.h
rename to board/freescale/common/include/board-common/qixis.h
diff --git a/board/freescale/common/sgmii_riser.h b/board/freescale/common/include/board-common/sgmii_riser.h
similarity index 100%
rename from board/freescale/common/sgmii_riser.h
rename to board/freescale/common/include/board-common/sgmii_riser.h
diff --git a/board/freescale/common/sleep.h b/board/freescale/common/include/board-common/sleep.h
similarity index 100%
rename from board/freescale/common/sleep.h
rename to board/freescale/common/include/board-common/sleep.h
diff --git a/board/freescale/common/via.h b/board/freescale/common/include/board-common/via.h
similarity index 100%
rename from board/freescale/common/via.h
rename to board/freescale/common/include/board-common/via.h
diff --git a/board/freescale/common/vid.h b/board/freescale/common/include/board-common/vid.h
similarity index 100%
rename from board/freescale/common/vid.h
rename to board/freescale/common/include/board-common/vid.h
diff --git a/board/freescale/common/vsc3316_3308.h b/board/freescale/common/include/board-common/vsc3316_3308.h
similarity index 100%
rename from board/freescale/common/vsc3316_3308.h
rename to board/freescale/common/include/board-common/vsc3316_3308.h
diff --git a/board/freescale/common/zm7300.h b/board/freescale/common/include/board-common/zm7300.h
similarity index 100%
rename from board/freescale/common/zm7300.h
rename to board/freescale/common/include/board-common/zm7300.h
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index e9cbd515a152..68940295211d 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -6,7 +6,7 @@
 
 #include <common.h>
 #include <asm/immap_85xx.h>
-#include "sleep.h"
+#include <board-common/sleep.h>
 #ifdef CONFIG_U_QE
 #include "../../../drivers/qe/qe.h"
 #endif
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 0cb076acc41d..badc09e0733f 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -34,7 +34,7 @@
 #include <command.h>
 #include <asm/io.h>
 
-#include "ngpixis.h"
+#include <board-common/ngpixis.h>
 
 static u8 __pixis_read(unsigned int reg)
 {
diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index 1eb37866e3d0..bf50b9eaf0c8 100644
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -12,7 +12,7 @@
 #include <i2c.h>
 #include <asm/io.h>
 
-#include "pq-mds-pib.h"
+#include <board-common/pq-mds-pib.h>
 
 int pib_init(void)
 {
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index 9f6b0e7f31ed..bd24b44a13e4 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -12,7 +12,7 @@
 #include <asm/io.h>
 #include <linux/time.h>
 #include <i2c.h>
-#include "qixis.h"
+#include <board-common/qixis.h>
 
 #ifdef CONFIG_SYS_I2C_FPGA_ADDR
 u8 qixis_read_i2c(unsigned int reg)
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 29aa778dbeca..f9cd33e27db2 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -13,7 +13,7 @@
 #include <linux/ctype.h>
 
 #ifdef CONFIG_SYS_I2C_EEPROM_CCID
-#include "../common/eeprom.h"
+#include <board-common/eeprom.h>
 #define MAX_NUM_PORTS	8
 #endif
 
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index 6b8af14e7aeb..3132adfc5b67 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -8,7 +8,7 @@
 #include <command.h>
 #include <i2c.h>
 #include <asm/immap_85xx.h>
-#include "vid.h"
+#include <board-common/vid.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/common/vsc3316_3308.c b/board/freescale/common/vsc3316_3308.c
index dd9c37ebe8fa..85fa92154b28 100644
--- a/board/freescale/common/vsc3316_3308.c
+++ b/board/freescale/common/vsc3316_3308.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include "vsc3316_3308.h"
+#include <board-common/vsc3316_3308.h>
 
 #define REVISION_ID_REG		0x7E
 #define INTERFACE_MODE_REG		0x79
diff --git a/board/freescale/common/zm7300.c b/board/freescale/common/zm7300.c
index be5953ad2d80..8b1493e60b7e 100644
--- a/board/freescale/common/zm7300.c
+++ b/board/freescale/common/zm7300.c
@@ -5,7 +5,7 @@
  */
 
 /* Power-One ZM7300 DPM */
-#include "zm7300.h"
+#include <board-common/zm7300.h>
 
 #define DPM_WP 0x96
 #define WRP_OPCODE 0x01
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 6f0fea1a3566..48d6e2e6b81a 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -18,7 +18,7 @@
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
 
-#include "../common/ngpixis.h"
+#include <board-common/ngpixis.h>
 #include "corenet_ds.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 172a55b9883b..b34f50a74764 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -57,8 +57,8 @@
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
 
-#include "../common/ngpixis.h"
-#include "../common/fman.h"
+#include <board-common/ngpixis.h>
+#include <board-common/fman.h>
 
 #ifdef CONFIG_FMAN_ENET
 
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index c68dc2c24656..571941bda035 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -22,8 +22,8 @@
 #include <miiphy.h>
 #include <phy.h>
 
-#include "../common/ngpixis.h"
-#include "../common/fman.h"
+#include <board-common/ngpixis.h>
+#include <board-common/fman.h>
 #include <fsl_dtsec.h>
 
 #define EMI_NONE	0xffffffff
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 62b163580b2d..e2b497a97931 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -57,8 +57,8 @@
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
 
-#include "../common/ngpixis.h"
-#include "../common/fman.h"
+#include <board-common/ngpixis.h>
+#include <board-common/fman.h>
 
 #ifdef CONFIG_FMAN_ENET
 
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index 90f5bc044523..24a999c59686 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -11,7 +11,7 @@
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
 #include "div64.h"
-#include "../common/diu_ch7301.h"
+#include <board-common/diu_ch7301.h>
 #include "ls1021aqds_qixis.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index be351befec06..7b2b2310ac29 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -21,8 +21,8 @@
 #include <tsec.h>
 #include <malloc.h>
 
-#include "../common/sgmii_riser.h"
-#include "../common/qixis.h"
+#include <board-common/sgmii_riser.h>
+#include <board-common/qixis.h>
 
 #define EMI1_MASK       0x1f
 #define EMI1_RGMII0     1
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index d889ad50fd04..cb73d0824314 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -22,8 +22,8 @@
 #include <spl.h>
 #include <fsl_devdis.h>
 
-#include "../common/sleep.h"
-#include "../common/qixis.h"
+#include <board-common/sleep.h>
+#include <board-common/qixis.h>
 #include "ls1021aqds_qixis.h"
 #ifdef CONFIG_U_QE
 #include "../../../drivers/qe/qe.h"
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index 8fe4ccbeb401..e1f7055f5dc0 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -9,7 +9,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include "div64.h"
-#include "../common/dcu_sii9022a.h"
+#include <board-common/dcu_sii9022a.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 4918c1192e2b..461ca1dcab95 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -25,7 +25,7 @@
 #include <fsl_sec.h>
 #include <fsl_devdis.h>
 #include <spl.h>
-#include "../common/sleep.h"
+#include <board-common/sleep.h>
 #ifdef CONFIG_U_QE
 #include "../../../drivers/qe/qe.h"
 #endif
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index 61f2b5d4471f..4aba48c06d92 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -11,7 +11,7 @@
 #include <fsl_mdio.h>
 #include <malloc.h>
 
-#include "../common/fman.h"
+#include <board-common/fman.h>
 
 int board_eth_init(bd_t *bis)
 {
diff --git a/board/freescale/ls2085aqds/eth.c b/board/freescale/ls2085aqds/eth.c
index b8a2bf49e685..96f467e97d32 100644
--- a/board/freescale/ls2085aqds/eth.c
+++ b/board/freescale/ls2085aqds/eth.c
@@ -16,7 +16,7 @@
 #include <miiphy.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 
 #include "ls2085aqds_qixis.h"
 
diff --git a/board/freescale/ls2085aqds/ls2085aqds.c b/board/freescale/ls2085aqds/ls2085aqds.c
index b02d6e86b43f..d7c603cb0325 100644
--- a/board/freescale/ls2085aqds/ls2085aqds.c
+++ b/board/freescale/ls2085aqds/ls2085aqds.c
@@ -20,7 +20,7 @@
 #include <asm/arch/soc.h>
 #include <hwconfig.h>
 
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "ls2085aqds_qixis.h"
 
 #define PIN_MUX_SEL_SDHC	0x00
diff --git a/board/freescale/ls2085ardb/ls2085ardb.c b/board/freescale/ls2085ardb/ls2085ardb.c
index 18953b8ecbfd..4795ab9dbec2 100644
--- a/board/freescale/ls2085ardb/ls2085ardb.c
+++ b/board/freescale/ls2085ardb/ls2085ardb.c
@@ -19,7 +19,7 @@
 #include <i2c.h>
 #include <asm/arch/soc.h>
 
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "ls2085ardb_qixis.h"
 
 #define PIN_MUX_SEL_SDHC	0x00
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index adf425486e1e..5e0bdc973776 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -20,7 +20,7 @@
 #include <libfdt.h>
 #endif
 #if defined(CONFIG_PQ_MDS_PIB)
-#include "../common/pq-mds-pib.h"
+#include <board-common/pq-mds-pib.h>
 #endif
 
 const qe_iop_conf_t qe_iop_conf_tab[] = {
diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c
index e8b2b11d88b0..8c9ccde08744 100644
--- a/board/freescale/mpc832xemds/pci.c
+++ b/board/freescale/mpc832xemds/pci.c
@@ -14,7 +14,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
-#include "../common/pq-mds-pib.h"
+#include <board-common/pq-mds-pib.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 572913c7ac52..114fbb5bf376 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -18,7 +18,7 @@
 #include <fsl_mdio.h>
 #include <phy.h>
 #include "pci.h"
-#include "../common/pq-mds-pib.h"
+#include <board-common/pq-mds-pib.h>
 
 int board_early_init_f(void)
 {
diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c
index 7b0f46197147..646317a53a86 100644
--- a/board/freescale/mpc8536ds/mpc8536ds.c
+++ b/board/freescale/mpc8536ds/mpc8536ds.c
@@ -25,7 +25,7 @@
 #include <netdev.h>
 #include <sata.h>
 
-#include "../common/sgmii_riser.h"
+#include <board-common/sgmii_riser.h>
 
 int board_early_init_f (void)
 {
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 7b264dddd157..a63a1b5beecd 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -17,9 +17,9 @@
 #include <libfdt.h>
 #include <fdt_support.h>
 
-#include "../common/cadmus.h"
-#include "../common/eeprom.h"
-#include "../common/via.h"
+#include <board-common/cadmus.h>
+#include <board-common/eeprom.h>
+#include <board-common/via.h>
 
 #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
 extern void ddr_enable_ecc(unsigned int dram_size);
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 66fb228a9089..9cc116c117cb 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -21,7 +21,7 @@
 #include <tsec.h>
 #include <netdev.h>
 
-#include "../common/sgmii_riser.h"
+#include <board-common/sgmii_riser.h>
 
 int checkboard (void)
 {
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index ca9b43c6b621..2f1aed2d12c6 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -21,9 +21,9 @@
 #include <fsl_mdio.h>
 #include <netdev.h>
 
-#include "../common/cadmus.h"
-#include "../common/eeprom.h"
-#include "../common/via.h"
+#include <board-common/cadmus.h>
+#include <board-common/eeprom.h>
+#include <board-common/via.h>
 
 void local_bus_init(void);
 
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index de5f5669e62f..55c4efd83936 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -15,9 +15,9 @@
 #include <libfdt.h>
 #include <fdt_support.h>
 
-#include "../common/cadmus.h"
-#include "../common/eeprom.h"
-#include "../common/via.h"
+#include <board-common/cadmus.h>
+#include <board-common/eeprom.h>
+#include <board-common/via.h>
 
 #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
 extern void ddr_enable_ecc(unsigned int dram_size);
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 836578f3cb82..760f8607659e 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -27,7 +27,7 @@
 
 #include "bcsr.h"
 #if defined(CONFIG_PQ_MDS_PIB)
-#include "../common/pq-mds-pib.h"
+#include <board-common/pq-mds-pib.h>
 #endif
 
 const qe_iop_conf_t qe_iop_conf_tab[] = {
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index 3f68cf496a45..44bd9676df9a 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -22,7 +22,7 @@
 #include <fsl_mdio.h>
 #include <netdev.h>
 
-#include "../common/sgmii_riser.h"
+#include <board-common/sgmii_riser.h>
 
 int checkboard (void)
 {
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 8f4183b82916..5c561955110d 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -12,7 +12,7 @@
 #include <command.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
-#include "../common/pixis.h"
+#include <board-common/pixis.h>
 
 #define PX_BRDCFG0_DLINK	0x10
 #define PX_BRDCFG0_DVISEL	0x08
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
index 7c0e90ad0bc0..2ef52e7fc304 100644
--- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
+++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
@@ -30,7 +30,7 @@
 #include <pca953x.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
-#include "../common/pfuze.h"
+#include <board-common/pfuze.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 564416700857..40b4315060c4 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -27,7 +27,7 @@
 #include <i2c.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
-#include "../common/pfuze.h"
+#include <board-common/pfuze.h>
 #include <asm/arch/mx6-ddr.h>
 #include <usb.h>
 
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 6ba604e70753..7c1702062804 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -26,7 +26,7 @@
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
-#include "../common/pfuze.h"
+#include <board-common/pfuze.h>
 #include <usb.h>
 #include <usb/ehci-fsl.h>
 
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index b9af7e7b959b..4c25b2bf9a94 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -25,7 +25,7 @@
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
-#include "../common/pfuze.h"
+#include <board-common/pfuze.h>
 #include <usb.h>
 #include <usb/ehci-fsl.h>
 
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 8650f350f3eb..1dbf6d22f884 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -25,7 +25,7 @@
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
-#include "../common/pfuze.h"
+#include <board-common/pfuze.h>
 #include <usb.h>
 #include <usb/ehci-fsl.h>
 
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index ee9890b59905..f2209aea81bb 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -19,7 +19,7 @@
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
-#include "../common/pfuze.h"
+#include <board-common/pfuze.h>
 #include <i2c.h>
 #include <asm/imx-common/mxc_i2c.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c
index 6fd4d953b6e6..8e11823ae3e3 100644
--- a/board/freescale/p1022ds/diu.c
+++ b/board/freescale/p1022ds/diu.c
@@ -13,7 +13,7 @@
 #include <asm/io.h>
 #include <stdio_dev.h>
 #include <video_fb.h>
-#include "../common/ngpixis.h"
+#include <board-common/ngpixis.h>
 #include <fsl_diu_fb.h>
 
 /* The CTL register is called 'csr' in the ngpixis_t structure */
diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c
index d7dd478dff90..81fdec0ec7cb 100644
--- a/board/freescale/p1022ds/p1022ds.c
+++ b/board/freescale/p1022ds/p1022ds.c
@@ -26,7 +26,7 @@
 #include <i2c.h>
 #include <hwconfig.h>
 
-#include "../common/ngpixis.h"
+#include <board-common/ngpixis.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index 7bd9d296ee0d..42d588e21215 100644
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -10,7 +10,7 @@
 #include <mmc.h>
 #include <nand.h>
 #include <i2c.h>
-#include "../common/ngpixis.h"
+#include <board-common/ngpixis.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 95fe85bbfaa2..84017c4c6f0b 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -22,7 +22,7 @@
 #include <fsl_dtsec.h>
 
 #include "cpld.h"
-#include "../common/fman.h"
+#include <board-common/fman.h>
 
 #ifdef CONFIG_FMAN_ENET
 /*
diff --git a/board/freescale/t102xqds/eth_t102xqds.c b/board/freescale/t102xqds/eth_t102xqds.c
index 99c23f79f471..a99d655d8e97 100644
--- a/board/freescale/t102xqds/eth_t102xqds.c
+++ b/board/freescale/t102xqds/eth_t102xqds.c
@@ -23,8 +23,8 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
-#include "../common/qixis.h"
-#include "../common/fman.h"
+#include <board-common/qixis.h>
+#include <board-common/fman.h>
 #include "t102xqds_qixis.h"
 
 #define EMI_NONE	0xFFFFFFFF
diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c
index 08aef6e15971..1d93edc2545f 100644
--- a/board/freescale/t102xqds/spl.c
+++ b/board/freescale/t102xqds/spl.c
@@ -11,7 +11,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "t102xqds_qixis.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c
index 708afcaebfac..df634c0c3052 100644
--- a/board/freescale/t102xqds/t102xqds.c
+++ b/board/freescale/t102xqds/t102xqds.c
@@ -19,10 +19,10 @@
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
 #include <hwconfig.h>
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "t102xqds.h"
 #include "t102xqds_qixis.h"
-#include "../common/sleep.h"
+#include <board-common/sleep.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index 02b283d26ff0..36af0f17e426 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -23,7 +23,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
-#include "../common/fman.h"
+#include <board-common/fman.h>
 
 int board_eth_init(bd_t *bis)
 {
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 9c581ff88e08..70f162e6fd56 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -11,7 +11,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
-#include "../common/sleep.h"
+#include <board-common/sleep.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index fddd240f98a4..878e91d17db8 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -24,7 +24,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #endif
-#include "../common/sleep.h"
+#include <board-common/sleep.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t1040qds/diu.c b/board/freescale/t1040qds/diu.c
index 021422470734..819f059c59b7 100644
--- a/board/freescale/t1040qds/diu.c
+++ b/board/freescale/t1040qds/diu.c
@@ -12,8 +12,8 @@
 #include <stdio_dev.h>
 #include <video_fb.h>
 #include <fsl_diu_fb.h>
-#include "../common/qixis.h"
-#include "../common/diu_ch7301.h"
+#include <board-common/qixis.h>
+#include <board-common/diu_ch7301.h>
 #include "t1040qds.h"
 #include "t1040qds_qixis.h"
 
diff --git a/board/freescale/t1040qds/eth.c b/board/freescale/t1040qds/eth.c
index 8bf34fa79ac6..a5846dbe5cb5 100644
--- a/board/freescale/t1040qds/eth.c
+++ b/board/freescale/t1040qds/eth.c
@@ -20,8 +20,8 @@
 #include <fsl_dtsec.h>
 #include <vsc9953.h>
 
-#include "../common/fman.h"
-#include "../common/qixis.h"
+#include <board-common/fman.h>
+#include <board-common/qixis.h>
 
 #include "t1040qds_qixis.h"
 
diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c
index eaca57fc5dfe..377fabd23328 100644
--- a/board/freescale/t1040qds/t1040qds.c
+++ b/board/freescale/t1040qds/t1040qds.c
@@ -20,8 +20,8 @@
 #include <fm_eth.h>
 #include <hwconfig.h>
 
-#include "../common/sleep.h"
-#include "../common/qixis.h"
+#include <board-common/sleep.h>
+#include <board-common/qixis.h>
 #include "t1040qds.h"
 #include "t1040qds_qixis.h"
 
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index 3285bef546de..bca0ff16626c 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -12,7 +12,7 @@
 #include <linux/ctype.h>
 #include <video_fb.h>
 
-#include "../common/diu_ch7301.h"
+#include <board-common/diu_ch7301.h>
 
 #include "cpld.h"
 #include "t104xrdb.h"
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index 52cd1122493b..539eefb04186 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -14,7 +14,7 @@
 #include <fsl_dtsec.h>
 #include <vsc9953.h>
 
-#include "../common/fman.h"
+#include <board-common/fman.h>
 
 int board_eth_init(bd_t *bis)
 {
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 4e8735b9ff19..87b2f417203f 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -11,7 +11,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
-#include "../common/sleep.h"
+#include <board-common/sleep.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 322765288b08..fda9256b4109 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -19,7 +19,7 @@
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
-#include "../common/sleep.h"
+#include <board-common/sleep.h>
 #include "t104xrdb.h"
 #include "cpld.h"
 
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index 1c0ce2492ca2..922b5d5438e9 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -24,8 +24,8 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
-#include "../common/qixis.h"
-#include "../common/fman.h"
+#include <board-common/qixis.h>
+#include <board-common/fman.h>
 #include "t208xqds_qixis.h"
 
 #define EMI_NONE	0xFFFFFFFF
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index a71c6171218c..93ef1d861f8c 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -11,7 +11,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "t208xqds_qixis.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index 7c89cd5ee9a0..701b230c9a2e 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -18,9 +18,9 @@
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
 
-#include "../common/qixis.h"
-#include "../common/vsc3316_3308.h"
-#include "../common/vid.h"
+#include <board-common/qixis.h>
+#include <board-common/vsc3316_3308.h>
+#include <board-common/vid.h>
 #include "t208xqds.h"
 #include "t208xqds_qixis.h"
 
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index 0c2c1c565bdd..1629b28f7829 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -19,7 +19,7 @@
 #include <fm_eth.h>
 #include "t208xrdb.h"
 #include "cpld.h"
-#include "../common/vid.h"
+#include <board-common/vid.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t4qds/eth.c b/board/freescale/t4qds/eth.c
index 2dfdcbbd398e..dd519621081b 100644
--- a/board/freescale/t4qds/eth.c
+++ b/board/freescale/t4qds/eth.c
@@ -24,8 +24,8 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
-#include "../common/qixis.h"
-#include "../common/fman.h"
+#include <board-common/qixis.h>
+#include <board-common/fman.h>
 
 #include "t4240qds_qixis.h"
 
diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c
index 0c6156e7f09b..3ea0620f82b1 100644
--- a/board/freescale/t4qds/spl.c
+++ b/board/freescale/t4qds/spl.c
@@ -11,7 +11,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
-#include "../common/qixis.h"
+#include <board-common/qixis.h>
 #include "t4240qds_qixis.h"
 
 #define FSL_CORENET_CCSR_PORSR1_RCW_MASK	0xFF800000
diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c
index 4f2cccd709d6..25ccbdcceb26 100644
--- a/board/freescale/t4qds/t4240qds.c
+++ b/board/freescale/t4qds/t4240qds.c
@@ -19,8 +19,8 @@
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
 
-#include "../common/qixis.h"
-#include "../common/vsc3316_3308.h"
+#include <board-common/qixis.h>
+#include <board-common/vsc3316_3308.h>
 #include "t4qds.h"
 #include "t4240qds_qixis.h"
 
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index e563a6169aec..758507a4846d 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -27,7 +27,7 @@
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
 
-#include "../common/fman.h"
+#include <board-common/fman.h>
 #include "t4rdb.h"
 
 void fdt_fixup_board_enet(void *fdt)
-- 
2.6.2.402.g2635c2b

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

* [U-Boot] [PATCH V2 08/12] board: mpl: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 08/12] board: mpl: " Nishanth Menon
@ 2015-11-13  8:19   ` David Müller (ELSOFT AG)
  2015-11-13 14:02     ` Tom Rini
  0 siblings, 1 reply; 35+ messages in thread
From: David Müller (ELSOFT AG) @ 2015-11-13  8:19 UTC (permalink / raw)
  To: u-boot

Hello

Nishanth Menon wrote:
> 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%)

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?

Dave

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 07/12] board: LaCie: " Nishanth Menon
@ 2015-11-13 10:30   ` Simon Guinot
  2015-11-13 14:06     ` Tom Rini
  2015-11-14 23:56   ` Masahiro Yamada
  1 sibling, 1 reply; 35+ messages in thread
From: Simon Guinot @ 2015-11-13 10:30 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,

On Thu, Nov 12, 2015 at 11:43:37PM -0600, Nishanth Menon wrote:
> 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 <simon.guinot@sequanux.org>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>  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 ?

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

Thanks,

Simon

>  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%)
> 
> diff --git a/board/LaCie/common/cpld-gpio-bus.c b/board/LaCie/common/cpld-gpio-bus.c
> index 9b24dc535c04..92a80243c5e0 100644
> --- a/board/LaCie/common/cpld-gpio-bus.c
> +++ b/board/LaCie/common/cpld-gpio-bus.c
> @@ -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)
>  {
> diff --git a/board/LaCie/common/common.h b/board/LaCie/common/include/board-common/common.h
> similarity index 100%
> rename from board/LaCie/common/common.h
> rename to board/LaCie/common/include/board-common/common.h
> diff --git a/board/LaCie/common/cpld-gpio-bus.h b/board/LaCie/common/include/board-common/cpld-gpio-bus.h
> similarity index 100%
> rename from board/LaCie/common/cpld-gpio-bus.h
> rename to board/LaCie/common/include/board-common/cpld-gpio-bus.h
> diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
> index edf6281797bf..66d0e8502256 100644
> --- a/board/LaCie/edminiv2/edminiv2.c
> +++ b/board/LaCie/edminiv2/edminiv2.c
> @@ -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>
>  
> diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
> index 263bb5426c0d..0bfe76fde334 100644
> --- a/board/LaCie/net2big_v2/net2big_v2.c
> +++ b/board/LaCie/net2big_v2/net2big_v2.c
> @@ -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;
>  
> diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
> index 17e629622ff7..4ea76d152e6b 100644
> --- a/board/LaCie/netspace_v2/netspace_v2.c
> +++ b/board/LaCie/netspace_v2/netspace_v2.c
> @@ -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;
>  
> -- 
> 2.6.2.402.g2635c2b
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151113/8f411315/attachment.sig>

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

* [U-Boot] [PATCH V2 08/12] board: mpl: Move common headers to board-common directory
  2015-11-13  8:19   ` David Müller (ELSOFT AG)
@ 2015-11-13 14:02     ` Tom Rini
  0 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2015-11-13 14:02 UTC (permalink / raw)
  To: u-boot

On Fri, Nov 13, 2015 at 09:19:32AM +0100, David M?ller (ELSOFT AG) wrote:
> Hello
> 
> Nishanth Menon wrote:
> > 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%)
> 
> 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.

The gain here is to make it easy and consistent in how we access and
store things which are common to a vendor, but say spread over SoCs (and
even architectures).  We have a few ad-hoc methods today and Nishanth is
consolidating things after another thread we just had.

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

If we run into two vendors having the same header file, and it being
needed in common code (rather than vendor-common code) then we've put
information in the wrong place.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151113/c1788e47/attachment.sig>

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13 10:30   ` Simon Guinot
@ 2015-11-13 14:06     ` Tom Rini
  2015-11-13 15:32       ` Simon Guinot
  0 siblings, 1 reply; 35+ messages in thread
From: Tom Rini @ 2015-11-13 14:06 UTC (permalink / raw)
  To: u-boot

On Fri, Nov 13, 2015 at 11:30:43AM +0100, Simon Guinot wrote:
> Hi Nishanth,
> 
> On Thu, Nov 12, 2015 at 11:43:37PM -0600, Nishanth Menon wrote:
> > 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 <simon.guinot@sequanux.org>
> > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> > 
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > ---
> >  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 ?
> 
> >  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.

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

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151113/0a43981f/attachment.sig>

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13 14:06     ` Tom Rini
@ 2015-11-13 15:32       ` Simon Guinot
  2015-11-13 23:57         ` Nishanth Menon
  0 siblings, 1 reply; 35+ messages in thread
From: Simon Guinot @ 2015-11-13 15:32 UTC (permalink / raw)
  To: u-boot

On Fri, Nov 13, 2015 at 09:06:45AM -0500, Tom Rini wrote:
> On Fri, Nov 13, 2015 at 11:30:43AM +0100, Simon Guinot wrote:
> > Hi Nishanth,
> > 
> > On Thu, Nov 12, 2015 at 11:43:37PM -0600, Nishanth Menon wrote:
> > > 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 <simon.guinot@sequanux.org>
> > > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> > > 
> > > Signed-off-by: Nishanth Menon <nm@ti.com>
> > > ---
> > >  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 ?
> > 
> > >  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.
> 
> 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.

Thanks,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151113/2bb814f0/attachment.sig>

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13 15:32       ` Simon Guinot
@ 2015-11-13 23:57         ` Nishanth Menon
  2015-11-14  2:05           ` Simon Glass
  0 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-13 23:57 UTC (permalink / raw)
  To: u-boot

On 11/13/2015 09:32 AM, Simon Guinot wrote:
> On Fri, Nov 13, 2015 at 09:06:45AM -0500, Tom Rini wrote:
>> On Fri, Nov 13, 2015 at 11:30:43AM +0100, Simon Guinot wrote:
>>> Hi Nishanth,
>>>
>>> On Thu, Nov 12, 2015 at 11:43:37PM -0600, Nishanth Menon wrote:
>>>> 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 <simon.guinot@sequanux.org>
>>>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>>>>
>>>> Signed-off-by: Nishanth Menon <nm@ti.com>
>>>> ---
>>>>  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 ?
>>>
>>>>  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.
>>
>> 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.
> 

Thanks.

> 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

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.

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

-- 
Regards,
Nishanth Menon

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13 23:57         ` Nishanth Menon
@ 2015-11-14  2:05           ` Simon Glass
  2015-11-16  1:53             ` Tom Rini
  0 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2015-11-14  2:05 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,

On 13 November 2015 at 16:57, Nishanth Menon <nm@ti.com> wrote:
> On 11/13/2015 09:32 AM, Simon Guinot wrote:
>> On Fri, Nov 13, 2015 at 09:06:45AM -0500, Tom Rini wrote:
>>> On Fri, Nov 13, 2015 at 11:30:43AM +0100, Simon Guinot wrote:
>>>> Hi Nishanth,
>>>>
>>>> On Thu, Nov 12, 2015 at 11:43:37PM -0600, Nishanth Menon wrote:
>>>>> 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 <simon.guinot@sequanux.org>
>>>>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>>>>>
>>>>> Signed-off-by: Nishanth Menon <nm@ti.com>
>>>>> ---
>>>>>  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 ?
>>>>
>>>>>  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.
>>>
>>> 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.
>>
>
> Thanks.
>
>> 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
>
> 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.
>
>>
>> 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?

Yes.

- Simon

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 07/12] board: LaCie: " Nishanth Menon
  2015-11-13 10:30   ` Simon Guinot
@ 2015-11-14 23:56   ` Masahiro Yamada
  2015-11-15  5:38     ` Nishanth Menon
  1 sibling, 1 reply; 35+ messages in thread
From: Masahiro Yamada @ 2015-11-14 23:56 UTC (permalink / raw)
  To: u-boot

2015-11-13 14:43 GMT+09:00 Nishanth Menon <nm@ti.com>:
> 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 <simon.guinot@sequanux.org>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---


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.



-- 
Best Regards
Masahiro Yamada

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-14 23:56   ` Masahiro Yamada
@ 2015-11-15  5:38     ` Nishanth Menon
  2015-11-16  3:32       ` Masahiro Yamada
  0 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-15  5:38 UTC (permalink / raw)
  To: u-boot

On 11/14/2015 05:56 PM, Masahiro Yamada wrote:
> 2015-11-13 14:43 GMT+09:00 Nishanth Menon <nm@ti.com>:
>> 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 <simon.guinot@sequanux.org>
>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>>
>> Signed-off-by: Nishanth Menon <nm@ti.com>
>> ---
> 
> 
> 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.

> or
>   replace "bar.h" with <board-common/bar.h>
yes - for board/common headers which are exposed.

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

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


-- 
Regards,
Nishanth Menon

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

* [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path Nishanth Menon
@ 2015-11-15 14:45   ` Igor Grinberg
  0 siblings, 0 replies; 35+ messages in thread
From: Igor Grinberg @ 2015-11-15 14:45 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,

On 11/13/15 07:43, Nishanth Menon wrote:
> 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

I would agree with Simon - no need for additional /common/ in the path.

> 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 <sjg@chromium.org>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Michal Marek <mmarek@suse.cz>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>  Makefile | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 61050adb13f5..e7a3e2b4de51 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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/
> 

-- 
Regards,
Igor.

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-14  2:05           ` Simon Glass
@ 2015-11-16  1:53             ` Tom Rini
  0 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2015-11-16  1:53 UTC (permalink / raw)
  To: u-boot

On Fri, Nov 13, 2015 at 07:05:40PM -0700, Simon Glass wrote:
> Hi Nishanth,
> 
> On 13 November 2015 at 16:57, Nishanth Menon <nm@ti.com> wrote:
> > On 11/13/2015 09:32 AM, Simon Guinot wrote:
> >> On Fri, Nov 13, 2015 at 09:06:45AM -0500, Tom Rini wrote:
> >>> On Fri, Nov 13, 2015 at 11:30:43AM +0100, Simon Guinot wrote:
> >>>> Hi Nishanth,
> >>>>
> >>>> On Thu, Nov 12, 2015 at 11:43:37PM -0600, Nishanth Menon wrote:
> >>>>> 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 <simon.guinot@sequanux.org>
> >>>>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> >>>>>
> >>>>> Signed-off-by: Nishanth Menon <nm@ti.com>
> >>>>> ---
> >>>>>  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 ?
> >>>>
> >>>>>  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.
> >>>
> >>> 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.
> >>
> >
> > Thanks.
> >
> >> 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
> >
> > 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.
> >
> >>
> >> 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?
> 
> Yes.

Also Yes.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151115/80a42c48/attachment.sig>

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-15  5:38     ` Nishanth Menon
@ 2015-11-16  3:32       ` Masahiro Yamada
  2015-11-16 15:34         ` Nishanth Menon
  0 siblings, 1 reply; 35+ messages in thread
From: Masahiro Yamada @ 2015-11-16  3:32 UTC (permalink / raw)
  To: u-boot

2015-11-15 14:38 GMT+09:00 Nishanth Menon <nm@ti.com>:
> On 11/14/2015 05:56 PM, Masahiro Yamada wrote:
>> 2015-11-13 14:43 GMT+09:00 Nishanth Menon <nm@ti.com>:
>>> 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 <simon.guinot@sequanux.org>
>>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>>>
>>> Signed-off-by: Nishanth Menon <nm@ti.com>
>>> ---
>>
>>
>> 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.
>
>> or
>>   replace "bar.h" with <board-common/bar.h>
> yes - for board/common headers which are exposed.
>
>>
>> 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.
>
>> 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?
>


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






-- 
Best Regards
Masahiro Yamada

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

* [U-Boot] [PATCH V2 11/12] board: varisys: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 11/12] board: varisys: " Nishanth Menon
@ 2015-11-16  7:42   ` Andy Fleming
  0 siblings, 0 replies; 35+ messages in thread
From: Andy Fleming @ 2015-11-16  7:42 UTC (permalink / raw)
  To: u-boot

On Thu, Nov 12, 2015 at 11:43 PM, Nishanth Menon <nm@ti.com> wrote:
> Header files can be located in a generic location without
> needing to reference them with ../common/

> diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
> index 79c363cf841a..6ce7814cb3b9 100644
> --- a/board/varisys/cyrus/cyrus.c
> +++ b/board/varisys/cyrus/cyrus.c
> @@ -20,7 +20,7 @@
>  #include <pci.h>
>
>  #include "cyrus.h"
> -#include "../common/eeprom.h"
> +#include <board-common/eeprom.h>


Acked-by: Andy Fleming <afleming@gmail.com>

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

* [U-Boot] [PATCH V2 05/12] board: gdsys: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 05/12] board: gdsys: " Nishanth Menon
@ 2015-11-16  8:01   ` Dirk Eibach
  2015-11-16  8:04     ` Dirk Eibach
  0 siblings, 1 reply; 35+ messages in thread
From: Dirk Eibach @ 2015-11-16  8:01 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,

Am 13.11.2015 06:43 schrieb "Nishanth Menon" <nm@ti.com>:
>
> Header files can be located in a generic location without
> needing to reference them with ../common/

sorry, I just don't get it. You collect vendor specific include files
and put them in a common directory to avoid including relative paths.
What is the problem with realtive paths? And is it really a good idea
to throw random files together in a common directory? Our vendor
filenames are pretty generic, and you cannot determine which files are
from wich vendor. I am not convinced, that this is agood idea.

Cheers
Dirk

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

* [U-Boot] [PATCH V2 05/12] board: gdsys: Move common headers to board-common directory
  2015-11-16  8:01   ` Dirk Eibach
@ 2015-11-16  8:04     ` Dirk Eibach
  0 siblings, 0 replies; 35+ messages in thread
From: Dirk Eibach @ 2015-11-16  8:04 UTC (permalink / raw)
  To: u-boot

Sorry for the noise,  I just saw that there is already some discussion on this.

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

* [U-Boot] [PATCH V2 10/12] board: siemens: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 10/12] board: siemens: " Nishanth Menon
@ 2015-11-16  9:17   ` Egli, Samuel
  0 siblings, 0 replies; 35+ messages in thread
From: Egli, Samuel @ 2015-11-16  9:17 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,
this patch doesn't work for me. I applied the patch on top of 439fcb9b4f717f5a583014acb3e75b789564867c.

Running ./MAKEALL -v siemens

>[...]
>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

All boards using board-common/factoryset.h fail with the same error like in the snippet above from "rut" board.

Regards,
Sam


> -----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 <contact@paulk.fr>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Samuel Egli <samuel.egli@siemens.com>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Roger Meier <r.meier@siemens.com>
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>  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%)
> 
> diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
> index c127f6ca271d..00f4e355720a 100644
> --- a/board/siemens/common/board.c
> +++ b/board/siemens/common/board.c
> @@ -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;
> 
> diff --git a/board/siemens/common/factoryset.c
> b/board/siemens/common/factoryset.c
> index 6c869ed2b035..827e2a17eb8f 100644
> --- a/board/siemens/common/factoryset.c
> +++ b/board/siemens/common/factoryset.c
> @@ -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
> diff --git a/board/siemens/common/factoryset.h
> b/board/siemens/common/include/board-common/factoryset.h
> similarity index 100%
> rename from board/siemens/common/factoryset.h rename to
> board/siemens/common/include/board-common/factoryset.h
> diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
> index 48823141daa3..05b10a93a342 100644
> --- a/board/siemens/draco/board.c
> +++ b/board/siemens/draco/board.c
> @@ -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;
> 
> diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index
> 750f33889742..9998a3f52bf4 100644
> --- a/board/siemens/pxm2/board.c
> +++ b/board/siemens/pxm2/board.c
> @@ -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>
> diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index
> f94e3e5736f3..cafcfbd3358f 100644
> --- a/board/siemens/rut/board.c
> +++ b/board/siemens/rut/board.c
> @@ -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

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-16  3:32       ` Masahiro Yamada
@ 2015-11-16 15:34         ` Nishanth Menon
  2015-11-17  0:45           ` Tom Rini
  0 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-11-16 15:34 UTC (permalink / raw)
  To: u-boot

On 11/15/2015 09:32 PM, Masahiro Yamada wrote:
> 2015-11-15 14:38 GMT+09:00 Nishanth Menon <nm@ti.com>:
>> On 11/14/2015 05:56 PM, Masahiro Yamada wrote:
>>> 2015-11-13 14:43 GMT+09:00 Nishanth Menon <nm@ti.com>:
>>>> 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 <simon.guinot@sequanux.org>
>>>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
>>>>
>>>> Signed-off-by: Nishanth Menon <nm@ti.com>
>>>> ---
>>>
>>>
>>> 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.
>>
>>> or
>>>   replace "bar.h" with <board-common/bar.h>
>> yes - for board/common headers which are exposed.
>>
>>>
>>> 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.
>>
>>> 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?
>>
> 
> 
> 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
> 

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.

-- 
Regards,
Nishanth Menon

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

* [U-Boot] [PATCH V2 07/12] board: LaCie: Move common headers to board-common directory
  2015-11-16 15:34         ` Nishanth Menon
@ 2015-11-17  0:45           ` Tom Rini
  0 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2015-11-17  0:45 UTC (permalink / raw)
  To: u-boot

On Mon, Nov 16, 2015 at 09:34:07AM -0600, Nishanth Menon wrote:
> On 11/15/2015 09:32 PM, Masahiro Yamada wrote:
> > 2015-11-15 14:38 GMT+09:00 Nishanth Menon <nm@ti.com>:
> >> On 11/14/2015 05:56 PM, Masahiro Yamada wrote:
> >>> 2015-11-13 14:43 GMT+09:00 Nishanth Menon <nm@ti.com>:
> >>>> 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 <simon.guinot@sequanux.org>
> >>>> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> >>>>
> >>>> Signed-off-by: Nishanth Menon <nm@ti.com>
> >>>> ---
> >>>
> >>>
> >>> 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.
> >>
> >>> or
> >>>   replace "bar.h" with <board-common/bar.h>
> >> yes - for board/common headers which are exposed.
> >>
> >>>
> >>> 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.
> >>
> >>> 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?
> >>
> > 
> > 
> > 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
> > 
> 
> 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.

So I think I see the point that Masahiro (and others) are making and it
makes sense, sorry for not seeing it earlier myself.  Since we have many
matches on <board-common/foo.h> but no functions in common (or even
common function names but with different prototypes) we really aren't
gaining anything by doing this kind of change.  So yes, we should just
reference this locally since it is local to board/$(VENDOR).  Thanks for
taking the time to do this Nishanth but NAK.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151116/5bfb2637/attachment.sig>

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

* [U-Boot] [PATCH V2 06/12] board: keymile: Move common headers to board-common directory
  2015-11-13  5:43 ` [U-Boot] [PATCH V2 06/12] board: keymile: " Nishanth Menon
@ 2015-11-18 13:58   ` Valentin Longchamp
  0 siblings, 0 replies; 35+ messages in thread
From: Valentin Longchamp @ 2015-11-18 13:58 UTC (permalink / raw)
  To: u-boot

On 13/11/2015 06:43, Nishanth Menon wrote:
> 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 <valentin.longchamp@keymile.com>
> Cc: Holger Brunck <holger.brunck@keymile.com>
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>

This was successfully tested on several Keymile boards and it is good that the
Keymile boards also follow this new board/common include scheme.

Acked-by: Valentin Longchamp <valentin.longchamp@keymile.com>

> ---
>  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%)
> 
> diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
> index b9aff1a84dcb..4f8b68ee5ccd 100644
> --- a/board/keymile/common/common.c
> +++ b/board/keymile/common/common.c
> @@ -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;
> diff --git a/board/keymile/common/common.h b/board/keymile/common/include/board-common/common.h
> similarity index 100%
> rename from board/keymile/common/common.h
> rename to board/keymile/common/include/board-common/common.h
> diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
> index 42db54221bb3..4d2963ad5f84 100644
> --- a/board/keymile/common/ivm.c
> +++ b/board/keymile/common/ivm.c
> @@ -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
>  
> diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
> index c599b4093626..73d22dc6ac19 100644
> --- a/board/keymile/km82xx/km82xx.c
> +++ b/board/keymile/km82xx/km82xx.c
> @@ -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];
>  
> diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
> index 89e9e1e57c38..83deca56aebc 100644
> --- a/board/keymile/km83xx/km83xx.c
> +++ b/board/keymile/km83xx/km83xx.c
> @@ -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];
>  
> diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
> index c961937530ac..e702a5cf86e2 100644
> --- a/board/keymile/km83xx/km83xx_i2c.c
> +++ b/board/keymile/km83xx/km83xx_i2c.c
> @@ -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)
>  {
> diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
> index 2938861f368f..82fa31c2208d 100644
> --- a/board/keymile/km_arm/km_arm.c
> +++ b/board/keymile/km_arm/km_arm.c
> @@ -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;
>  
> diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
> index eebb47fc21f1..fbe6d98af6ce 100644
> --- a/board/keymile/kmp204x/kmp204x.c
> +++ b/board/keymile/kmp204x/kmp204x.c
> @@ -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;
> diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
> index edf3bf11a894..a4c25e084846 100644
> --- a/board/keymile/kmp204x/qrio.c
> +++ b/board/keymile/kmp204x/qrio.c
> @@ -7,7 +7,7 @@
>  
>  #include <common.h>
>  
> -#include "../common/common.h"
> +#include <board-common/common.h>
>  #include "kmp204x.h"
>  
>  /* QRIO GPIO register offsets */
> 

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

* [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location
  2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
                   ` (11 preceding siblings ...)
  2015-11-13  5:51 ` [U-Boot] [PATCH RESEND V2 04/12] board: freescale: " Nishanth Menon
@ 2015-12-19 23:07 ` Simon Glass
  2015-12-20  0:25   ` Nishanth Menon
  12 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2015-12-19 23:07 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,

On 12 November 2015 at 22:43, Nishanth Menon <nm@ti.com> wrote:
> 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.

Regards,
Simon

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

* [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location
  2015-12-19 23:07 ` [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Simon Glass
@ 2015-12-20  0:25   ` Nishanth Menon
  2015-12-28  4:22     ` Simon Glass
  0 siblings, 1 reply; 35+ messages in thread
From: Nishanth Menon @ 2015-12-20  0:25 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Sat, Dec 19, 2015 at 5:07 PM, Simon Glass <sjg@chromium.org> wrote:

[...]
>
> 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.

---
Regards,
Nishanth Menon

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

* [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location
  2015-12-20  0:25   ` Nishanth Menon
@ 2015-12-28  4:22     ` Simon Glass
  0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2015-12-28  4:22 UTC (permalink / raw)
  To: u-boot

Hi Nishanth,

On 19 December 2015 at 17:25, Nishanth Menon <nm@ti.com> wrote:
> Hi Simon,
>
> On Sat, Dec 19, 2015 at 5:07 PM, Simon Glass <sjg@chromium.org> wrote:
>
> [...]
>>
>> 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.

I see. It's a shame, but I can see the problem that the code might be
used from other parts outside the board/ directory, and that would be
bad.

Thanks for taking this on, sorry it didn't make the cut.

Regards,
Simon

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

end of thread, other threads:[~2015-12-28  4:22 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-13  5:43 [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Nishanth Menon
2015-11-13  5:43 ` [U-Boot] [PATCH V2 01/12] Makefile: Include vendor common library in include search path Nishanth Menon
2015-11-15 14:45   ` Igor Grinberg
2015-11-13  5:43 ` [U-Boot] [PATCH V2 02/12] board: BuR: Move common headers to board-common directory Nishanth Menon
2015-11-13  5:43 ` [U-Boot] [PATCH V2 03/12] board: compulab: " Nishanth Menon
2015-11-13  5:43 ` [U-Boot] [PATCH V2 05/12] board: gdsys: " Nishanth Menon
2015-11-16  8:01   ` Dirk Eibach
2015-11-16  8:04     ` Dirk Eibach
2015-11-13  5:43 ` [U-Boot] [PATCH V2 06/12] board: keymile: " Nishanth Menon
2015-11-18 13:58   ` Valentin Longchamp
2015-11-13  5:43 ` [U-Boot] [PATCH V2 07/12] board: LaCie: " Nishanth Menon
2015-11-13 10:30   ` Simon Guinot
2015-11-13 14:06     ` Tom Rini
2015-11-13 15:32       ` Simon Guinot
2015-11-13 23:57         ` Nishanth Menon
2015-11-14  2:05           ` Simon Glass
2015-11-16  1:53             ` Tom Rini
2015-11-14 23:56   ` Masahiro Yamada
2015-11-15  5:38     ` Nishanth Menon
2015-11-16  3:32       ` Masahiro Yamada
2015-11-16 15:34         ` Nishanth Menon
2015-11-17  0:45           ` Tom Rini
2015-11-13  5:43 ` [U-Boot] [PATCH V2 08/12] board: mpl: " Nishanth Menon
2015-11-13  8:19   ` David Müller (ELSOFT AG)
2015-11-13 14:02     ` Tom Rini
2015-11-13  5:43 ` [U-Boot] [PATCH V2 09/12] board: seco: " Nishanth Menon
2015-11-13  5:43 ` [U-Boot] [PATCH V2 10/12] board: siemens: " Nishanth Menon
2015-11-16  9:17   ` Egli, Samuel
2015-11-13  5:43 ` [U-Boot] [PATCH V2 11/12] board: varisys: " Nishanth Menon
2015-11-16  7:42   ` Andy Fleming
2015-11-13  5:43 ` [U-Boot] [PATCH V2 12/12] board: xes: " Nishanth Menon
2015-11-13  5:51 ` [U-Boot] [PATCH RESEND V2 04/12] board: freescale: " Nishanth Menon
2015-12-19 23:07 ` [U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location Simon Glass
2015-12-20  0:25   ` Nishanth Menon
2015-12-28  4:22     ` Simon Glass

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.