mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 15:12:04 +00:00
tegra: Migrate CI_UDC_HAS_HOSTPC to Kconfig
This option is only enabled for CI_UDC and !TEGRA20, so implement it as such in Kconfig directly. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com> Tested-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
parent
4e4fff7d93
commit
bd3ef27886
16 changed files with 4 additions and 32 deletions
|
@ -164,6 +164,10 @@ config TEGRA_DISCONNECT_UDC_ON_BOOT
|
||||||
USB controller when U-Boot boots to avoid leaving a stale USB device
|
USB controller when U-Boot boots to avoid leaving a stale USB device
|
||||||
present.
|
present.
|
||||||
|
|
||||||
|
config CI_UDC_HAS_HOSTPC
|
||||||
|
def_bool y
|
||||||
|
depends on CI_UDC && !TEGRA20
|
||||||
|
|
||||||
config SYS_MALLOC_F_LEN
|
config SYS_MALLOC_F_LEN
|
||||||
default 0x1800
|
default 0x1800
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,6 @@
|
||||||
#undef CONFIG_SYS_MAXARGS
|
#undef CONFIG_SYS_MAXARGS
|
||||||
#define CONFIG_SYS_MAXARGS 32
|
#define CONFIG_SYS_MAXARGS 32
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -49,7 +49,6 @@
|
||||||
#define BOARD_EXTRA_ENV_SETTINGS \
|
#define BOARD_EXTRA_ENV_SETTINGS \
|
||||||
UBOOT_UPDATE
|
UBOOT_UPDATE
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#define CONFIG_TEGRA_SLINK_CTRLS 6
|
#define CONFIG_TEGRA_SLINK_CTRLS 6
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#undef CONFIG_SYS_MAXARGS
|
#undef CONFIG_SYS_MAXARGS
|
||||||
#define CONFIG_SYS_MAXARGS 32
|
#define CONFIG_SYS_MAXARGS 32
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -47,7 +47,6 @@
|
||||||
#define BOARD_EXTRA_ENV_SETTINGS \
|
#define BOARD_EXTRA_ENV_SETTINGS \
|
||||||
UBOOT_UPDATE
|
UBOOT_UPDATE
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* _P2371_0000_H */
|
#endif /* _P2371_0000_H */
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
/* Crystal is 38.4MHz. clk_m runs at half that rate */
|
/* Crystal is 38.4MHz. clk_m runs at half that rate */
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* _P2571_H */
|
#endif /* _P2571_H */
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
"fi\0"
|
"fi\0"
|
||||||
|
|
||||||
/* General networking support */
|
/* General networking support */
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
/* Crystal is 38.4MHz. clk_m runs at half that rate */
|
/* Crystal is 38.4MHz. clk_m runs at half that rate */
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
/*
|
|
||||||
* (C) Copyright 2014
|
|
||||||
* NVIDIA Corporation <www.nvidia.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _TEGRA_COMMON_USB_GADGET_H_
|
|
||||||
#define _TEGRA_COMMON_USB_GADGET_H_
|
|
||||||
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
|
||||||
/* USB gadget mode support*/
|
|
||||||
#ifndef CONFIG_TEGRA20
|
|
||||||
#define CONFIG_CI_UDC_HAS_HOSTPC
|
|
||||||
#endif
|
|
||||||
/* DFU protocol */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _TEGRA_COMMON_USB_GADGET_H_ */
|
|
|
@ -23,7 +23,6 @@
|
||||||
/* SPI */
|
/* SPI */
|
||||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||||
|
|
||||||
#include "tegra-common-usb-gadget.h"
|
|
||||||
#include "tegra-common-post.h"
|
#include "tegra-common-post.h"
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
Loading…
Reference in a new issue