[U-Boot] [PATCH 09/48] keymile: Move config files
Mario Six
mario.six at gdsys.cc
Fri Sep 28 09:52:45 UTC 2018
We want to unroll several include files, while keeping include
statements consistent.
To make it easier to not break the include statements, move the include
files to the main configs directory. All three include files moved will
be unrolled, so they won't pollute the directory for long.
Signed-off-by: Mario Six <mario.six at gdsys.cc>
---
include/configs/{km => }/km8309-common.h | 0
include/configs/{km => }/km8321-common.h | 0
include/configs/km8360.h | 2 +-
include/configs/{km => }/km83xx-common.h | 4 ++--
include/configs/kmtegr1.h | 4 ++--
include/configs/kmvect1.h | 4 ++--
include/configs/suvd3.h | 4 ++--
include/configs/tuxx1.h | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
rename include/configs/{km => }/km8309-common.h (100%)
rename include/configs/{km => }/km8321-common.h (100%)
rename include/configs/{km => }/km83xx-common.h (99%)
diff --git a/include/configs/km/km8309-common.h b/include/configs/km8309-common.h
similarity index 100%
rename from include/configs/km/km8309-common.h
rename to include/configs/km8309-common.h
diff --git a/include/configs/km/km8321-common.h b/include/configs/km8321-common.h
similarity index 100%
rename from include/configs/km/km8321-common.h
rename to include/configs/km8321-common.h
diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 7857b83055..08d2ae0cbc 100644
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -38,7 +38,7 @@
#define CONFIG_QE /* Has QE */
/* include common defines/options for all 83xx Keymile boards */
-#include "km/km83xx-common.h"
+#include "km83xx-common.h"
/*
* System IO Setup
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km83xx-common.h
similarity index 99%
rename from include/configs/km/km83xx-common.h
rename to include/configs/km83xx-common.h
index 3868d99b87..f817d978e7 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km83xx-common.h
@@ -8,8 +8,8 @@
#define __CONFIG_KM83XX_H
/* include common defines/options for all Keymile boards */
-#include "keymile-common.h"
-#include "km-powerpc.h"
+#include "km/keymile-common.h"
+#include "km/km-powerpc.h"
/*
* System Clock Setup
diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index 69397ae5ae..95a131892d 100644
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -20,7 +20,7 @@
* High Level Configuration Options
*/
-/* This needs to be set prior to including km/km83xx-common.h */
+/* This needs to be set prior to including km83xx-common.h */
#define CONFIG_HOSTNAME "kmtegr1"
#define CONFIG_KM_BOARD_NAME "kmtegr1"
@@ -36,7 +36,7 @@
#define NAND_MAX_CHIPS 1
/* include common defines/options for all 8309 Keymile boards */
-#include "km/km8309-common.h"
+#include "km8309-common.h"
/* must be after the include because KMBEC_FPGA is otherwise undefined */
#define CONFIG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 178e769976..0bbf541aec 100644
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -20,14 +20,14 @@
* High Level Configuration Options
*/
-/* This needs to be set prior to including km/km83xx-common.h */
+/* This needs to be set prior to including km83xx-common.h */
#define CONFIG_HOSTNAME "kmvect1"
#define CONFIG_KM_BOARD_NAME "kmvect1"
/* at end of uboot partition, before env */
#define CONFIG_SYS_QE_FW_ADDR 0xF00B0000
/* include common defines/options for all 8309 Keymile boards */
-#include "km/km8309-common.h"
+#include "km8309-common.h"
#define CONFIG_SYS_APP1_BASE 0xA0000000
#define CONFIG_SYS_APP1_SIZE 256 /* Megabytes */
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 2a3f7ff526..98137392ed 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -20,12 +20,12 @@
* High Level Configuration Options
*/
-/* This needs to be set prior to including km/km83xx-common.h */
+/* This needs to be set prior to including km83xx-common.h */
#define CONFIG_HOSTNAME "suvd3"
#define CONFIG_KM_BOARD_NAME "suvd3"
/* include common defines/options for all 8321 Keymile boards */
-#include "km/km8321-common.h"
+#include "km8321-common.h"
#define CONFIG_SYS_APP1_BASE 0xA0000000
#define CONFIG_SYS_APP1_SIZE 256 /* Megabytes */
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index f22d73b8d3..0b17084b05 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -43,7 +43,7 @@
#endif
/* include common defines/options for all 8321 Keymile boards */
-#include "km/km8321-common.h"
+#include "km8321-common.h"
#define CONFIG_SYS_APP1_BASE 0xA0000000 /* PAXG */
#define CONFIG_SYS_APP1_SIZE 256 /* Megabytes */
--
2.16.4
More information about the U-Boot
mailing list