Browse Source

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>
Trevor Woerner 4 years ago
parent
commit
18138ab203

+ 2 - 2
Makefile

@@ -929,7 +929,7 @@ ALL-y += u-boot-sunxi-with-spl.bin
 endif
 endif
 
 
 # enable combined SPL/u-boot/dtb rules for tegra
 # 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-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
 ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb-tegra.bin
 ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb-tegra.bin
 endif
 endif
@@ -1625,7 +1625,7 @@ endif
 u-boot-x86-with-spl.bin: spl/u-boot-spl.bin u-boot.bin FORCE
 u-boot-x86-with-spl.bin: spl/u-boot-spl.bin u-boot.bin FORCE
 	$(call if_changed,binman)
 	$(call if_changed,binman)
 
 
-ifneq ($(CONFIG_TEGRA),)
+ifneq ($(CONFIG_ARCH_TEGRA),)
 ifneq ($(CONFIG_BINMAN),)
 ifneq ($(CONFIG_BINMAN),)
 # Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin
 # Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin
 %-dtb-tegra.bin %-tegra.bin %-nodtb-tegra.bin: \
 %-dtb-tegra.bin %-tegra.bin %-nodtb-tegra.bin: \

+ 1 - 1
arch/arm/Kconfig

@@ -1142,7 +1142,7 @@ config ARCH_ZYNQMP
 	imply MP
 	imply MP
 	imply DM_USB_GADGET
 	imply DM_USB_GADGET
 
 
-config TEGRA
+config ARCH_TEGRA
 	bool "NVIDIA Tegra"
 	bool "NVIDIA Tegra"
 	imply DISTRO_DEFAULTS
 	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
 	imply FAT_WRITE

+ 3 - 4
arch/arm/Makefile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 # 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_V7A=
 CONFIG_CPU_ARM720T=y
 CONFIG_CPU_ARM720T=y
 endif
 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
 # 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
 # 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
 arch-y += -D__LINUX_ARM_ARCH__=4
 else
 else
 arch-y += -D__LINUX_ARM_ARCH__=$(CONFIG_SYS_ARM_ARCH)
 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_STM32)			+= stm32
 machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
 machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
 machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
 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_U8500)		+= u8500
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_VERSAL)		+= versal

+ 1 - 1
arch/arm/cpu/arm720t/interrupts.c

@@ -11,7 +11,7 @@
 
 
 #include <common.h>
 #include <common.h>
 
 
-#if defined(CONFIG_TEGRA)
+#if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;
 static ulong timestamp;
 static ulong lastdec;
 static ulong lastdec;
 
 

+ 1 - 1
arch/arm/cpu/armv7/Kconfig

@@ -19,7 +19,7 @@ config ARMV7_NONSEC
 config ARMV7_BOOT_SEC_DEFAULT
 config ARMV7_BOOT_SEC_DEFAULT
 	bool "Boot in secure mode by default" if EXPERT
 	bool "Boot in secure mode by default" if EXPERT
 	depends on ARMV7_NONSEC
 	depends on ARMV7_NONSEC
-	default y if TEGRA
+	default y if ARCH_TEGRA
 	---help---
 	---help---
 	Say Y here to boot in secure mode by default even if non-secure mode
 	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
 	is supported. This option is useful to boot kernels which do not

+ 1 - 1
arch/arm/dts/Makefile

@@ -162,7 +162,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-g12b-a311d-khadas-vim3.dtb \
 	meson-g12b-a311d-khadas-vim3.dtb \
 	meson-sm1-khadas-vim3l.dtb \
 	meson-sm1-khadas-vim3l.dtb \
 	meson-sm1-sei610.dtb
 	meson-sm1-sei610.dtb
-dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
+dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 	tegra20-medcom-wide.dtb \
 	tegra20-medcom-wide.dtb \
 	tegra20-paz00.dtb \
 	tegra20-paz00.dtb \
 	tegra20-plutux.dtb \
 	tegra20-plutux.dtb \

+ 1 - 1
arch/arm/mach-tegra/Kconfig

