ARM: tegra: replace per-device config headers with generic Tegra

Most device headers contain SoC specific part and common Tegra post part.
Add a generic header which can be used by any Tegra device of one of the
supported SoC generations (T20, T30, T114, T124 or T210) without need in
device specific configuration.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/board/acer/picasso/Kconfig b/board/acer/picasso/Kconfig
index c801bd26c7c6257e8b4bc3116fdff14dd817d2a1..879b778aa53f3e792efc2ce59f117977ce446d47 100644 (file)
--- a/board/acer/picasso/Kconfig
+++ b/board/acer/picasso/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "acer"
 
 config SYS_CONFIG_NAME
-       default "picasso"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/asus/grouper/Kconfig b/board/asus/grouper/Kconfig
index 5f25680d916f2bc89d6fe266b0c39962b2df55c3..3bd712b274c849741bcf57b2d084acd5e02a1f74 100644 (file)
--- a/board/asus/grouper/Kconfig
+++ b/board/asus/grouper/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "asus"
 
 config SYS_CONFIG_NAME
-       default "grouper"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/asus/transformer-t20/Kconfig b/board/asus/transformer-t20/Kconfig
index 2bf42825270d8090c8442d282011ba87ad5f27be..3e80d38d5900888173190f9aab3aa4456c1d20f6 100644 (file)
--- a/board/asus/transformer-t20/Kconfig
+++ b/board/asus/transformer-t20/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "asus"
 
 config SYS_CONFIG_NAME
-       default "transformer-t20"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/asus/transformer-t30/Kconfig b/board/asus/transformer-t30/Kconfig
index 04278f139dc6218654f66350016f0c336bd0579b..34fd6f200f83a57404e8e8dbf2fbca910304d93f 100644 (file)
--- a/board/asus/transformer-t30/Kconfig
+++ b/board/asus/transformer-t30/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "asus"
 
 config SYS_CONFIG_NAME
-       default "transformer-t30"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/avionic-design/medcom-wide/Kconfig b/board/avionic-design/medcom-wide/Kconfig
index 741fc258b3a930139ea74161888bd9f330313c8f..54474b5061a3fd4440b080ddfac7e4f7ab520797 100644 (file)
--- a/board/avionic-design/medcom-wide/Kconfig
+++ b/board/avionic-design/medcom-wide/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "avionic-design"
 
 config SYS_CONFIG_NAME
-       default "medcom-wide"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/avionic-design/plutux/Kconfig b/board/avionic-design/plutux/Kconfig
index 57324dc19e745e9f6720392753ab5320a3b7cde1..35b19dd2ea07a6ce4c5dece83aed7780bb87d9ff 100644 (file)
--- a/board/avionic-design/plutux/Kconfig
+++ b/board/avionic-design/plutux/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "avionic-design"
 
 config SYS_CONFIG_NAME
-       default "plutux"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/avionic-design/tec-ng/Kconfig b/board/avionic-design/tec-ng/Kconfig
index 34e2729fd60bbe58d23340c99f93ccef5af8d41d..8782e7a2a67e649943fd6f0e9006cbb1e2aa8ded 100644 (file)
--- a/board/avionic-design/tec-ng/Kconfig
+++ b/board/avionic-design/tec-ng/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "avionic-design"
 
 config SYS_CONFIG_NAME
-       default "tec-ng"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/avionic-design/tec/Kconfig b/board/avionic-design/tec/Kconfig
index 56b417950eba3f4ca785587e69d6893836223d9b..12cc4e1f4d0c78b5d5b9ec34595563f61ae71b1f 100644 (file)
--- a/board/avionic-design/tec/Kconfig
+++ b/board/avionic-design/tec/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "avionic-design"
 
 config SYS_CONFIG_NAME
-       default "tec"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/cei/cei-tk1-som/Kconfig b/board/cei/cei-tk1-som/Kconfig
index 32ff61ac44da564ec494ca0906c6edc5d96d1638..9b944730e63df2581f434cb411b702af929ee780 100644 (file)
--- a/board/cei/cei-tk1-som/Kconfig
+++ b/board/cei/cei-tk1-som/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "cei"
 
 config SYS_CONFIG_NAME
