projects
/
oweals
/
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-sunxi
[oweals/u-boot.git]
/
include
/
configs
/
apalis_t30.h
diff --git
a/include/configs/apalis_t30.h
b/include/configs/apalis_t30.h
index bcaea95c4573a35f574b0d5181d96ca772acfd60..e2acc6e8c9c5dc1eecd3b62ab36827bd88a43258 100644
(file)
--- a/
include/configs/apalis_t30.h
+++ b/
include/configs/apalis_t30.h
@@
-1,5
+1,7
@@
/*
/*
- * Copyright (c) 2014-2015 Marcel Ziswiler
+ * Copyright (c) 2014-2016 Marcel Ziswiler
+ *
+ * Configuration settings for the Toradex Apalis T30 modules.
*
* SPDX-License-Identifier: GPL-2.0+
*/
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@
-12,7
+14,7
@@
#include "tegra30-common.h"
/* High-level configuration options */
#include "tegra30-common.h"
/* High-level configuration options */
-#define CONFIG_
TEGRA_BOARD_STRING "Toradex Apalis 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
@@
-22,40
+24,28
@@
/* 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
-#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
H
ost support */
+/* USB
h
ost support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
-#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_USB
/* PCI host support */
/* PCI host support */
-#define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
/* PCI networking support */
/* PCI networking support */
-#define CONFIG_E1000
#define CONFIG_E1000_NO_NVM
/* General networking support */
#define CONFIG_E1000_NO_NVM
/* General networking support */
-#define CONFIG_CMD_DHCP
+#define CONFIG_IP_DEFRAG
+#define CONFIG_TFTP_BLOCKSIZE 16352
+#define CONFIG_TFTP_TSIZE
/* Miscellaneous commands */
#define CONFIG_FAT_WRITE
/* Miscellaneous commands */
#define CONFIG_FAT_WRITE