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/

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>

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;

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;

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)