-       default "cei-tk1-som"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/compal/paz00/Kconfig b/board/compal/paz00/Kconfig
index 0ddac85be12d32a977c1bf467d8eb408d88d8402..7fa47fc8c7710b0cbe0f7f7e4c20873419bc578a 100644 (file)
--- a/board/compal/paz00/Kconfig
+++ b/board/compal/paz00/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "compal"
 
 config SYS_CONFIG_NAME
-       default "paz00"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/compulab/trimslice/Kconfig b/board/compulab/trimslice/Kconfig
index b26c2970fe49ab6e1d34471f42427b793dc1b333..226ebc228a8cba9a93de2e75085206cd59b5c9b1 100644 (file)
--- a/board/compulab/trimslice/Kconfig
+++ b/board/compulab/trimslice/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "compulab"
 
 config SYS_CONFIG_NAME
-       default "trimslice"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/htc/endeavoru/Kconfig b/board/htc/endeavoru/Kconfig
index f0967376647fd1b12288586842426ca08cad3403..ef50da9be457d19b6c0b1700a0b97091ecaa5ea3 100644 (file)
--- a/board/htc/endeavoru/Kconfig
+++ b/board/htc/endeavoru/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "htc"
 
 config SYS_CONFIG_NAME
-       default "endeavoru"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/lenovo/ideapad-yoga-11/Kconfig b/board/lenovo/ideapad-yoga-11/Kconfig
index 670a5bb700ce7f6d49979e2e7682c479e8964c95..cd4aa32d86df23cc3570f9e2cd3a6a47f629fa24 100644 (file)
--- a/board/lenovo/ideapad-yoga-11/Kconfig
+++ b/board/lenovo/ideapad-yoga-11/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "lenovo"
 
 config SYS_CONFIG_NAME
-       default "ideapad-yoga-11"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/lg/x3-t30/Kconfig b/board/lg/x3-t30/Kconfig
index 5a3a67d9f3b42348af4208df80a52ea7c98b2691..d2cdf860db45e67f5cb34b59cf86e295b934d309 100644 (file)
--- a/board/lg/x3-t30/Kconfig
+++ b/board/lg/x3-t30/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "lg"
 
 config SYS_CONFIG_NAME
-       default "x3-t30"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/microsoft/surface-rt/Kconfig b/board/microsoft/surface-rt/Kconfig
index 7c8f67f21cb8e6834289f892a524dfbb2064eec7..6afddb9b363443107e918ad3381c9e26ea55f62b 100644 (file)
--- a/board/microsoft/surface-rt/Kconfig
+++ b/board/microsoft/surface-rt/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "microsoft"
 
 config SYS_CONFIG_NAME
