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
Merge git://git.denx.de/u-boot-dm
[platform/kernel/u-boot.git]
/
include
/
configs
/
trimslice.h
diff --git
a/include/configs/trimslice.h
b/include/configs/trimslice.h
index
59f4f67
..
b761640
100644
(file)
--- a/
include/configs/trimslice.h
+++ b/
include/configs/trimslice.h
@@
-12,7
+12,6
@@
#include "tegra20-common.h"
/* High-level configuration options */
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (TrimSlice) # "
#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice"
/* Board-specific serial config */
#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice"
/* Board-specific serial config */
@@
-22,25
+21,16
@@
#define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE
#define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* SPI */
/* SPI */
-#define CONFIG_TEGRA20_SFLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
/* I2C */
#define CONFIG_SYS_I2C_TEGRA
/* I2C */
#define CONFIG_SYS_I2C_TEGRA
-#define CONFIG_CMD_I2C
/* SD/MMC */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
/* SD/MMC */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
-#define CONFIG_CMD_MMC
/* Environment in SPI */
#define CONFIG_ENV_IS_IN_SPI_FLASH
/* Environment in SPI */
#define CONFIG_ENV_IS_IN_SPI_FLASH
@@
-50,11
+40,9
@@
#define CONFIG_ENV_OFFSET (512 * 1024)
/* USB Host support */
#define CONFIG_ENV_OFFSET (512 * 1024)
/* USB Host support */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_STORAGE
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_USB
/* USB networking support */
#define CONFIG_USB_HOST_ETHER
/* USB networking support */
#define CONFIG_USB_HOST_ETHER
@@
-62,17
+50,10
@@
/* PCI host support */
#define CONFIG_PCI
/* PCI host support */
#define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
-
-/* PCI networking support */
-#define CONFIG_RTL8169
/* General networking support */
/* General networking support */
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_DHCP
#include "tegra-common-post.h"
#include "tegra-common-post.h"