ARM: tegra: move common config defines centrally

All boards need CONFIG_BOARD_EARLY_INIT_F, and many actively need
CONFIG_BOARD_LATE_INIT. Move both of these into tegra-common.h so that
board config headers don't need to repeatedly define them.

Later commits will add new code in board_late_init() which applies to
all boards, so CONFIG_BOARD_LATE_INIT should be enabled for all Tegra
boards.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 61809fcdbea79f0b75fc7b3c0ca1aa3d8f9eca9c..73404e27f448e3daeff22eff3ba7e462c180b696 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -22,8 +22,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_APALIS_T30
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 5df460c96b1d0072b36e06c1e8c74b8b58f5f891..58013c6c9b2e0e667e6bad12af8c228ca58c5cb8 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -36,8 +36,6 @@
 #define MACH_TYPE_BEAVER               4597    /* not yet in mach-types.h */
 #define CONFIG_MACH_TYPE               MACH_TYPE_BEAVER
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 5e13b655c28788b9cfdf65a699c8e65929fb78ee..55de464acb047301d318916633a2a8abe70eb70e 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -39,8 +39,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_CARDHU
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20_iris.h
index 2b876fede111ecac108939edb02b557e94991a45..4888c945fe2d7dd9a5bea74d5860d6be5e3d5e8f 100644 (file)
--- a/include/configs/colibri_t20_iris.h
+++ b/include/configs/colibri_t20_iris.h
@@ -18,8 +18,6 @@
 #define CONFIG_TEGRA_UARTA_SDIO1
 #define CONFIG_SYS_NS16550_COM1    NV_PA_APB_UARTA_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* SD/MMC support */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index ce6f23b8c4f12ee73e2164357b3f2c7fdab17bd6..9951b0eeba88ab15cf68e380e46e4ae92b887849 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -21,8 +21,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_T30
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 0b04ee67b36acbba63b0c3b64095da78acf8c1d7..5f5eb3b3139d79fc68555f57bd51db9d203a98e8 100644 (file)
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -32,8 +32,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_DALMORE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index ff9fbc9965a25e0856c3849d8628eb98b2f0144a..ad3dcdb7bab1fa697106a535cc7e013357e54495 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -27,9 +27,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_HARMONY
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT         /* Make sure LCD init is complete */
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 0a79c7cfc361ead7f91ae7b5d1d9d226d1593dbb..8c016b795519283f829899d2445e2e91d44fcaee 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -24,8 +24,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index ac5208fa0d342573059c24e075adb5e39c2c87bf..f721a4d6a21abe7e3d6f0a73d54cf9ad7ffa37da 100644 (file)
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -20,9 +20,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index cf331ab2077a98b70b1948959523a2b9c2aaa26e..539759991123f6c5888d1403153c33fd87c8046d 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -21,8 +21,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 45bb47088bc5e67cd886ef32d23543e30e8cb58a..284419ffc8a99a0694b105f0c73b3e663deb06a8 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -30,9 +30,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_PAZ00
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index b663b89d2c709761946c18a2bd5470878f04fbdc..6878ed799586df42de852a375c6e62a0bfedce84 100644 (file)
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -20,9 +20,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 5f77051d13f889c117f5cf4d180548eeb2c95eaa..4442064db914ce01de5b69109835a9a01941c0e7 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -32,9 +32,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_SEABOARD
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT         /* Make sure LCD init is complete */
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index e37b23359b544147f9798d46823c5c5b8b3c2b37..cfa7fb12d7ef96daab635eba878792affb65ff86 100644 (file)
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -19,8 +19,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/tec.h b/include/configs/tec.h
index 9ea4ff497115b200bbfebd591f7fa35f414ef460..13c24c960c08031a00312be4ec4228e05ad9ebae 100644 (file)
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -20,9 +20,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 005fc6aeb374ab63498f0e635d08bf8448289c33..f10ca52ace5aa7e0de3d8bb829ff84f8b57e7b57 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -151,6 +151,8 @@
 #define CONFIG_SPL_GPIO_SUPPORT
 
 #define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
 
 /* Misc utility code */
 #define CONFIG_BOUNCE_BUFFER

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 59f4f6767b76a62cf100f15b1c207b5c303f96b6..81be8a22047286802982293a90a81c6f1a634f98 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -22,8 +22,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_TRIMSLICE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* SPI */
 #define CONFIG_TEGRA20_SFLASH
 #define CONFIG_SPI_FLASH

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 8880de86c42d7c6eb128e68cd7a0a2a74930ef7b..45940024249ebafbebc6146b23dde5145e407266 100644 (file)
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -21,8 +21,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index f195f8a6eac36c0e3462fe4b5808d5151aba5f02..62bec9955e597e8f0b3fc4724fce9d50827c8730 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -21,9 +21,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_VENTANA
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT         /* Make sure LCD init is complete */
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC

diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index e083cbd07f17753fbf734902e03b2607944667d0..94f151e9bea31b88a84666f2f367ef129ae8a45e 100644 (file)
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -22,8 +22,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_WHISTLER
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C