-       default "surface-rt"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/beaver/Kconfig b/board/nvidia/beaver/Kconfig
index be46121422367e9839d2bbc53b8401b0c961ace3..fe36d475b307f51a70e9d6c231f79973e6b52281 100644 (file)
--- a/board/nvidia/beaver/Kconfig
+++ b/board/nvidia/beaver/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "beaver"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/cardhu/Kconfig b/board/nvidia/cardhu/Kconfig
index 8a98ace70b503f873e6de720695490a9b2d7c8fc..92de3f2e66904841d02fe192d785514391b63344 100644 (file)
--- a/board/nvidia/cardhu/Kconfig
+++ b/board/nvidia/cardhu/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "cardhu"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/dalmore/Kconfig b/board/nvidia/dalmore/Kconfig
index 643e082ec06e99967c2212f02bbfdc384dfed842..8da3499b9f5ec3d9bc1a6f3e99c01342993001c0 100644 (file)
--- a/board/nvidia/dalmore/Kconfig
+++ b/board/nvidia/dalmore/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "dalmore"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/harmony/Kconfig b/board/nvidia/harmony/Kconfig
index 1f2bfdfe5d88f2cb61b321c18bf8019a1a121eb9..eedee71cac9edbd9c711a9d9082b89c5141cced7 100644 (file)
--- a/board/nvidia/harmony/Kconfig
+++ b/board/nvidia/harmony/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "harmony"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/jetson-tk1/Kconfig b/board/nvidia/jetson-tk1/Kconfig
index 7a2ffd83c84c89427129578b1a139245c8aa012d..9eeb55f639d129adaaa40acb84a9942930bfa5e2 100644 (file)
--- a/board/nvidia/jetson-tk1/Kconfig
+++ b/board/nvidia/jetson-tk1/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "jetson-tk1"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/nyan-big/Kconfig b/board/nvidia/nyan-big/Kconfig
index b239d69f5e5b1362933416ce240ead77fd38e98c..65fef3c063f48b3e0f6623d63372c1bfdfe33ddb 100644 (file)
--- a/board/nvidia/nyan-big/Kconfig
+++ b/board/nvidia/nyan-big/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "nyan-big"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/p2371-0000/Kconfig b/board/nvidia/p2371-0000/Kconfig
index 28e9f39045c98fefe3f82e0cd62d13c0f81baaa5..e2770781a25dc8d3f7cc617f4d063ed6fd6513af 100644 (file)
--- a/board/nvidia/p2371-0000/Kconfig
+++ b/board/nvidia/p2371-0000/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "p2371-0000"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/p2371-2180/Kconfig b/board/nvidia/p2371-2180/Kconfig
index ffb412229c11c9ed7e5e42b07d38cf7b229a1044..8d97dc354b6f890c0c8816a68516e516951d6f67 100644 (file)
--- a/board/nvidia/p2371-2180/Kconfig
+++ b/board/nvidia/p2371-2180/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "p2371-2180"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/p2571/Kconfig b/board/nvidia/p2571/Kconfig
index 1fc1978c63981d5631d8a81a648678aaad5829ae..1d41e9d68f46aac36e5031934716a0d5b94b4735 100644 (file)
--- a/board/nvidia/p2571/Kconfig
+++ b/board/nvidia/p2571/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "p2571"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/p2771-0000/Kconfig b/board/nvidia/p2771-0000/Kconfig
index 52a22b797345be304793054e10edc16269a78d14..199e04da07ea60192e39383b65970dfde9e8f4b9 100644 (file)
--- a/board/nvidia/p2771-0000/Kconfig
+++ b/board/nvidia/p2771-0000/Kconfig
@@ -11,7 +11,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "p2771-0000"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/p3450-0000/Kconfig b/board/nvidia/p3450-0000/Kconfig
index 48a94e24d54fe3ca5f0731036498b924237eec72..9235c2a0c35dee66e12e6e816f4fbde91dcf516c 100644 (file)
--- a/board/nvidia/p3450-0000/Kconfig
+++ b/board/nvidia/p3450-0000/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "p3450-0000"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/seaboard/Kconfig b/board/nvidia/seaboard/Kconfig
index df62519c6527cf5ca552638ccb6ad325c6174ce7..a6baeeb7f873c2a010c4eefc7b94aa872dd8c9b7 100644 (file)
--- a/board/nvidia/seaboard/Kconfig
+++ b/board/nvidia/seaboard/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "seaboard"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/venice2/Kconfig b/board/nvidia/venice2/Kconfig
index 7bd51c7a278151d76c7a2310ab2c93b08160bb62..9ebaa2fa41353ce468d635762f10da9881954e15 100644 (file)
--- a/board/nvidia/venice2/Kconfig
+++ b/board/nvidia/venice2/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "venice2"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/nvidia/ventana/Kconfig b/board/nvidia/ventana/Kconfig
index ea1146f75b730a594b7d5f3c2c194c6d8080e50d..b8654c24e0b546b60ee5d65ea366aa08ba4a9e08 100644 (file)
--- a/board/nvidia/ventana/Kconfig
+++ b/board/nvidia/ventana/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "nvidia"
 
 config SYS_CONFIG_NAME
-       default "ventana"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/ouya/ouya/Kconfig b/board/ouya/ouya/Kconfig
index 2db127f3e144c228593678a1bc1c733098bae28a..c698f730412f33f9b8dbc82bc0cf9402c4b186b7 100644 (file)
--- a/board/ouya/ouya/Kconfig
+++ b/board/ouya/ouya/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "ouya"
 
 config SYS_CONFIG_NAME
-       default "ouya"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/board/toradex/apalis_t30/Kconfig b/board/toradex/apalis_t30/Kconfig
index 9cd497091d6b5f48e94f0fe222d834515e310b6d..6260f8eb7f441c01a8007f31b8139ecaac5a7c9c 100644 (file)
--- a/board/toradex/apalis_t30/Kconfig
+++ b/board/toradex/apalis_t30/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "toradex"
 
 config SYS_CONFIG_NAME
