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: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR
[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
aea8f1f
..
fe2d688
100644
(file)
--- a/
include/configs/tegra-common-post.h
+++ b/
include/configs/tegra-common-post.h
@@
-1,8
+1,7
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TEGRA_COMMON_POST_H
*/
#ifndef __TEGRA_COMMON_POST_H
@@
-11,7
+10,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#ifdef CONFIG_
USB_FUNCTION_DFU
+#ifdef CONFIG_
DFU_OVER_USB
#define CONFIG_SYS_MALLOC_LEN (SZ_4M + \
CONFIG_SYS_DFU_DATA_BUF_SIZE + \
CONFIG_SYS_DFU_MAX_FILE_SIZE)
#define CONFIG_SYS_MALLOC_LEN (SZ_4M + \
CONFIG_SYS_DFU_DATA_BUF_SIZE + \
CONFIG_SYS_DFU_MAX_FILE_SIZE)
@@
-22,12
+21,21
@@
#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */
#ifndef CONFIG_SPL_BUILD
+
+#if CONFIG_IS_ENABLED(CMD_USB)
+# define BOOT_TARGET_USB(func) func(USB, usb, 0)
+#else
+# define BOOT_TARGET_USB(func)
+#endif
+
+#ifndef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
-
func(USB, usb, 0
) \
+
BOOT_TARGET_USB(func
) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
+#endif
#include <config_distro_bootcmd.h>
#else
#define BOOTENV
#include <config_distro_bootcmd.h>
#else
#define BOOTENV
@@
-41,7
+49,6
@@
#ifdef CONFIG_USB_KEYBOARD
#define STDIN_KBD_USB ",usbkbd"
#ifdef CONFIG_USB_KEYBOARD
#define STDIN_KBD_USB ",usbkbd"
-#define CONFIG_PREBOOT "usb start"
#else
#define STDIN_KBD_USB ""
#endif
#else
#define STDIN_KBD_USB ""
#endif
@@
-74,8
+81,6
@@
#define BOARD_EXTRA_ENV_SETTINGS
#endif
#define BOARD_EXTRA_ENV_SETTINGS
#endif
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-
#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
#endif
#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
#endif
@@
-106,19
+111,10
@@
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-/* remove I2C support */
-#ifdef CONFIG_SYS_I2C_TEGRA
-#undef CONFIG_SYS_I2C_TEGRA
-#endif
-#ifdef CONFIG_CMD_I2C
-#endif
-
/* remove USB */
#ifdef CONFIG_USB_EHCI_TEGRA
#undef CONFIG_USB_EHCI_TEGRA
#endif
/* remove USB */
#ifdef CONFIG_USB_EHCI_TEGRA
#undef CONFIG_USB_EHCI_TEGRA
#endif
-#ifdef CONFIG_CMD_USB
-#endif
#endif /* CONFIG_SPL_BUILD */
#endif /* CONFIG_SPL_BUILD */