apalis/colibri imx6: provide proper fdtfile value

[oweals/u-boot.git] / include / configs / spear3xx_evb.h

diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
index d6fdc0932e013eaf61e249d0d4e1e2d69e7c903f..2f642b1a4afd5e2d2ff087a230a30e59729ef375 100644 (file)
--- a/include/configs/spear3xx_evb.h
+++ b/include/configs/spear3xx_evb.h
@@ -1,24 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009
  * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #ifndef __CONFIG_H
@@ -28,41 +11,32 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#if defined(CONFIG_spear300)
-#define CONFIG_SPEAR3XX                                1
-#define CONFIG_SPEAR300                                1
-#elif defined(CONFIG_spear310)
-#define CONFIG_SPEAR3XX                                1
-#define CONFIG_SPEAR310                                1
-#elif defined(CONFIG_spear320)
-#define CONFIG_SPEAR3XX                                1
-#define CONFIG_SPEAR320                                1
+#if defined(CONFIG_SPEAR300)
+#define CONFIG_SPEAR3XX
+#elif defined(CONFIG_SPEAR310)
+#define CONFIG_SPEAR3XX
+#elif defined(CONFIG_SPEAR320)
+#define CONFIG_SPEAR3XX
 #endif
 
-#if defined(CONFIG_usbtty)
+#if defined(CONFIG_USBTTY)
 #define CONFIG_SPEAR_USBTTY
 #endif
 
-#if defined(CONFIG_nand)
-#define CONFIG_ENV_IS_IN_NAND
-#else
-#define CONFIG_ENV_IS_IN_FLASH
-#endif
-
 #include <configs/spear-common.h>
 
 /* Ethernet driver configuration */
-#define CONFIG_DW_ALTDESCRIPTOR                        1
+#define CONFIG_DW_ALTDESCRIPTOR
 
 #if defined(CONFIG_SPEAR310)
-#define CONFIG_MACB                            1
+#define CONFIG_MACB
 #define CONFIG_MACB0_PHY                       0x01
 #define CONFIG_MACB1_PHY                       0x03
 #define CONFIG_MACB2_PHY                       0x05
 #define CONFIG_MACB3_PHY                       0x07
 
 #elif defined(CONFIG_SPEAR320)
-#define CONFIG_MACB                            1
+#define CONFIG_MACB
 #define CONFIG_MACB0_PHY                       0x01
 
 #endif
@@ -106,10 +80,6 @@
 #endif
 
 #if defined(CONFIG_SPEAR_EMI)
-
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-
 #if defined(CONFIG_SPEAR310)
 #define CONFIG_SYS_FLASH_BASE                  0x50000000
 #define CONFIG_SYS_CS1_FLASH_BASE              0x60000000
@@ -139,7 +109,7 @@
 #endif
 
 #define CONFIG_SYS_MAX_FLASH_SECT              (127 + 8)
-#define CONFIG_SYS_FLASH_QUIET_TEST            1
+#define CONFIG_SYS_FLASH_QUIET_TEST
 
 #endif
 
@@ -148,14 +118,24 @@
 #define CONFIG_SYS_FSMC_NAND_8BIT
 
 #if defined(CONFIG_SPEAR300)
-#define CONFIG_SYS_NAND_BASE                   (0x80000000)
+#define CONFIG_SYS_NAND_BASE                   0x80000000
 
 #elif defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_NAND_BASE                   (0x40000000)
+#define CONFIG_SYS_NAND_BASE                   0x40000000
 
 #elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_NAND_BASE                   (0x50000000)
+#define CONFIG_SYS_NAND_BASE                   0x50000000
+
+#endif
+
+/* Environment Settings */
+#if defined(CONFIG_SPEAR300)
+#define CONFIG_EXTRA_ENV_SETTINGS              CONFIG_EXTRA_ENV_USBTTY
 
+#elif defined(CONFIG_SPEAR310) || defined(CONFIG_SPEAR320)
+#define CONFIG_EXTRA_ENV_UNLOCK                        "unlock=yes\0"
+#define CONFIG_EXTRA_ENV_SETTINGS              CONFIG_EXTRA_ENV_USBTTY \
+                                               CONFIG_EXTRA_ENV_UNLOCK
 #endif
 
 #endif  /* __CONFIG_H */