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
global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG
[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
..
0fdb5a8
100644
(file)
--- a/
include/configs/tegra-common-post.h
+++ b/
include/configs/tegra-common-post.h
@@
-7,8
+7,6
@@
#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 CONFIG_IS_ENABLED(CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
#if CONFIG_IS_ENABLED(CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
@@
-37,13
+35,7
@@
#define STDIN_KBD_USB ""
#endif
#define STDIN_KBD_USB ""
#endif
-#ifdef CONFIG_LCD
-#define STDOUT_LCD ",lcd"
-#else
-#define STDOUT_LCD ""
-#endif
-
-#ifdef CONFIG_DM_VIDEO
+#ifdef CONFIG_VIDEO
#define STDOUT_VIDEO ",vidconsole"
#else
#define STDOUT_VIDEO ""
#define STDOUT_VIDEO ",vidconsole"
#else
#define STDOUT_VIDEO ""
@@
-57,8
+49,8
@@
#define TEGRA_DEVICE_SETTINGS \
"stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \
#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" \
+ "stdout=serial" STDOUT_VIDEO "\0" \
+ "stderr=serial" STDOUT_VIDEO "\0" \
""
#ifndef BOARD_EXTRA_ENV_SETTINGS
""
#ifndef BOARD_EXTRA_ENV_SETTINGS
@@
-73,7
+65,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
+73,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 */