Merge branch 'tx6-update-2016-02-03' into karo-tx6

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

diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 071b1c2ca79e62828f46d790210285505f45e185..b1b69197d4f6dbc63407f1e4f131b2e455647c28 100644 (file)
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -23,28 +23,19 @@
 #define PHYS_SDRAM_1_SIZE                      0x00198000
 
 #define CONFIG_ENV_SIZE                                0x10000
-#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE                   CONFIG_ENV_SIZE
+#define CONFIG_ENV_OFFSET                      0x30000
 #define CONFIG_ENV_ADDR                                \
        (PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)
 #define CONFIG_SYS_MAXARGS                     16
 #define CONFIG_SYS_MALLOC_LEN                  (CONFIG_ENV_SIZE + 16 * 1024)
 
-#define CONFIG_DM
 /* serial port (PL011) configuration */
 #define CONFIG_BAUDRATE                                115200
-#ifdef CONFIG_DM
-#define CONFIG_DM_SERIAL
 #define CONFIG_PL01X_SERIAL
-#else
-#define CONFIG_SYS_SERIAL0                     0x80406000
-#define CONFIG_CONS_INDEX                      0
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL01x_PORTS                     {(void *)CONFIG_SYS_SERIAL0}
-#define CONFIG_PL011_CLOCK                     (2700 * 1000)
-#endif
 
 /* user interface */
-#define CONFIG_SYS_PROMPT                      "STV0991> "
 #define CONFIG_SYS_CBSIZE                      1024
 #define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE \
                                                +sizeof(CONFIG_SYS_PROMPT) + 16)
@@ -64,8 +55,6 @@
 
 #define CONFIG_MII
 #define CONFIG_PHYLIB
-#define CONFIG_CMD_NET
-#define CONFIG_DESIGNWARE_ETH
 #define CONFIG_DW_ALTDESCRIPTOR
 #define CONFIG_PHY_MICREL
 
@@ -73,9 +62,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 
-#include "config_cmd_default.h"
-#undef CONFIG_CMD_SAVEENV
-
 #define CONFIG_SYS_MEMTEST_START               0x0000
 #define CONFIG_SYS_MEMTEST_END                 1024*1024
 #define CONFIG_CMD_MEMTEST
@@ -86,9 +72,21 @@
 
 #define CONFIG_BOOTDELAY                       3
 #define CONFIG_BOOTCOMMAND                     "go 0x40040000"
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_STOP_STR               " "
-#define CONFIG_AUTOBOOT_PROMPT                 \
-       "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay
+
+#define CONFIG_OF_LIBFDT
+
+/*
++ * QSPI support
++ */
+#ifdef CONFIG_OF_CONTROL               /* QSPI is controlled via DT */
+#define CONFIG_CADENCE_QSPI
+#define CONFIG_CQSPI_DECODER           0
+#define CONFIG_CQSPI_REF_CLK           ((30/4)/2)*1000*1000
+#define CONFIG_CMD_SPI
+
+#define CONFIG_SPI_FLASH_STMICRO       /* Micron/Numonyx flash */
+#define CONFIG_SPI_FLASH_WINBOND       /* WINBOND */
+#define CONFIG_CMD_SF
+#endif
 
 #endif /* __CONFIG_H */