am335x_evm: do not define usb ether gadget when Eth DM is defined

[u-boot] / include / configs / hikey.h

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index ae8187ad1ccd36d164948e807c42e3e35b281690..3af02132f879a622fcbc3d6c899300dd413cb369 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -31,6 +31,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 */
@@ -40,7 +42,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
@@ -59,13 +62,8 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + SZ_8M)
 
-/* PL011 Serial Configuration */
-#define CONFIG_PL011_SERIAL
-
-#define CONFIG_PL011_CLOCK             19200000
-#define CONFIG_PL01x_PORTS             {(void *)0xF8015000}
-#define CONFIG_CONS_INDEX              0
-
+/* Serial port PL010/PL011 through the device model */
+#define CONFIG_PL01X_SERIAL
 #define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_CMD_USB