Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig

[u-boot] / include / configs / stv0991.h

diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index ab1e61cf8961a9af825fc6d3d1ec4d753986df68..0ac262e09549c458b0f10b1f9c5092865527e522 100644 (file)
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -9,13 +9,9 @@
 #define __CONFIG_STV0991_H
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
-#define CONFIG_BOARD_EARLY_INIT_F
 
 #define CONFIG_SYS_CORTEX_R4
 
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_SYS_NO_FLASH
-
 /* ram memory-related information */
 #define CONFIG_NR_DRAM_BANKS                   1
 #define PHYS_SDRAM_1                           0x00000000
@@ -23,18 +19,17 @@
 #define PHYS_SDRAM_1_SIZE                      0x00198000
 
 #define CONFIG_ENV_SIZE                                0x10000
-#define CONFIG_ENV_IS_IN_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)
 
 /* serial port (PL011) configuration */
-#define CONFIG_BAUDRATE                                115200
 #define CONFIG_PL01X_SERIAL
 
 /* user interface */
-#define CONFIG_SYS_PROMPT                      "STV0991> "
 #define CONFIG_SYS_CBSIZE                      1024
 #define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE \
                                                +sizeof(CONFIG_SYS_PROMPT) + 16)
@@ -45,7 +40,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR               0x00190000
 #define CONFIG_SYS_INIT_SP_OFFSET              \
        (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-/* U-boot Load Address */
+/* U-Boot Load Address */
 #define CONFIG_SYS_TEXT_BASE                   0x00010000
 #define CONFIG_SYS_INIT_SP_ADDR                        \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
@@ -53,31 +48,29 @@
 /* GMAC related configs */
 
 #define CONFIG_MII
-#define CONFIG_PHYLIB
-#define CONFIG_CMD_NET
 #define CONFIG_DW_ALTDESCRIPTOR
 #define CONFIG_PHY_MICREL
 
 /* Command support defines */
-#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
 
 /* Misc configuration */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
 
-#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
+
+/*
++ * QSPI support
++ */
+#ifdef CONFIG_OF_CONTROL               /* QSPI is controlled via DT */
+#define CONFIG_CQSPI_DECODER           0
+#define CONFIG_CQSPI_REF_CLK           ((30/4)/2)*1000*1000
+#define CONFIG_BOUNCE_BUFFER
+
+#endif
 
 #endif /* __CONFIG_H */