Convert CONFIG_TEGRA_GPU to Kconfig

This converts the following to Kconfig:
   CONFIG_TEGRA_GPU

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 5309be9cc2102a634e2072c5c961073344902d48..09ad2d6f5aec290132bc869e6827ee61705e5b97 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -178,6 +178,10 @@ source "arch/arm/mach-tegra/tegra124/Kconfig"
 source "arch/arm/mach-tegra/tegra210/Kconfig"
 source "arch/arm/mach-tegra/tegra186/Kconfig"
 
+config TEGRA_GPU
+       bool "Enable setting up the GPU"
+       depends on TEGRA124 || TEGRA210
+
 config CMD_ENTERRCM
        bool "Enable 'enterrcm' command"
        default y

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 0915bca642149b36577ecc35fac8f8a88e86af64..39ee46dbec7306a9bd8abe779663aee62308ef08 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
 CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_TEGRA124=y
 CONFIG_TARGET_APALIS_TK1=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index f55848ab2c0a972481850ca9040316511b9a05b7..35f8d9c7817792a14ff87c6a475e363ae2bbfa1b 100644 (file)
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som"
 CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_TEGRA124=y
 CONFIG_TARGET_CEI_TK1_SOM=y
+CONFIG_TEGRA_GPU=y
 CONFIG_ARMV7_PSCI_0_1=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_OF_SYSTEM_SETUP=y

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index b0c7ea3b994ec6bdeb7f867e984b2d6947dab350..515fa23b249cec723535d6f5db5eebda309f38cd 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
 CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y

diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 489ff63595c9923391bea100415e0a5042eaf5a4..a48920cc99da2d9d1b9d6f6b9db8942b1538231f 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_BASE=0x70006000
 CONFIG_DEBUG_UART_CLOCK=408000000
 CONFIG_TEGRA124=y
 CONFIG_TARGET_NYAN_BIG=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x82408000
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y

diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index d93b355d47d8e57b7da88c0f79132d7d3e65f5e7..dcba51de8e5623d8d34c5304a2d1caf14d4c68ce 100644 (file)
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -8,6 +8,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
 CONFIG_TEGRA210=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x80080000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y

diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 74125c15a8765e2caa909a878a7e9de7d586f65b..f8a8407a7f81369a3b582708a6a5428a5950249a 100644 (file)
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -10,6 +10,7 @@ CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
 CONFIG_TEGRA210=y
 CONFIG_TARGET_P2371_2180=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x80080000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y

diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index b4e14add1d765382d2ad4b7d78b29008c8a7a89c..031549470f7b0d70854163ea062ec718585606e9 100644 (file)
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 CONFIG_TEGRA210=y
 CONFIG_TARGET_P2571=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x80080000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y

diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig
index fbe4aea1bd38706a146237b0a11fa8f8450da29e..7604e8a12231535d0f2d8f8d8e8eecde9834ef2d 100644 (file)
--- a/configs/p3450-0000_defconfig
+++ b/configs/p3450-0000_defconfig
@@ -11,6 +11,7 @@ CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p3450-0000"
 CONFIG_TEGRA210=y
 CONFIG_TARGET_P3450_0000=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x80080000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y

diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 25ee96a1ddff7244bd6f70c9b19d4d4e8e0a6809..db455f4d97634f993c9d9a487c32a70c5b960e03 100644 (file)
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
 CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_TEGRA124=y
 CONFIG_TARGET_VENICE2=y
+CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y

diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index f509784a868195d31f343038f1bccc94a5fcfa00..0485fea6ccb88af97f56a678c918788786473c25 100644 (file)
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -57,7 +57,4 @@
 
 /* Defines for SPL */
 
-/* GPU needs setup */
-#define CONFIG_TEGRA_GPU
-
 #endif /* _TEGRA124_COMMON_H_ */

diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
index e510820786e4278ce3f29dd688da9355f57c8bfb..7f361d874af8ad7bc78b96bad72a88c6bfc4e41b 100644 (file)
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -46,7 +46,4 @@
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83420000\0"
 
-/* GPU needs setup */
-#define CONFIG_TEGRA_GPU
-
 #endif /* _TEGRA210_COMMON_H_ */