[U-Boot] [PATCH V3 06/11] ARM: OMAP3: Rename omap3.h to omap.h to be generic as all SoCs

Nishanth Menon
2015-02-25T20:55:14Z

This is in preperation of using generic cross OMAP code.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../arm/include/asm/arch-omap3/{omap3.h => omap.h} | 0
include/configs/am3517_crane.h | 2 +-
include/configs/am3517_evm.h | 2 +-
include/configs/cm_t35.h | 2 +-
include/configs/cm_t3517.h | 2 +-
include/configs/dig297.h | 2 +-
include/configs/mcx.h | 2 +-
include/configs/nokia_rx51.h | 2 +-
include/configs/omap3_evm.h | 2 +-
include/configs/omap3_evm_quick_mmc.h | 2 +-
include/configs/omap3_evm_quick_nand.h | 2 +-
include/configs/omap3_logic.h | 2 +-
include/configs/omap3_mvblx.h | 2 +-
include/configs/omap3_pandora.h | 2 +-
include/configs/omap3_sdp3430.h | 2 +-
include/configs/omap3_zoom1.h | 2 +-
include/configs/tam3517-common.h | 2 +-
include/configs/tao3530.h | 2 +-
include/configs/ti_omap3_common.h | 2 +-
include/configs/tricorder.h | 2 +-
20 files changed, 19 insertions(+), 19 deletions(-)
rename arch/arm/include/asm/arch-omap3/{omap3.h => omap.h} (100%)

diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap.h
similarity index 100%
rename from arch/arm/include/asm/arch-omap3/omap3.h
rename to arch/arm/include/asm/arch-omap3/omap.h
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 09ee10c0590b..a4128773ddb2 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -23,7 +23,7 @@
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 190ef0e71bfb..94398c625eb0 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -23,7 +23,7 @@
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 9767512a5cf0..56a5506f5c78 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -30,7 +30,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 918032bd753a..ee1b7a0cb5a7 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -30,7 +30,7 @@
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index c8739ed29490..8791199fc61d 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -36,7 +36,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 26eb2203540f..2cf66c40d6fe 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -26,7 +26,7 @@
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

#define CONFIG_OF_LIBFDT
#define CONFIG_FIT
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 46fc91e5e197..442e16ae686b 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -42,7 +42,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>
#include <asm/arch/mem.h>
#include <linux/stringify.h>

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 8bdc08f5864c..4e587e10ffd3 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -18,7 +18,7 @@
#define __OMAP3EVM_CONFIG_H

#include <asm/arch/cpu.h>
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/* ----------------------------------------------------------------------------
* Supported U-boot commands
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 1185f425501f..a7acc1becbeb 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -13,7 +13,7 @@
#define __OMAP3_EVM_QUICK_MMC_H

#include <asm/arch/cpu.h>
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/* ----------------------------------------------------------------------------
* Supported U-boot commands
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index 4427e88b7e4b..c6cad9388961 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -13,7 +13,7 @@
#define __OMAP3_EVM_QUICK_NAND_H

#include <asm/arch/cpu.h>
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/* ----------------------------------------------------------------------------
* Supported U-boot commands
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index aeb385f5ff6b..fcef46735835 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -24,7 +24,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index bf1d34dedb4d..20ec3ad15439 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -27,7 +27,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 45feeb577320..b92d67abccf9 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -21,7 +21,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index ac307eb45629..bf5c7a8faf77 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -27,7 +27,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* NOTE: these #defines presume standard SDP jumper settings.
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index c5d742c2bd80..611cd5e1a350 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -22,7 +22,7 @@
#define CONFIG_NAND
#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>
#include <configs/ti_omap3_common.h>

/* Remove SPL boot option - we do not support that on LDP yet */
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 9fbe68a8a2f2..bff9687b3c9c 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -25,7 +25,7 @@
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 7d2c0d2fa75c..4dfd5cb9fbb7 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -27,7 +27,7 @@
#define CONFIG_SDRC /* Has an SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

/*
* Display CPU and Board information
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 3c634ee680d0..f909f6b94a18 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -16,7 +16,7 @@

#include <asm/arch/cpu.h>
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

#ifndef CONFIG_SPL_BUILD
# define CONFIG_DM
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 36621a553cdf..f27cd1b9b061 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -32,7 +32,7 @@
#define CONFIG_SDRC /* The chip has SDRC controller */

#include <asm/arch/cpu.h> /* get chip and board defs */
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>

#define CONFIG_SYS_GENERIC_BOARD

--
1.7.9.5