diff options
| author | Svyatoslav Ryhel <clamor95@gmail.com> | 2024-01-06 22:33:59 +0200 |
|---|---|---|
| committer | Svyatoslav Ryhel <clamor95@gmail.com> | 2024-04-22 12:17:20 +0300 |
| commit | 2bd07c1fb88e5d00cdd217b90ccc9a6b6b711493 (patch) | |
| tree | 1e197c8650904f31f4510cf8617e7be8adc02cd9 | |
| parent | eed7fa1372a55415aebf33335878c8c523ba4d70 (diff) | |
| download | u-boot-2bd07c1fb88e5d00cdd217b90ccc9a6b6b711493.zip u-boot-2bd07c1fb88e5d00cdd217b90ccc9a6b6b711493.tar.gz u-boot-2bd07c1fb88e5d00cdd217b90ccc9a6b6b711493.tar.bz2 | |
ARM: tegra: move to standard boot
Drop the distro-boot scripts and use standard boot instead.
Inspired by:
'commit 7755dc58af7b ("rockchip: Move to standard boot")'
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | include/configs/tegra-common-post.h | 30 |
2 files changed, 3 insertions, 29 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index be8ab0f..c9f2657 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1345,7 +1345,7 @@ config ARCH_ZYNQMP config ARCH_TEGRA bool "NVIDIA Tegra" select GPIO_EXTRA_HEADER - imply DISTRO_DEFAULTS + imply BOOTSTD_DEFAULTS imply FAT_WRITE imply SPL_TIMER if SPL diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 0d0965e..fc74980 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -7,33 +7,7 @@ #ifndef __TEGRA_COMMON_POST_H #define __TEGRA_COMMON_POST_H -#if IS_ENABLED(CONFIG_CMD_USB) -#define BOOT_TARGET_USB(func) func(USB, usb, 0) -#else -#define BOOT_TARGET_USB(func) -#endif - -#if CONFIG_IS_ENABLED(CMD_DHCP) && CONFIG_IS_ENABLED(CMD_PXE) -#define BOOT_TARGET_PXE(func) func(PXE, pxe, na) -#else -#define BOOT_TARGET_PXE(func) -#endif - -#if CONFIG_IS_ENABLED(CMD_DHCP) -#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) -#else -#define BOOT_TARGET_DHCP(func) -#endif - -#ifndef BOOT_TARGET_DEVICES -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) \ - BOOT_TARGET_USB(func) \ - BOOT_TARGET_PXE(func) \ - BOOT_TARGET_DHCP(func) -#endif -#include <config_distro_bootcmd.h> +#define BOOT_TARGETS "mmc1 mmc0 usb pxe dhcp" #ifdef CONFIG_TEGRA_KEYBOARD #define STDIN_KBD_KBC ",tegra-kbc" @@ -88,7 +62,7 @@ MEM_LAYOUT_ENV_SETTINGS \ "fdt_high=" FDT_HIGH "\0" \ "initrd_high=" INITRD_HIGH "\0" \ - BOOTENV \ + "boot_targets=" BOOT_TARGETS "\0" \ BOARD_EXTRA_ENV_SETTINGS #endif /* __TEGRA_COMMON_POST_H */ |