-       default "apalis_t30"
+       default "tegra"
 
 config TDX_CFG_BLOCK
        default y

diff --git a/board/toradex/apalis_t30/apalis_t30.env b/board/toradex/apalis_t30/apalis_t30.env
index a8f2904bcd7ecf6b455ea904a33223f495f4c2c8..85d0a05d0e108721b5761d1e708d5ef4f5d84746 100644 (file)
--- a/board/toradex/apalis_t30/apalis_t30.env
+++ b/board/toradex/apalis_t30/apalis_t30.env
@@ -1,6 +1,15 @@
 uboot_hwpart=1
 uboot_blk=0
 
+/*
+ * Board-specific serial config
+ *
+ * Apalis UART1: NVIDIA UARTA
+ * Apalis UART2: NVIDIA UARTD
+ * Apalis UART3: NVIDIA UARTB
+ * Apalis UART4: NVIDIA UARTC
+ */
+
 set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff &&
        setexpr blkcnt ${blkcnt} / 0x200
 update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} &&

diff --git a/board/toradex/colibri_t20/Kconfig b/board/toradex/colibri_t20/Kconfig
index a43acddb801d2afe840dfa72ae520d20f816bfb1..8a7295a41e2aa680d99cd556e06c99a16ea0e783 100644 (file)
--- a/board/toradex/colibri_t20/Kconfig
+++ b/board/toradex/colibri_t20/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "toradex"
 
 config SYS_CONFIG_NAME
-       default "colibri_t20"
+       default "tegra"
 
 config TDX_CFG_BLOCK
        default y

diff --git a/board/toradex/colibri_t30/Kconfig b/board/toradex/colibri_t30/Kconfig
index 68ef82b099d8771f4caf21dcec5facd5e11b8b16..643309fe856f68e25cf5b6078325543c78e1ae22 100644 (file)
--- a/board/toradex/colibri_t30/Kconfig
+++ b/board/toradex/colibri_t30/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "toradex"
 
 config SYS_CONFIG_NAME
-       default "colibri_t30"
+       default "tegra"
 
 config TDX_CFG_BLOCK
        default y

diff --git a/board/toradex/colibri_t30/colibri_t30.env b/board/toradex/colibri_t30/colibri_t30.env
index a8f2904bcd7ecf6b455ea904a33223f495f4c2c8..87919fbf15501f90948f9413ca868f5a17840cf6 100644 (file)
--- a/board/toradex/colibri_t30/colibri_t30.env
+++ b/board/toradex/colibri_t30/colibri_t30.env
@@ -1,6 +1,14 @@
 uboot_hwpart=1
 uboot_blk=0
 
+/*
+ * Board-specific serial config
+ *
+ * Colibri UART-A: NVIDIA UARTA
+ * Colibri UART-B: NVIDIA UARTD
+ * Colibri UART-C: NVIDIA UARTB
+ */
+
 set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff &&
        setexpr blkcnt ${blkcnt} / 0x200
 update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} &&

diff --git a/board/wexler/qc750/Kconfig b/board/wexler/qc750/Kconfig
index 29943358b84efd7ed508e54a625b36322177e178..b449720a8b39f5b01acfe9b018c4f07d56b2b85b 100644 (file)
--- a/board/wexler/qc750/Kconfig
+++ b/board/wexler/qc750/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "wexler"
 
 config SYS_CONFIG_NAME
