X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fhikey.h;h=36bf22b1870edec595a2d79d2f5db1c9d7f986ea;hb=4db386655a889b6466d2c3f40839ad21205c6d21;hp=33e9aa5ffb45d5cd5b4cf2f7aaee88f3547f3c66;hpb=eaf6ea6a1dc10d49cdcbcad0f8b0abb6c1eb1db1;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 33e9aa5..36bf22b 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -13,29 +13,23 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_POWER_HI6553
-
-#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
 
 /* 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 */
 
 /*
@@ -48,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" \