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>
This commit is contained in:
Trevor Woerner 2020-05-06 08:02:41 -04:00 committed by Tom Rini
parent bb0fb4c0f4
commit 18138ab203
44 changed files with 49 additions and 50 deletions

View File

@ -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: \

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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 \

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;