global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

[platform/kernel/u-boot.git] / include / configs / mt8518.h

diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 514722b..a300546 100644 (file)
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-/* Machine ID */
 #define CONFIG_SYS_NONCACHED_MEMORY            SZ_1M
 
 #define CONFIG_CPU_ARMV8
@@ -23,7 +22,6 @@
 #define CONFIG_SYS_SDRAM_SIZE                  0x20000000
 
 #define CONFIG_SYS_LOAD_ADDR                   0x41000000
-#define CONFIG_LOADADDR                                CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_SYS_MALLOC_LEN                  SZ_32M
 #define CONFIG_SYS_BOOTM_LEN                   SZ_64M
@@ -33,17 +31,10 @@
                                                SZ_2M - \
                                                GENERATED_GBL_DATA_SIZE)
 
-/* ENV Setting */
-#if defined(CONFIG_MMC_MTK)
-#define CONFIG_SYS_MMC_ENV_DEV                 0
-#define CONFIG_ENV_OVERWRITE
-
-/* MMC offset in block unit,and block size is 0x200 */
 #define ENV_BOOT_READ_IMAGE \
        "boot_rd_img=mmc dev 0" \
        ";mmc read ${loadaddr} 0x27400 0x4000" \
        ";iminfo ${loadaddr}\0"
-#endif
 
 /* Console configuration */
 #define ENV_DEVICE_SETTINGS \
@@ -54,10 +45,15 @@
 #define ENV_BOOT_CMD \
        "mtk_boot=run boot_rd_img;bootm;\0"
 
+#define ENV_FASTBOOT \
+       "serial#=1234567890ABCDEF\0" \
+       "board=mt8518\0"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0x6c000000\0" \
        ENV_DEVICE_SETTINGS \
        ENV_BOOT_READ_IMAGE \
+       ENV_FASTBOOT \
        ENV_BOOT_CMD \
        "bootcmd=run mtk_boot;\0" \