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 branch 'master' of git://git.denx.de/u-boot-i2c
[platform/kernel/u-boot.git]
/
include
/
configs
/
colibri_t30.h
diff --git
a/include/configs/colibri_t30.h
b/include/configs/colibri_t30.h
index
47914c7
..
853cd52
100644
(file)
--- a/
include/configs/colibri_t30.h
+++ b/
include/configs/colibri_t30.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2013-201
5
Stefan Agner
+ * Copyright (c) 2013-201
6
Stefan Agner
*
* Configuration settings for the Toradex Colibri T30 modules.
*
*
* Configuration settings for the Toradex Colibri T30 modules.
*
@@
-13,10
+13,8
@@
#include "tegra30-common.h"
#include "tegra30-common.h"
-#define CONFIG_ARCH_MISC_INIT
-
/* High-level configuration options */
/* High-level configuration options */
-#define CONFIG_
TEGRA_BOARD_STRING "Toradex Colibri T30"
+#define CONFIG_
DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
@@
-26,34
+24,24
@@
/* I2C */
#define CONFIG_SYS_I2C_TEGRA
/* I2C */
#define CONFIG_SYS_I2C_TEGRA
-#define CONFIG_CMD_I2C
-
-/* SD/MMC support */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA_MMC
-#define CONFIG_CMD_MMC
-/* Environment in eMMC,
at the end of 2nd
"boot sector" */
+/* Environment in eMMC,
before config block at the end of 1st
"boot sector" */
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
+ CONFIG_TDX_CFG_BLOCK_OFFSET)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_SYS_MMC_ENV_PART
2
+#define CONFIG_SYS_MMC_ENV_PART
1
/* USB host support */
/* USB host support */
-#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_USB
/* USB networking support */
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
/* General networking support */
/* USB networking support */
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
/* General networking support */
-#define CONFIG_CMD_DHCP
#define CONFIG_IP_DEFRAG
#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE 163
84
+#define CONFIG_TFTP_BLOCKSIZE 163
52
#define CONFIG_TFTP_TSIZE
/* Miscellaneous commands */
#define CONFIG_TFTP_TSIZE
/* Miscellaneous commands */