projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare v2023.10
[platform/kernel/u-boot.git]
/
include
/
configs
/
tegra-common-post.h
diff --git
a/include/configs/tegra-common-post.h
b/include/configs/tegra-common-post.h
index
c8f9d7c
..
0d0965e
100644
(file)
--- a/
include/configs/tegra-common-post.h
+++ b/
include/configs/tegra-common-post.h
@@
-7,12
+7,22
@@
#ifndef __TEGRA_COMMON_POST_H
#define __TEGRA_COMMON_POST_H
#ifndef __TEGRA_COMMON_POST_H
#define __TEGRA_COMMON_POST_H
-#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */
+#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_
USB
)
-#
define BOOT_TARGET_USB(func) func(USB, usb, 0
)
+#if CONFIG_IS_ENABLED(CMD_
DHCP) && CONFIG_IS_ENABLED(CMD_PXE
)
+#
define BOOT_TARGET_PXE(func) func(PXE, pxe, na
)
#else
#else
-# define BOOT_TARGET_USB(func)
+#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
#endif
#ifndef BOOT_TARGET_DEVICES
@@
-20,8
+30,8
@@
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
BOOT_TARGET_USB(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
BOOT_TARGET_USB(func) \
-
func(PXE, pxe, na
) \
-
func(DHCP, dhcp, na
)
+
BOOT_TARGET_PXE(func
) \
+
BOOT_TARGET_DHCP(func
)
#endif
#include <config_distro_bootcmd.h>
#endif
#include <config_distro_bootcmd.h>
@@
-37,13
+47,13
@@
#define STDIN_KBD_USB ""
#endif
#define STDIN_KBD_USB ""
#endif
-#ifdef CONFIG_
LC
D
-#define STD
OUT_LCD ",lc
d"
+#ifdef CONFIG_
BUTTON_KEYBOAR
D
+#define STD
IN_BTN_KBD ",button-kb
d"
#else
#else
-#define STD
OUT_LC
D ""
+#define STD
IN_BTN_KB
D ""
#endif
#endif
-#ifdef CONFIG_
DM_
VIDEO
+#ifdef CONFIG_VIDEO
#define STDOUT_VIDEO ",vidconsole"
#else
#define STDOUT_VIDEO ""
#define STDOUT_VIDEO ",vidconsole"
#else
#define STDOUT_VIDEO ""
@@
-56,9
+66,9
@@
#endif
#define TEGRA_DEVICE_SETTINGS \
#endif
#define TEGRA_DEVICE_SETTINGS \
- "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \
- "stdout=serial" STDOUT_
LCD STDOUT_
VIDEO "\0" \
- "stderr=serial" STDOUT_
LCD STDOUT_
VIDEO "\0" \
+ "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC
STDIN_BTN_KBD
"\0" \
+ "stdout=serial" STDOUT_VIDEO "\0" \
+ "stderr=serial" STDOUT_VIDEO "\0" \
""
#ifndef BOARD_EXTRA_ENV_SETTINGS
""
#ifndef BOARD_EXTRA_ENV_SETTINGS
@@
-73,7
+83,7
@@
#define INITRD_HIGH "ffffffff"
#endif
#define INITRD_HIGH "ffffffff"
#endif
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
TEGRA_DEVICE_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
"fdt_high=" FDT_HIGH "\0" \
TEGRA_DEVICE_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
"fdt_high=" FDT_HIGH "\0" \
@@
-81,8
+91,4
@@
BOOTENV \
BOARD_EXTRA_ENV_SETTINGS
BOOTENV \
BOARD_EXTRA_ENV_SETTINGS
-#if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
-#define CONFIG_TEGRA_SPI
-#endif
-
#endif /* __TEGRA_COMMON_POST_H */
#endif /* __TEGRA_COMMON_POST_H */