-       default "qc750"
+       default "tegra"
 
 config TEGRA_BOARD_STRING
        string "Default Tegra board name"

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
deleted file mode 100644 (file)
index c806ad0..0000000
--- a/include/configs/apalis_t30.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2014-2016 Marcel Ziswiler
- *
- * Configuration settings for the Toradex Apalis T30 modules.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra30-common.h"
-
-/*
- * Board-specific serial config
- *
- * Apalis UART1: NVIDIA UARTA
- * Apalis UART2: NVIDIA UARTD
- * Apalis UART3: NVIDIA UARTB
- * Apalis UART4: NVIDIA UARTC
- */
-
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
deleted file mode 100644 (file)
index 21b37b7..0000000
--- a/include/configs/beaver.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
deleted file mode 100644 (file)
index 7fc2d85..0000000
--- a/include/configs/cardhu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
deleted file mode 100644 (file)
index aa4057d..0000000
--- a/include/configs/cei-tk1-som.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (c) Copyright 2016, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- *
- * Based on jetson-tk1.h which is:
- * (C) Copyright 2013-2014
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra124-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
deleted file mode 100644 (file)
index d96a87c..0000000
--- a/include/configs/colibri_t20.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2012 Lucas Stach
- *
- * Configuration settings for the Toradex Colibri T20 modules.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
deleted file mode 100644 (file)
index 0c93f37..0000000
--- a/include/configs/colibri_t30.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2013-2016 Stefan Agner
- *
- * Configuration settings for the Toradex Colibri T30 modules.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra30-common.h"
-
-/* High-level configuration options */
-
-/*
- * Board-specific serial config
- *
- * Colibri UART-A: NVIDIA UARTA
- * Colibri UART-B: NVIDIA UARTD
- * Colibri UART-C: NVIDIA UARTB
- */
-
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
deleted file mode 100644 (file)
index 0946588..0000000
--- a/include/configs/dalmore.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2010-2013, NVIDIA CORPORATION.  All rights reserved.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra114-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/endeavoru.h b/include/configs/endeavoru.h
deleted file mode 100644 (file)
index 8cb3e41..0000000
--- a/include/configs/endeavoru.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2012
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2022
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/grouper.h b/include/configs/grouper.h
deleted file mode 100644 (file)
index aacbcf1..0000000
--- a/include/configs/grouper.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
deleted file mode 100644 (file)
index beecb70..0000000
--- a/include/configs/harmony.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010-2012
- *  NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/ideapad-yoga-11.h b/include/configs/ideapad-yoga-11.h
deleted file mode 100644 (file)
index aacbcf1..0000000
--- a/include/configs/ideapad-yoga-11.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
deleted file mode 100644 (file)
index e4ee5ce..0000000
--- a/include/configs/jetson-tk1.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (C) Copyright 2013-2014
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra124-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
deleted file mode 100644 (file)
index becff39..0000000
--- a/include/configs/medcom-wide.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- *  (C) Copyright 2011-2012
- *  Avionic Design GmbH <www.avionic-design.de>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
deleted file mode 100644 (file)
index 808cd90..0000000
--- a/include/configs/nyan-big.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2014
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra124-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/ouya.h b/include/configs/ouya.h
deleted file mode 100644 (file)
index 3819417..0000000
--- a/include/configs/ouya.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2012
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2025
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
deleted file mode 100644 (file)
index 79240bd..0000000
--- a/include/configs/p2371-0000.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013-2015
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef _P2371_0000_H
-#define _P2371_0000_H
-
-#include <linux/sizes.h>
-
-#include "tegra210-common.h"
-#include "tegra-common-post.h"
-
-#endif /* _P2371_0000_H */

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
deleted file mode 100644 (file)
index 24f3a70..0000000
--- a/include/configs/p2371-2180.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013-2015
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef _P2371_2180_H
-#define _P2371_2180_H
-
-#include <linux/sizes.h>
-
-#include "tegra210-common.h"
-#include "tegra-common-post.h"
-
-#endif /* _P2371_2180_H */

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
deleted file mode 100644 (file)
index 0dbb45e..0000000
--- a/include/configs/p2571.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013-2015
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef _P2571_H
-#define _P2571_H
-
-#include <linux/sizes.h>
-
-#include "tegra210-common.h"
-#include "tegra-common-post.h"
-
-#endif /* _P2571_H */

diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
deleted file mode 100644 (file)
index 914c68f..0000000
--- a/include/configs/p2771-0000.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2013-2016, NVIDIA CORPORATION.
- */
-
-#ifndef _P2771_0000_H
-#define _P2771_0000_H
-
-#include <linux/sizes.h>
-
-#include "tegra186-common.h"
-#include "tegra-common-post.h"
-
-#endif

diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
deleted file mode 100644 (file)
index c5a74e8..0000000
--- a/include/configs/p3450-0000.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2018-2019 NVIDIA Corporation.
- */
-
-#ifndef _P3450_0000_H
-#define _P3450_0000_H
-
-#include <linux/sizes.h>
-
-#include "tegra210-common.h"
-#include "tegra-common-post.h"
-
-#endif /* _P3450_0000_H */

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
deleted file mode 100644 (file)
index ec12380..0000000
--- a/include/configs/paz00.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2010-2012 NVIDIA CORPORATION.  All rights reserved.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/picasso.h b/include/configs/picasso.h
deleted file mode 100644 (file)
index 4b6837d..0000000
--- a/include/configs/picasso.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2024
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/plutux.h b/include/configs/plutux.h
deleted file mode 100644 (file)
index becff39..0000000
--- a/include/configs/plutux.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- *  (C) Copyright 2011-2012
- *  Avionic Design GmbH <www.avionic-design.de>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/qc750.h b/include/configs/qc750.h
deleted file mode 100644 (file)
index 2acafb4..0000000
--- a/include/configs/qc750.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2012
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2023
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
deleted file mode 100644 (file)
index 4a2c662..0000000
--- a/include/configs/seaboard.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/surface-rt.h b/include/configs/surface-rt.h
deleted file mode 100644 (file)
index 39f7ddd..0000000
--- a/include/configs/surface-rt.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
- *
- * Copyright (c) 2021, Open Surface RT
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
deleted file mode 100644 (file)
index 3d6cb0b..0000000
--- a/include/configs/tec-ng.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013
- * Avionic Design GmbH <www.avionic-design.de>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/tec.h b/include/configs/tec.h
deleted file mode 100644 (file)
index becff39..0000000
--- a/include/configs/tec.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- *  (C) Copyright 2011-2012
- *  Avionic Design GmbH <www.avionic-design.de>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/tegra.h b/include/configs/tegra.h
new file mode 100644 (file)
index 0000000..77bc389
--- /dev/null
+++ b/include/configs/tegra.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ *  (C) Copyright 2010,2011
+ *  NVIDIA Corporation <www.nvidia.com>
+ *
+ *  (C) Copyright 2025
+ *  Svyatoslav Ryhel <clamor95@gmail.com>
+ *
+ *  Generic device header which can be used with SYS_CONFIG_NAME
+ *  for any Tegra device (T20, T30, T114, T124, T186 or T210).
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <linux/sizes.h>
+
+#ifdef CONFIG_TEGRA20
+#include "tegra20-common.h"
+#elif CONFIG_TEGRA30
+#include "tegra30-common.h"
+#elif CONFIG_TEGRA114
+#include "tegra114-common.h"
+#elif CONFIG_TEGRA124
+#include "tegra124-common.h"
+#elif CONFIG_TEGRA186
+#include "tegra186-common.h"
+#elif CONFIG_TEGRA210
+#include "tegra210-common.h"
+#endif
+
+#include "tegra-common-post.h"
+
+#endif /* __CONFIG_H */

diff --git a/include/configs/transformer-t20.h b/include/configs/transformer-t20.h
deleted file mode 100644 (file)
index b82c6e3..0000000
--- a/include/configs/transformer-t20.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2022
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/transformer-t30.h b/include/configs/transformer-t30.h
deleted file mode 100644 (file)
index 8cb3e41..0000000
--- a/include/configs/transformer-t30.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2012
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2022
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
deleted file mode 100644 (file)
index beecb70..0000000
--- a/include/configs/trimslice.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010-2012
- *  NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
deleted file mode 100644 (file)
index bbebe53..0000000
--- a/include/configs/venice2.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013-2014
- * NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-#include "tegra124-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
deleted file mode 100644 (file)
index 00f9909..0000000
--- a/include/configs/ventana.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  (C) Copyright 2010,2011
- *  NVIDIA Corporation <www.nvidia.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-#include "tegra20-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */

diff --git a/include/configs/x3-t30.h b/include/configs/x3-t30.h
deleted file mode 100644 (file)
index 8cb3e41..0000000
--- a/include/configs/x3-t30.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  (C) Copyright 2010,2012
- *  NVIDIA Corporation <www.nvidia.com>
- *
- *  (C) Copyright 2022
- *  Svyatoslav Ryhel <clamor95@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include "tegra30-common.h"
-#include "tegra-common-post.h"
-
-#endif /* __CONFIG_H */