rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA

Have this symbol follow the pattern of all other such symbols.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>

diff --git a/Makefile b/Makefile
index 97fd492bc0592b019502bdb119ed51ec9db93c5c..12ecce3e7e869225c2b30c49d29036692ebe830e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -929,7 +929,7 @@ ALL-y += u-boot-sunxi-with-spl.bin
 endif
 
 # enable combined SPL/u-boot/dtb rules for tegra
-ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
+ifeq ($(CONFIG_ARCH_TEGRA)$(CONFIG_SPL),yy)
 ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
 ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb-tegra.bin
 endif
@@ -1625,7 +1625,7 @@ endif
 u-boot-x86-with-spl.bin: spl/u-boot-spl.bin u-boot.bin FORCE
        $(call if_changed,binman)
 
-ifneq ($(CONFIG_TEGRA),)
+ifneq ($(CONFIG_ARCH_TEGRA),)
 ifneq ($(CONFIG_BINMAN),)
 # Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin
 %-dtb-tegra.bin %-tegra.bin %-nodtb-tegra.bin: \

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8bdcf3409dc348c8c28af2dde7512e69ba6db721..6152b11b107b3c58d4010fb6015d37131808964f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1142,7 +1142,7 @@ config ARCH_ZYNQMP
        imply MP
        imply DM_USB_GADGET
 
-config TEGRA
+config ARCH_TEGRA
        bool "NVIDIA Tegra"
        imply DISTRO_DEFAULTS
        imply FAT_WRITE

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 9b3ca9772c2398e52dac70466a391f4487f082f6..e91b37fb3401185bc5ae8c23e965c94b8fa8cb21 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy)
 CONFIG_CPU_V7A=
 CONFIG_CPU_ARM720T=y
 endif
@@ -22,7 +22,7 @@ arch-$(CONFIG_ARM64)          =-march=armv8-a
 
 # On Tegra systems we must build SPL for the armv4 core on the device
 # but otherwise we can use the value in CONFIG_SYS_ARM_ARCH
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy)
 arch-y += -D__LINUX_ARM_ARCH__=4
 else
 arch-y += -D__LINUX_ARM_ARCH__=$(CONFIG_SYS_ARM_ARCH)
@@ -76,8 +76,7 @@ machine-$(CONFIG_ARCH_SOCFPGA)                += socfpga
 machine-$(CONFIG_STM32)                        += stm32
 machine-$(CONFIG_ARCH_STM32MP)         += stm32mp
 machine-$(CONFIG_ARCH_SUNXI)           += sunxi
-# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
-machine-$(CONFIG_TEGRA)                        += tegra
+machine-$(CONFIG_ARCH_TEGRA)           += tegra
 machine-$(CONFIG_ARCH_U8500)           += u8500
 machine-$(CONFIG_ARCH_UNIPHIER)                += uniphier
 machine-$(CONFIG_ARCH_VERSAL)          += versal

diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index 8437717a7b2388383b5bce74dd2dc4a2a69376e5..f0fc58deadbaf0d3b72e237592c0178d55d24b23 100644 (file)
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -11,7 +11,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_TEGRA)
+#if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;
 static ulong lastdec;
 

diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index 73d57a2aae37e74b74bc1ec2c0af38439f047ebe..14569e560b80b825f84adf1e121046bd881e446b 100644 (file)
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -19,7 +19,7 @@ config ARMV7_NONSEC
 config ARMV7_BOOT_SEC_DEFAULT
        bool "Boot in secure mode by default" if EXPERT
        depends on ARMV7_NONSEC
-       default y if TEGRA
+       default y if ARCH_TEGRA
        ---help---
        Say Y here to boot in secure mode by default even if non-secure mode
        is supported. This option is useful to boot kernels which do not

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 66fcfc56467a01de2fe6796ce16eb270e10fe12d..ca663a86f2db8582a07c39af7287fbd7cd6e7b2d 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -162,7 +162,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
        meson-g12b-a311d-khadas-vim3.dtb \
        meson-sm1-khadas-vim3l.dtb \
        meson-sm1-sei610.dtb
-dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
+dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
        tegra20-plutux.dtb \

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index ff9f29f2d5d0070adc59b61d36b87b157137edd8..00facf492e0d4341baad41b315dfec905bea946f 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,4 +1,4 @@
-if TEGRA
+if ARCH_TEGRA
 
 config SPL_GPIO_SUPPORT
        default y

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 6f37f756501af82ce616a5d269f087cb90c4f29d..414b6f396d2064cfcfe2ace5a784dc1c60b09660 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -970,7 +970,7 @@ config SPL_POWER_DOMAIN
 
 config SPL_RAM_SUPPORT
        bool "Support booting from RAM"
-       default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
+       default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
        help
          Enable booting of an image in RAM. The image can be preloaded or
          it can be loaded by SPL directly into RAM (e.g. using USB).
