Merge tag 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 18c1e83..36bf22b 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -13,8 +13,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_POWER_HI6553
-
 /* Physical Memory Map */
 
 /* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */
@@ -24,16 +22,14 @@
 /* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
 #define PHYS_SDRAM_1_SIZE              0x3EFFFFFF
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
 
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE                      0xf6801000
 #define GICC_BASE                      0xf6802000
 
-#define CONFIG_HIKEY_GPIO
-
 /* Initial environment variables */
 
 /*
@@ -46,7 +42,7 @@
        func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
                                "kernel_name=Image\0"   \
                                "kernel_addr_r=0x00080000\0" \
                                "fdtfile=hi6220-hikey.dtb\0" \