global: Move remaining CONFIG_SYS_* to CFG_SYS_*

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

diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h
index c088f2f..fad1f98 100644 (file)
--- a/include/configs/hikey960.h
+++ b/include/configs/hikey960.h
@@ -9,20 +9,16 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M
-
 /* Physical Memory Map */
 
-/* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
+/* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */
 
 #define PHYS_SDRAM_1                   0x00000000
 #define PHYS_SDRAM_1_SIZE              0xC0000000
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                      0xe82b1000
@@ -43,6 +39,5 @@
                                BOOTENV
 
 /* TODO: Remove this once the SD clock is fixed */
-#define CONFIG_SYS_MMC_MAX_BLK_COUNT   1024
 
 #endif /* __HIKEY_H */