Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / include / configs / apalis_t30.h

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 61809fc..646086a 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -1,7 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (c) 2014 Marcel Ziswiler
+ * Copyright (c) 2014-2016 Marcel Ziswiler
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Configuration settings for the Toradex Apalis T30 modules.
  */
 
 #ifndef __CONFIG_H
@@ -12,59 +13,46 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT                       "Apalis T30 # "
-#define CONFIG_TEGRA_BOARD_STRING      "Toradex Apalis T30"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_APALIS_T30
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* 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
-
-/* USB networking support */
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
 
 /* PCI host support */
-#undef CONFIG_PCI      /* just define once Tegra PCIe support got merged */
-#define CONFIG_PCI_TEGRA
-#define CONFIG_PCI_PNP
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
-#define CONFIG_E1000
-#undef CONFIG_E1000_NO_NVM     /* just define once E1000 driver got fixed */
+#define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_DHCP
+#define CONFIG_IP_DEFRAG
+#define CONFIG_TFTP_BLOCKSIZE          16352
+#define CONFIG_TFTP_TSIZE
+
+/* Increase console I/O buffer size */
+#undef CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_CBSIZE              1024
+
+/* Increase arguments buffer size */
+#undef CONFIG_SYS_BARGSIZE
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
+/* Increase maximum number of arguments */
+#undef CONFIG_SYS_MAXARGS
+#define CONFIG_SYS_MAXARGS             32
 
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"