X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fhikey.h;h=c7fb8a5f8e9e3efc6f261700ce29cf98ee9aafd1;hb=8d3a25685e4aac7070365a2b3c53c2c81b27930f;hp=8ff9077c3714ebe453b80b8395f80119aa8eb9a1;hpb=fcd78fa604d994477fd209b9faab4a974b103250;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 8ff9077..c7fb8a5 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -12,8 +12,8 @@
 #ifndef __HIKEY_H
 #define __HIKEY_H
 
-/* We use generic board for hikey */
-#define CONFIG_SYS_GENERIC_BOARD
+#include <linux/sizes.h>
+
 #define CONFIG_POWER
 #define CONFIG_POWER_HI6553
 
@@ -21,24 +21,17 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-/* Cache Definitions */
-#define CONFIG_SYS_DCACHE_OFF
-
-#define CONFIG_IDENT_STRING		"hikey"
-
-/* Flat Device Tree Definitions */
-#define CONFIG_OF_LIBFDT
-
 /* Physical Memory Map */
 
 /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
 #define CONFIG_SYS_TEXT_BASE		0x35000000
 
-#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_NR_DRAM_BANKS		6
 #define PHYS_SDRAM_1			0x00000000
 
 /* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
-#define PHYS_SDRAM_1_SIZE		0x3f000000
+#define PHYS_SDRAM_1_SIZE		0x3EFFFFFF
+
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 #define CONFIG_SYS_INIT_RAM_SIZE	0x1000
@@ -55,25 +48,16 @@
 #define GICC_BASE			0xf6802000
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (8 << 20))
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + SZ_8M)
 
-/* PL011 Serial Configuration */
-#define CONFIG_PL011_SERIAL
+/* Serial port PL010/PL011 through the device model */
+#define CONFIG_PL01X_SERIAL
 
-#define CONFIG_PL011_CLOCK		19200000
-#define CONFIG_PL01x_PORTS		{(void *)0xF8015000}
-#define CONFIG_CONS_INDEX		0
-
-#define CONFIG_BAUDRATE			115200
-
-#define CONFIG_CMD_USB
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_DWC2
 #define CONFIG_USB_DWC2_REG_ADDR 0xF72C0000
 /*#define CONFIG_DWC2_DFLT_SPEED_FULL*/
 #define CONFIG_DWC2_ENABLE_DYNAMIC_FIFO
 
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_USB_ETHER_ASIX
@@ -81,25 +65,13 @@
 #endif
 
 #define CONFIG_HIKEY_GPIO
-#define CONFIG_DM_GPIO
-#define CONFIG_CMD_GPIO
-#define CONFIG_DM
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_DWMMC
-#define CONFIG_HIKEY_DWMMC
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_CMD_MMC
 
 #define CONFIG_FS_EXT4
 
 /* Command line configuration */
-#define CONFIG_MENU
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_UNZIP
-#define CONFIG_CMD_ENV
 
 #define CONFIG_MTD_PARTITIONS
 
@@ -126,34 +98,27 @@
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 				"kernel_name=Image\0"	\
 				"kernel_addr_r=0x00080000\0" \
-				"fdt_name=hi6220-hikey.dtb\0" \
+				"fdtfile=hi6220-hikey.dtb\0" \
 				"fdt_addr_r=0x02000000\0" \
 				"fdt_high=0xffffffffffffffff\0" \
 				"initrd_high=0xffffffffffffffff\0" \
 				BOOTENV
 
-
-/* Preserve enviroment on sd card */
-#define CONFIG_COMMAND_HISTORY
-
+/* Preserve environment on sd card */
 #define CONFIG_ENV_SIZE			0x1000
 #define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE               "mmc"
 #define FAT_ENV_DEVICE_AND_PART         "1:1"
 #define FAT_ENV_FILE                    "uboot.env"
-#define CONFIG_FAT_WRITE
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_MAXARGS		64	/* max command args */
 
-#define CONFIG_SYS_NO_FLASH
-
 #endif /* __HIKEY_H */