Merge remote-tracking branch 'u-boot-imx/master'

[karo-tx-uboot.git] / include / configs / gplugd.h

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 5f72163473f074f3f7b8ec5e89ef493dbcf822f8..404c56af104539bf7b77c65c2110b9fcf309dfd5 100644 (file)
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -9,28 +9,22 @@
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
  * Contributor: Mahavir Jain <mjain@marvell.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_GPLUGD_H
 #define __CONFIG_GPLUGD_H
 
+/*
+ * FIXME: fix for error caused due to recent update to mach-types.h
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_SHEEVAD
+#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
+#else
+#define MACH_TYPE_SHEEVAD      2625
+#endif
+
 /*
  * Version number information
  */
@@ -42,7 +36,7 @@
 #define CONFIG_SHEEVA_88SV331xV5       1       /* CPU Core subversion */
 #define CONFIG_ARMADA100               1       /* SOC Family Name */
 #define CONFIG_ARMADA168               1       /* SOC Used on this Board */
-#define CONFIG_MACH_SHEEVAD                    /* Machine type */
+#define CONFIG_MACH_TYPE               MACH_TYPE_SHEEVAD /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 
 #define        CONFIG_SYS_TEXT_BASE    0x00f00000
@@ -60,8 +54,10 @@
 #define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
 #include <config_cmd_default.h>
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_FPGA
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
 
 /* Disable DCACHE */
 #define CONFIG_SYS_DCACHE_OFF
@@ -69,7 +65,6 @@
 /* Network configuration */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_NET_MULTI
 #define CONFIG_ARMADA100_FEC
 
 /* DHCP Support */
@@ -91,6 +86,15 @@
 /* GPIO Configuration for PHY */
 #define CONFIG_SYS_GPIO_PHY_RST                104     /* GPIO104 */
 
+/* SPI Support */
+#define CONFIG_ARMADA100_SPI
+#define CONFIG_ENV_SPI_CS              110
+#define CONFIG_SYS_SSP_PORT            2
+
+/* Flash Support */
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH_ATMEL
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
@@ -107,7 +111,24 @@
 /*
  * Environment variables configurations
  */
-#define CONFIG_ENV_IS_NOWHERE  1       /* if env in SDRAM */
-#define CONFIG_ENV_SIZE        0x20000         /* 64k */
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE           0x4000
+#define CONFIG_ENV_SIZE                        0x4000
+#define CONFIG_ENV_OFFSET              0x07C000
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_EDITENV
+#define CONFIG_CMD_SAVEENV
+
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ARMADA100
+#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_STORAGE
+#endif /* CONFIG_CMD_USB */
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
+#define CONFIG_SUPPORT_VFAT
 
 #endif /* __CONFIG_GPLUGD_H */