X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fapalis_t30.h;h=daa3be099987ae8eca2f26d67bf3ec098c87f245;hb=2be296538e2e9d2893dc495b3fc8f9f6acb1454c;hp=6d38853ed06f7b9a5258382115089a9a19c1c757;hpb=d5338c693e6a35a7108c184839d688a7377d117c;p=oweals%2Fu-boot.git

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 6d38853ed0..daa3be0999 100644
--- 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+
  */
@@ -12,11 +14,9 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Apalis T30 # "
-#define CONFIG_TEGRA_BOARD_STRING	"Toradex Apalis T30"
+#define CONFIG_DISPLAY_BOARDINFO_LATE	/* Calls show_board_info() */
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
@@ -24,45 +24,26 @@
 
 /* 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" */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE)
+/* Environment in eMMC, before config block at the end of 1st "boot sector" */
+#define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE + \
+					 CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV		0
-#define CONFIG_SYS_MMC_ENV_PART		2
+#define CONFIG_SYS_MMC_ENV_PART		1
 
-/* USB Host support */
-#define CONFIG_USB_EHCI
+/* USB host support */
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
-#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_USB
 
 /* PCI host support */
-#define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
-#define CONFIG_E1000
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_DHCP
-
-/* Miscellaneous commands */
-#define CONFIG_CMD_SETEXPR
-#define CONFIG_FAT_WRITE
+#define CONFIG_IP_DEFRAG
+#define CONFIG_TFTP_BLOCKSIZE		16352
+#define CONFIG_TFTP_TSIZE
 
 /* Increase console I/O buffer size */
 #undef CONFIG_SYS_CBSIZE