@@ -978,7 +978,7 @@ config SPL_RAM_SUPPORT
 config SPL_RAM_DEVICE
        bool "Support booting from preloaded image in RAM"
        depends on SPL_RAM_SUPPORT
-       default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
+       default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
        help
          Enable booting of an image already loaded in RAM. The image has to
          be already in memory when SPL takes over, e.g. loaded by the boot

diff --git a/config.mk b/config.mk
index 097d1f67d24ee2f17af3205fbf36047f785f8b69..7bb1fd4ed1b5036e76d083ff00f425ef54f98834 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -23,7 +23,7 @@ VENDOR :=
 ARCH := $(CONFIG_SYS_ARCH:"%"=%)
 CPU := $(CONFIG_SYS_CPU:"%"=%)
 ifdef CONFIG_SPL_BUILD
-ifdef CONFIG_TEGRA
+ifdef CONFIG_ARCH_TEGRA
 CPU := arm720t
 endif
 endif

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 150941fd1aaa4441de638cc33d34cfc1d8d04e4d..604a473fa978a406ead81c4167db08281bbc5b92 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index b2e3ff6614d67579529618b7a9047453f39feb63..a5db39129e68960c5656107a8358df23a9857fed 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index d70467012c10a7cdaf66e5e713a7db450bfbb211..89f4dc1144dc679a759d64bb72412620a6cb6855 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 61458610602133c58c10cbc2cc2288c3c315c26a..bf2f5f52083d7f4ac23f42ecb67fbd38d391cb9c 100644 (file)
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index c30b37e8c70417d00a0281263e2f911c6a902a73..366a90dd42907336c7f38f0ccfcf1076eb89ff64 100644 (file)
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index cf3e4e0bebb92b7d124997399b8ea58643830f24..a1d6ab206aadc3c73ce967d3bcf49dcc543d4a2e 100644 (file)
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x10000

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 4937433af0e1c8d8b363f058479ae245aeebd78e..d44ed05784234c8c9b1621127a71a42abbcf95ec 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index cad56f131b2c1ffa0a4532924872365319e7f849..483a7cfeb541e8bc47eb608bcdf14979dcecfcf6 100644 (file)
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index d9f110ce1e424ff8104d766b65284f74ed483241..da418de4cde37891d8c576a6336d4b5e4f9e5953 100644 (file)
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index 197add3945f9ac4361ef4b9ecdaa873073cbb545..ec8f4dad2220d27adac6a5c5a674b9581295d67a 100644 (file)
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 116950ea7b966eb9b203d6653c5cf03835eca94c..74f4456d894f99c2b928634bdcf492cc887dd1d6 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index bfca54d857b99ba98990ea1b419c060f44d1e6e1..95c9dfa807cf17b491e93c6d9e2b791f4e2dd121 100644 (file)
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000

diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 2b1bcb8695610d5ec200b3116591b52d926bd891..8abb1a432a3a6206b764e338bef331707d9a475e 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x81000100
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 3c183df470c9ea3ab4782f4b107dbed3d416dca5..d8d28ed6ea28321f27f7d5038a0951954c12fa80 100644 (file)
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 3aa6f578d71b58a2152c04d879c86c8dc2ce2bf8..ec4c5909ac9498b612e6f39f519bdfd314c47103 100644 (file)
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 37685eaebcdcf44b400afe0fa1cda766524afd9f..95188a142a8b80479b6c4e7279c591a3d10e41d8 100644 (file)
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index e3d42a20e7d5e2f065a969398c096aaa31f5233d..befa46a4cdaa740088f1b47c609087ec92608876 100644 (file)
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index 51715d0b23dc15b2f6ce43b5cc33c0b3f17de256..71cde4e41d3cc435666bc458c64e8c8ef3b222b0 100644 (file)
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig
index c12d58a44d00abe5bcbe07f61486afca1c03cda2..2bf8f97ca2d0726961ab1b7dfeb56ae362d0bff4 100644 (file)
--- a/configs/p3450-0000_defconfig
+++ b/configs/p3450-0000_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 8536c64fc05cb78b4d3d136d2d20d35b30520665..4330d141a3730d95af96888b09f4dfe465f59926 100644 (file)
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 3c716d6e27197c1c2bc366b909a731402c819162..6b70a240f557a9ed92856cbffca9f138654966d0 100644 (file)
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 9c285b96aa3550fa5ebe04856067db5a0cc57ea3..ba19ceb5ac2964eef247f5bcb151506dc6c5620c 100644 (file)
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 2fc0470b3460d2e7a1344ecf3723d0810c030ef2..d31db78818a22209b989c37232f7ab8bf23a2e8d 100644 (file)
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index fd7b1b62678a6dfa7943d1d6c339038ee06c47fb..34df740bc54b67e451d18ab32e18389da19e1728 100644 (file)
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000

diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index fb9be305b6bdbef74ed8c019f3cd1a9591c96d8a..230a3b836d3b383ef0e0e773968173c838161773 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFE000

diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 94211e5091b62a45370c4e2e459ec0c0de79c63d..58fb867e9e40ce6a814a9d230ecf5ef8f1c1bb4a 100644 (file)
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index bb94e23ad5abce6c10ca51b61ead6aff2c1ceaaa..9ff4f1c8acf3683b56697e1b8a8c7f20ce3fe08e 100644 (file)
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000

diff --git a/disk/Kconfig b/disk/Kconfig
index 747275c2ba140c9c3c913baf2d59556d89ac3e27..cee16a80bc2c3db6a4524659b16062b7f8b06ce1 100644 (file)
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -53,7 +53,7 @@ config ISO_PARTITION
        bool "Enable ISO partition table"
        depends on PARTITIONS
        default y if DISTRO_DEFAULTS
-       default y if MIPS || TEGRA
+       default y if MIPS || ARCH_TEGRA
 
 config SPL_ISO_PARTITION
        bool "Enable ISO partition table for SPL"
@@ -75,7 +75,7 @@ config EFI_PARTITION
        bool "Enable EFI GPT partition table"
        depends on PARTITIONS
        default y if DISTRO_DEFAULTS
-       default y if TEGRA
+       default y if ARCH_TEGRA
        select LIB_UUID
        help
          Say Y here if you would like to use device under U-Boot which

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index e42b6516bf66508c6845df0ccc3398da1134c88c..f8b18de8f3b0034783404667e2ae01310fa9094c 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -402,7 +402,7 @@ config SYS_I2C_STM32F7
 
 config SYS_I2C_TEGRA
        bool "NVIDIA Tegra internal I2C controller"
-       depends on TEGRA
+       depends on ARCH_TEGRA
        help
          Support for NVIDIA I2C controller available in Tegra SoCs.
 

diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index 85c2a829aed87b2312f7c64b073a260bf90f9a30..dd4b0ac0c3393e9ec802c3f6e983fe96192d9ca7 100644 (file)
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -19,7 +19,7 @@ config SANDBOX_MBOX
 
 config TEGRA_HSP
        bool "Enable Tegra HSP controller support"
-       depends on DM_MAILBOX && TEGRA
+       depends on DM_MAILBOX && ARCH_TEGRA
        help
          This enables support for the NVIDIA Tegra HSP Hw module, which
          implements doorbells, mailboxes, semaphores, and shared interrupts.

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 8f0df568b90313227c63cef154c1772ade5baaf9..3c4f057373fce6d4f89c9809c5012f55bd7d7fb9 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -616,7 +616,7 @@ config MMC_SDHCI_TANGIER
 
 config MMC_SDHCI_TEGRA
        bool "SDHCI platform support for the Tegra SD/MMC Controller"
-       depends on TEGRA
+       depends on ARCH_TEGRA
        select BOUNCE_BUFFER
        default y
        help

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 437cd9a055d85cc7dc17e6a5532f47be90cd6a97..6fc26884e24bfe36502d2eaa6a227e77599b0747 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -111,7 +111,7 @@ config PCI_SANDBOX
 
 config PCI_TEGRA
        bool "Tegra PCI support"
-       depends on TEGRA
+       depends on ARCH_TEGRA
        depends on (TEGRA186 && POWER_DOMAIN) || (!TEGRA186)
        help
          Enable support for the PCIe controller found on some generations of

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index cbfb54c5a223d29d66e27c9de0b15cdf79af2e0f..f0a9ed226cb7e16430a841cd2fb45b740fcd21aa 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -203,7 +203,7 @@ config USB_EHCI_PCI
 
 config USB_EHCI_TEGRA
        bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
-       depends on TEGRA
+       depends on ARCH_TEGRA
        ---help---
          Enable support for Tegra on-chip EHCI USB controller
 

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7c5012a67f0c07a95c5cd5ec32c11f1f51dffaf8..38123543a5392de5873fdb62bf88acc617ce562e 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -128,7 +128,7 @@ config CONSOLE_TRUETYPE_SIZE
 
 config SYS_WHITE_ON_BLACK
        bool "Display console as white on a black background"
-       default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || TEGRA || X86 || ARCH_SUNXI
+       default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || ARCH_TEGRA || X86 || ARCH_SUNXI
        help
         Normally the display is black on a white background, Enable this
         option to invert this, i.e. white on a black background. This can be

diff --git a/include/serial.h b/include/serial.h
index 54b21a04700be139b5a8167985739d943d966d6f..c590637b1f3bade45cea412b1076a848f78f0ad9 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -28,7 +28,7 @@ extern struct serial_device *default_serial_console(void);
 
 #if    defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
        defined(CONFIG_MPC86xx) || \
-       defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
+       defined(CONFIG_ARCH_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
        defined(CONFIG_MICROBLAZE)
 extern struct serial_device serial0_device;
 extern struct serial_device serial1_device;