@@ -1,4 +1,4 @@
-if TEGRA
+if ARCH_TEGRA
 
 
 config SPL_GPIO_SUPPORT
 config SPL_GPIO_SUPPORT
 	default y
 	default y

+ 2 - 2
common/spl/Kconfig

@@ -970,7 +970,7 @@ config SPL_POWER_DOMAIN
 
 
 config SPL_RAM_SUPPORT
 config SPL_RAM_SUPPORT
 	bool "Support booting from RAM"
 	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
 	help
 	  Enable booting of an image in RAM. The image can be preloaded or
 	  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).
 	  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
 config SPL_RAM_DEVICE
 	bool "Support booting from preloaded image in RAM"
 	bool "Support booting from preloaded image in RAM"
 	depends on SPL_RAM_SUPPORT
 	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
 	help
 	  Enable booting of an image already loaded in RAM. The image has to
 	  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
 	  be already in memory when SPL takes over, e.g. loaded by the boot

+ 1 - 1
config.mk

@@ -23,7 +23,7 @@ VENDOR :=
 ARCH := $(CONFIG_SYS_ARCH:"%"=%)
 ARCH := $(CONFIG_SYS_ARCH:"%"=%)
 CPU := $(CONFIG_SYS_CPU:"%"=%)
 CPU := $(CONFIG_SYS_CPU:"%"=%)
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_BUILD
-ifdef CONFIG_TEGRA
+ifdef CONFIG_ARCH_TEGRA
 CPU := arm720t
 CPU := arm720t
 endif
 endif
 endif
 endif

+ 1 - 1
configs/apalis-tk1_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000

+ 1 - 1
configs/apalis_t30_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000

+ 1 - 1
configs/beaver_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/cardhu_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/cei-tk1-som_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/colibri_t20_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_SIZE=0x10000

+ 1 - 1
configs/colibri_t30_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000

+ 1 - 1
configs/dalmore_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/e2220-1170_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/harmony_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000
 CONFIG_ENV_OFFSET=0x1FFE0000

+ 1 - 1
configs/jetson-tk1_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/medcom-wide_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000
 CONFIG_ENV_OFFSET=0x1FFE0000

+ 1 - 1
configs/nyan-big_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x81000100
 CONFIG_SYS_TEXT_BASE=0x81000100
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/p2371-0000_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/p2371-2180_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/p2571_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/p2771-0000-000_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/p2771-0000-500_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/p3450-0000_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/paz00_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/plutux_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000
 CONFIG_ENV_OFFSET=0x1FFE0000

+ 1 - 1
configs/seaboard_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/tec-ng_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/tec_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x1FFE0000
 CONFIG_ENV_OFFSET=0x1FFE0000

+ 1 - 1
configs/trimslice_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFE000
 CONFIG_ENV_OFFSET=0xFE000

+ 1 - 1
configs/venice2_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_SYS_TEXT_BASE=0x80110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 1 - 1
configs/ventana_defconfig

@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_SYS_TEXT_BASE=0x00110000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_ENV_OFFSET=0xFFFFE000

+ 2 - 2
disk/Kconfig

@@ -53,7 +53,7 @@ config ISO_PARTITION
 	bool "Enable ISO partition table"
 	bool "Enable ISO partition table"
 	depends on PARTITIONS
 	depends on PARTITIONS
 	default y if DISTRO_DEFAULTS
 	default y if DISTRO_DEFAULTS
-	default y if MIPS || TEGRA
+	default y if MIPS || ARCH_TEGRA
 
 
 config SPL_ISO_PARTITION
 config SPL_ISO_PARTITION
 	bool "Enable ISO partition table for SPL"
 	bool "Enable ISO partition table for SPL"
@@ -75,7 +75,7 @@ config EFI_PARTITION
 	bool "Enable EFI GPT partition table"
 	bool "Enable EFI GPT partition table"
 	depends on PARTITIONS
 	depends on PARTITIONS
 	default y if DISTRO_DEFAULTS
 	default y if DISTRO_DEFAULTS
-	default y if TEGRA
+	default y if ARCH_TEGRA
 	select LIB_UUID
 	select LIB_UUID
 	help
 	help
 	  Say Y here if you would like to use device under U-Boot which
 	  Say Y here if you would like to use device under U-Boot which

