configs: split ti_armv7_common into a omap generic header

TI armv7 based SoCs are based on two architectures - one based on OMAP
generation architecture and others based on Keystone architecture.

Many of the options are architecture specific, however a lot are common
with v7 architecture. So, step 1 will be to move out OMAP specific stuff
from ti_armv7_common into a ti_armv7_omap.h header which is then used
by all the relevant architecture headers.

Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index b43489d3f80de3f994027b1528368e0e9e9752d9..d148169959f2341c9daac4654ac078815114fa1b 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -80,7 +80,7 @@
 #endif
 
 /* Now bring in the rest of the common code. */
 #endif
 
 /* Now bring in the rest of the common code. */

-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>

 
 /* Always 64 KiB env size */
 #define CONFIG_ENV_SIZE                        (64 << 10)
 
 /* Always 64 KiB env size */
 #define CONFIG_ENV_SIZE                        (64 << 10)

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 4d2ae280e7f1433dae02581696224b2ba26ebff7..9697431b449638e0a88124be96d686a711211d0e 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -94,6 +94,6 @@
 #endif
 
 /* Now bring in the rest of the common code. */
 #endif
 
 /* Now bring in the rest of the common code. */

-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>

 
 #endif /* __CONFIG_TI_AM335X_COMMON_H__ */
 
 #endif /* __CONFIG_TI_AM335X_COMMON_H__ */

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 34756de5a0b2ee4f1b7a3c0824ab15ee5ee6c592..424f233d42171e660bd418dc1566f00fb8807313 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -18,8 +18,6 @@
 #define __CONFIG_TI_ARMV7_COMMON_H__
 
 /* Common define for many platforms. */
 #define __CONFIG_TI_ARMV7_COMMON_H__
 
 /* Common define for many platforms. */

-#define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON

 #define CONFIG_SYS_GENERIC_BOARD
 
 /*
 #define CONFIG_SYS_GENERIC_BOARD
 
 /*


@@ -86,38 +84,19 @@
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C

-#define CONFIG_SYS_OMAP24_I2C_SPEED    100000
-#define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX

 
 /* MMC/SD IP block */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 
 /* MMC/SD IP block */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

-#define CONFIG_OMAP_HSMMC

 #define CONFIG_CMD_MMC
 
 /* McSPI IP block */
 #define CONFIG_SPI
 #define CONFIG_CMD_MMC
 
 /* McSPI IP block */
 #define CONFIG_SPI

-#define CONFIG_OMAP3_SPI

 #define CONFIG_CMD_SPI
 
 /* GPIO block */
 #define CONFIG_CMD_SPI
 
 /* GPIO block */

-#define CONFIG_OMAP_GPIO

 #define CONFIG_CMD_GPIO
 
 #define CONFIG_CMD_GPIO
 

-/*
- * GPMC NAND block.  We support 1 device and the physical address to
- * access CS0 at is 0x8000000.
- */
-#ifdef CONFIG_NAND
-#define CONFIG_NAND_OMAP_GPMC
-#ifndef CONFIG_SYS_NAND_BASE
-#define CONFIG_SYS_NAND_BASE           0x8000000
-#endif
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_CMD_NAND
-#endif
-

 /*
  * The following are general good-enough settings for U-Boot.  We set a
  * large malloc pool as we generally have a lot of DDR, and we opt for
 /*
  * The following are general good-enough settings for U-Boot.  We set a
  * large malloc pool as we generally have a lot of DDR, and we opt for

diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h
new file mode 100644 (file)
index 0000000..7548170
--- /dev/null
+++ b/include/configs/ti_armv7_omap.h
@@ -0,0 +1,49 @@
+/*
+ * ti_armv7_omap.h
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+ * The various ARMv7 SoCs from TI all share a number of IP blocks when
+ * implementing a given feature. This is meant to isolate the features
+ * that are based on OMAP architecture.
+ */
+#ifndef __CONFIG_TI_ARMV7_OMAP_H__
+#define __CONFIG_TI_ARMV7_OMAP_H__
+
+/* Common defines for all OMAP architecture based SoCs */
+#define CONFIG_OMAP
+#define CONFIG_OMAP_COMMON
+
+/* I2C IP block */
+#define CONFIG_SYS_OMAP24_I2C_SPEED    100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE    1
+#define CONFIG_SYS_I2C_OMAP24XX
+
+/* MMC/SD IP block */
+#define CONFIG_OMAP_HSMMC
+
+/* SPI IP Block */
+#define CONFIG_OMAP3_SPI
+
+/* GPIO block */
+#define CONFIG_OMAP_GPIO
+
+/*
+ * GPMC NAND block.  We support 1 device and the physical address to
+ * access CS0 at is 0x8000000.
+ */
+#ifdef CONFIG_NAND
+#define CONFIG_NAND_OMAP_GPMC
+#ifndef CONFIG_SYS_NAND_BASE
+#define CONFIG_SYS_NAND_BASE           0x8000000
+#endif
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_CMD_NAND
+#endif
+
+/* Now for the remaining common defines */
+#include <configs/ti_armv7_common.h>
+
+#endif /* __CONFIG_TI_ARMV7_OMAP_H__ */

diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 429b109afa23e0e87e87d19446546b7c5800abb7..be231a551361dc6392d10f7f203471367f255336 100644 (file)
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -84,6 +84,6 @@
 #endif
 
 /* Now bring in the rest of the common code. */
 #endif
 
 /* Now bring in the rest of the common code. */

-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>

 
 #endif /* __CONFIG_TI_OMAP3_COMMON_H__ */
 
 #endif /* __CONFIG_TI_OMAP3_COMMON_H__ */

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 659b4c69cfa8790850caa52053ff91b17eaea9ef..b299aedb2e7d538e35b736e41732e51f70b3a235 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -52,7 +52,7 @@
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 #endif
 
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 #endif
 

-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>

 
 /*
  * Hardware drivers
 
 /*
  * Hardware drivers

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index b33feb636843565a6792bb24dbf477269dea7240..fe04692368b59a78f4621527587f9ef73f5edc94 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -45,7 +45,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/omap.h>
 
 #include <asm/arch/cpu.h>
 #include <asm/arch/omap.h>
 

-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>

 
 /*
  * Hardware drivers
 
 /*
  * Hardware drivers