Merge branch '2020-05-07-more-kconfig-migrations'

[oweals/u-boot.git] / include / configs / linkit-smart-7688.h

diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h
index 3bae92d0ee7ac12f7c3d447ed7a184976b5b5d67..d7ebfeda4c568498fbc8fc38d2095932b2b9585b 100644 (file)
--- a/include/configs/linkit-smart-7688.h
+++ b/include/configs/linkit-smart-7688.h
@@ -7,7 +7,7 @@
 #define __CONFIG_LINKIT_SMART_7688_H
 
 /* CPU */
-#define CONFIG_SYS_MIPS_TIMER_FREQ     200000000
+#define CONFIG_SYS_MIPS_TIMER_FREQ     290000000
 
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
@@ -16,17 +16,35 @@
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
-#ifdef CONFIG_BOOT_RAM
+/* SPL */
+#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
+#define CONFIG_SYS_UBOOT_START         CONFIG_SYS_TEXT_BASE
+#define CONFIG_SPL_BSS_START_ADDR      0x80010000
+#define CONFIG_SPL_BSS_MAX_SIZE                0x10000
+#define CONFIG_SPL_MAX_SIZE            0x10000
+#define CONFIG_SPL_PAD_TO              0
+
+/* Dummy value */
+#define CONFIG_SYS_UBOOT_BASE          0
+
+/* Serial SPL */
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL_SUPPORT)
+#define CONFIG_SYS_NS16550_MEM32
+#define CONFIG_SYS_NS16550_CLK         40000000
+#define CONFIG_SYS_NS16550_REG_SIZE    -4
+#define CONFIG_SYS_NS16550_COM3                0xb0000e00
+#define CONFIG_CONS_INDEX              3
+
+#endif
+
 /* UART */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, \
-                                         230400, 500000, 1500000 }
+                                         230400, 460800, 921600 }
 
 /* RAM */
-#define CONFIG_SYS_MEMTEST_START       0x80100000
-#define CONFIG_SYS_MEMTEST_END         0x80400000
 
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS             64
@@ -38,9 +56,6 @@
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 /* Environment settings */
-#define CONFIG_ENV_OFFSET              0x80000
-#define CONFIG_ENV_SIZE                        (16 << 10)
-#define CONFIG_ENV_SECT_SIZE           (64 << 10)
 
 /*
  * Environment is right behind U-Boot in flash. Make sure U-Boot