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