mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
48cfca240d
As best I can tell, CONFIG_SYS_LOAD_ADDR and CONFIG_LOADADDR/$loadaddr serve essentially the same purpose. Roughly, if a command takes a load address, then CONFIG_SYS_LOAD_ADDR or $loadaddr (or both) are the default if the command-line does not specify the address. Different U-Boot commands are inconsistent re: which of the two default values they use. As such, set the two to the same value, and move the logic that does this into tegra-common-post.h so it's not duplicated. A number of other non- Tegra boards do this too. The values chosen for these macros are no longer consistent with anything in MEM_LAYOUT_ENV_SETTINGS. Regain consistency by setting $kernel_addr_r to CONFIG_LOADADDR. Older scripts tend to use $loadaddr for the default kernel load address, whereas newer scripts and features tend to use $kernel_addr_r, along with other variables for other purposes such as DTBs and initrds. Hence, it's logical they should share the same value. I had originally thought to make the $kernel_addr_r and CONFIG_LOADADDR have different values. This would guarantee no interference if a script used the two variables for different purposes. However, that scenario is unlikely given the semantic meaning associated with the two variables. The lowest available value is 0x90200000; see comments for MEM_LAYOUT_ENV_SETTINGS in tegra30-common-post.h for details. However, that value would be problematic for a script that loaded a raw zImage to $loadaddr, since it's more than 128MB beyond the start of SDRAM, which would interfere with the kernel's CONFIG_AUTO_ZRELADDR. So, let's not do that. The only potential fallout I could foresee from this patch is if someone has a script that loads the kernel to $loadaddr, but some other file (DTB, initrd) to a hard-coded address that the new value of $loadaddr interferes with. This seems unlikely. A user should not do that; they should either hard-code all load addresses, or use U-Boot-supplied variables for all load addresses. Equally, any fallout due to this change is trivial to fix; simply modify the load addresses in that script. Cc: Paul Walmsley <pwalmsley@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Paul Walmsley <pwalmsley@nvidia.com> Reviewed-by: Simon Glass Signed-off-by: Tom Warren <twarren@nvidia.com>
145 lines
2.7 KiB
C
145 lines
2.7 KiB
C
/*
|
|
* (C) Copyright 2010-2012
|
|
* NVIDIA Corporation <www.nvidia.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __TEGRA_COMMON_POST_H
|
|
#define __TEGRA_COMMON_POST_H
|
|
|
|
#ifndef CONFIG_SPL_BUILD
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 1) \
|
|
func(MMC, mmc, 0) \
|
|
func(USB, usb, 0) \
|
|
func(PXE, pxe, na) \
|
|
func(DHCP, dhcp, na)
|
|
#include <config_distro_bootcmd.h>
|
|
#else
|
|
#define BOOTENV
|
|
#endif
|
|
|
|
#ifdef CONFIG_TEGRA_KEYBOARD
|
|
#define STDIN_KBD_KBC ",tegra-kbc"
|
|
#else
|
|
#define STDIN_KBD_KBC ""
|
|
#endif
|
|
|
|
#ifdef CONFIG_USB_KEYBOARD
|
|
#define STDIN_KBD_USB ",usbkbd"
|
|
#define CONFIG_SYS_USB_EVENT_POLL
|
|
#define CONFIG_PREBOOT "usb start"
|
|
#else
|
|
#define STDIN_KBD_USB ""
|
|
#endif
|
|
|
|
#ifdef CONFIG_LCD
|
|
#define STDOUT_LCD ",lcd"
|
|
#else
|
|
#define STDOUT_LCD ""
|
|
#endif
|
|
|
|
#define TEGRA_DEVICE_SETTINGS \
|
|
"stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB "\0" \
|
|
"stdout=serial" STDOUT_LCD "\0" \
|
|
"stderr=serial" STDOUT_LCD "\0" \
|
|
""
|
|
|
|
#ifndef BOARD_EXTRA_ENV_SETTINGS
|
|
#define BOARD_EXTRA_ENV_SETTINGS
|
|
#endif
|
|
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
TEGRA_DEVICE_SETTINGS \
|
|
MEM_LAYOUT_ENV_SETTINGS \
|
|
"fdt_high=ffffffff\0" \
|
|
"initrd_high=ffffffff\0" \
|
|
BOOTENV \
|
|
BOARD_EXTRA_ENV_SETTINGS
|
|
|
|
#if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
|
|
#define CONFIG_TEGRA_SPI
|
|
#endif
|
|
|
|
/* overrides for SPL build here */
|
|
#ifdef CONFIG_SPL_BUILD
|
|
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT
|
|
|
|
/* remove I2C support */
|
|
#ifdef CONFIG_SYS_I2C_TEGRA
|
|
#undef CONFIG_SYS_I2C_TEGRA
|
|
#endif
|
|
#ifdef CONFIG_CMD_I2C
|
|
#undef CONFIG_CMD_I2C
|
|
#endif
|
|
|
|
/* remove MMC support */
|
|
#ifdef CONFIG_MMC
|
|
#undef CONFIG_MMC
|
|
#endif
|
|
#ifdef CONFIG_GENERIC_MMC
|
|
#undef CONFIG_GENERIC_MMC
|
|
#endif
|
|
#ifdef CONFIG_TEGRA_MMC
|
|
#undef CONFIG_TEGRA_MMC
|
|
#endif
|
|
#ifdef CONFIG_CMD_MMC
|
|
#undef CONFIG_CMD_MMC
|
|
#endif
|
|
|
|
/* remove partitions/filesystems */
|
|
#ifdef CONFIG_DOS_PARTITION
|
|
#undef CONFIG_DOS_PARTITION
|
|
#endif
|
|
#ifdef CONFIG_EFI_PARTITION
|
|
#undef CONFIG_EFI_PARTITION
|
|
#endif
|
|
#ifdef CONFIG_CMD_FS_GENERIC
|
|
#undef CONFIG_CMD_FS_GENERIC
|
|
#endif
|
|
#ifdef CONFIG_CMD_EXT4
|
|
#undef CONFIG_CMD_EXT4
|
|
#endif
|
|
#ifdef CONFIG_CMD_EXT2
|
|
#undef CONFIG_CMD_EXT2
|
|
#endif
|
|
#ifdef CONFIG_CMD_FAT
|
|
#undef CONFIG_CMD_FAT
|
|
#endif
|
|
#ifdef CONFIG_FS_EXT4
|
|
#undef CONFIG_FS_EXT4
|
|
#endif
|
|
#ifdef CONFIG_FS_FAT
|
|
#undef CONFIG_FS_FAT
|
|
#endif
|
|
|
|
/* remove USB */
|
|
#ifdef CONFIG_USB_EHCI
|
|
#undef CONFIG_USB_EHCI
|
|
#endif
|
|
#ifdef CONFIG_USB_EHCI_TEGRA
|
|
#undef CONFIG_USB_EHCI_TEGRA
|
|
#endif
|
|
#ifdef CONFIG_USB_STORAGE
|
|
#undef CONFIG_USB_STORAGE
|
|
#endif
|
|
#ifdef CONFIG_CMD_USB
|
|
#undef CONFIG_CMD_USB
|
|
#endif
|
|
|
|
/* remove part command support */
|
|
#ifdef CONFIG_PARTITION_UUIDS
|
|
#undef CONFIG_PARTITION_UUIDS
|
|
#endif
|
|
|
|
#ifdef CONFIG_CMD_PART
|
|
#undef CONFIG_CMD_PART
|
|
#endif
|
|
|
|
#endif /* CONFIG_SPL_BUILD */
|
|
|
|
#endif /* __TEGRA_COMMON_POST_H */
|