+ 1 - 1
drivers/i2c/Kconfig

@@ -402,7 +402,7 @@ config SYS_I2C_STM32F7
 
 
 config SYS_I2C_TEGRA
 config SYS_I2C_TEGRA
 	bool "NVIDIA Tegra internal I2C controller"
 	bool "NVIDIA Tegra internal I2C controller"
-	depends on TEGRA
+	depends on ARCH_TEGRA
 	help
 	help
 	  Support for NVIDIA I2C controller available in Tegra SoCs.
 	  Support for NVIDIA I2C controller available in Tegra SoCs.
 
 

+ 1 - 1
drivers/mailbox/Kconfig

@@ -19,7 +19,7 @@ config SANDBOX_MBOX
 
 
 config TEGRA_HSP
 config TEGRA_HSP
 	bool "Enable Tegra HSP controller support"
 	bool "Enable Tegra HSP controller support"
-	depends on DM_MAILBOX && TEGRA
+	depends on DM_MAILBOX && ARCH_TEGRA
 	help
 	help
 	  This enables support for the NVIDIA Tegra HSP Hw module, which
 	  This enables support for the NVIDIA Tegra HSP Hw module, which
 	  implements doorbells, mailboxes, semaphores, and shared interrupts.
 	  implements doorbells, mailboxes, semaphores, and shared interrupts.

+ 1 - 1
drivers/mmc/Kconfig

@@ -616,7 +616,7 @@ config MMC_SDHCI_TANGIER
 
 
 config MMC_SDHCI_TEGRA
 config MMC_SDHCI_TEGRA
 	bool "SDHCI platform support for the Tegra SD/MMC Controller"
 	bool "SDHCI platform support for the Tegra SD/MMC Controller"
-	depends on TEGRA
+	depends on ARCH_TEGRA
 	select BOUNCE_BUFFER
 	select BOUNCE_BUFFER
 	default y
 	default y
 	help
 	help

+ 1 - 1
drivers/pci/Kconfig

@@ -111,7 +111,7 @@ config PCI_SANDBOX
 
 
 config PCI_TEGRA
 config PCI_TEGRA
 	bool "Tegra PCI support"
 	bool "Tegra PCI support"
-	depends on TEGRA
+	depends on ARCH_TEGRA
 	depends on (TEGRA186 && POWER_DOMAIN) || (!TEGRA186)
 	depends on (TEGRA186 && POWER_DOMAIN) || (!TEGRA186)
 	help
 	help
 	  Enable support for the PCIe controller found on some generations of
 	  Enable support for the PCIe controller found on some generations of

+ 1 - 1
drivers/usb/host/Kconfig

@@ -203,7 +203,7 @@ config USB_EHCI_PCI
 
 
 config USB_EHCI_TEGRA
 config USB_EHCI_TEGRA
 	bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
 	bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
-	depends on TEGRA
+	depends on ARCH_TEGRA
 	---help---
 	---help---
 	  Enable support for Tegra on-chip EHCI USB controller
 	  Enable support for Tegra on-chip EHCI USB controller
 
 

+ 1 - 1
drivers/video/Kconfig

@@ -128,7 +128,7 @@ config CONSOLE_TRUETYPE_SIZE
 
 
 config SYS_WHITE_ON_BLACK
 config SYS_WHITE_ON_BLACK
 	bool "Display console as white on a black background"
 	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
 	help
 	 Normally the display is black on a white background, Enable this
 	 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
 	 option to invert this, i.e. white on a black background. This can be

+ 1 - 1
include/serial.h

@@ -28,7 +28,7 @@ extern struct serial_device *default_serial_console(void);
 
 
 #if	defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
 #if	defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
 	defined(CONFIG_MPC86xx) || \
 	defined(CONFIG_MPC86xx) || \
-	defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
+	defined(CONFIG_ARCH_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
 	defined(CONFIG_MICROBLAZE)
 	defined(CONFIG_MICROBLAZE)
 extern struct serial_device serial0_device;
 extern struct serial_device serial0_device;
 extern struct serial_device serial1_device;
 extern struct serial_device serial1_device;