arm, powerpc: select SYS_GENERIC_BOARD

[people/ms/u-boot.git] / include / configs / hikey.h

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 8ff9077c3714ebe453b80b8395f80119aa8eb9a1..1a4381bfe2f8975465cdc245828420153b03995a 100644 (file)
--- 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
 
@@ -29,6 +29,8 @@
 /* Flat Device Tree Definitions */
 #define CONFIG_OF_LIBFDT
 
+#define CONFIG_BOARD_EARLY_INIT_F
+
 /* Physical Memory Map */
 
 /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
@@ -38,7 +40,8 @@
 #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,15 +58,10 @@
 #define GICC_BASE                      0xf6802000
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (8 << 20))
-
-/* PL011 Serial Configuration */
-#define CONFIG_PL011_SERIAL
-
-#define CONFIG_PL011_CLOCK             19200000
-#define CONFIG_PL01x_PORTS             {(void *)0xF8015000}
-#define CONFIG_CONS_INDEX              0
+#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + SZ_8M)
 
+/* Serial port PL010/PL011 through the device model */
+#define CONFIG_PL01X_SERIAL
 #define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_CMD_USB
@@ -81,9 +79,7 @@
 #endif
 
 #define CONFIG_HIKEY_GPIO
-#define CONFIG_DM_GPIO
 #define CONFIG_CMD_GPIO
-#define CONFIG_DM
 
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC