vexpress64: fvp dram: add DRAM configuration

[oweals/u-boot.git] / include / configs / vexpress_aemv8a.h

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 032010bb9e024f1b5322145696f2c7b348424db0..c1e2e111c94186e1645ad3d4c8cf22233f356145 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -10,7 +10,6 @@
 
 /* We use generic board and device manager for v8 Versatile Express */
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DM
 
 #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #ifndef CONFIG_SEMIHOSTING
@@ -31,7 +30,8 @@
 #define CONFIG_BOOTP_VCI_STRING                "U-boot.armv8.vexpress_aemv8a"
 
 /* Link Definitions */
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
+#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
+       defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
 /* ATF loads u-boot here for BASE_FVP model */
 #define CONFIG_SYS_TEXT_BASE           0x88000000
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
@@ -42,6 +42,8 @@
 #error "Unknown board variant"
 #endif
 
+#define CONFIG_SYS_BOOTM_LEN (64 << 20)      /* Increase max gunzip size */
+
 /* Flat Device Tree Definitions */
 #define CONFIG_OF_LIBFDT
 
@@ -102,7 +104,8 @@
 #define GICR_BASE                      (0x2f100000)
 #else
 
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
+#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
+       defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
 #define GICD_BASE                      (0x2f000000)
 #define GICC_BASE                      (0x2c000000)
 #elif CONFIG_TARGET_VEXPRESS64_JUNO
@@ -113,11 +116,7 @@
 #endif
 #endif /* !CONFIG_GICV3 */
 
-#define CONFIG_SYS_MEMTEST_START       V2M_BASE
-#define CONFIG_SYS_MEMTEST_END         (V2M_BASE + 0x80000000)
-
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_F_LEN                0x2000
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (8 << 20))
 
 /* Ethernet Configuration */
@@ -133,7 +132,6 @@
 #endif
 
 /* PL011 Serial Configuration */
-#define CONFIG_DM_SERIAL
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_CONS_INDEX              0
 #define CONFIG_PL01X_SERIAL
@@ -148,23 +146,13 @@
 #define CONFIG_MENU
 /*#define CONFIG_MENU_SHOW*/
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_BDI
 #define CONFIG_CMD_BOOTI
 #define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PXE
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_SOURCE
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
@@ -182,8 +170,15 @@
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM_1                   (V2M_BASE)      /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE              0x80000000      /* 2048 MB */
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+/* Top 16MB reserved for secure world use */
+#define DRAM_SEC_SIZE          0x01000000
+#define PHYS_SDRAM_1_SIZE      0x80000000 - DRAM_SEC_SIZE
+#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+
+/* Enable memtest */
+#define CONFIG_CMD_MEMTEST
+#define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
+#define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
 
 /* Initial environment variables */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
@@ -202,7 +197,9 @@
 /* Assume we boot with root on the first partition of a USB stick */
 #define CONFIG_BOOTARGS                "console=ttyAMA0,115200n8 " \
                                "root=/dev/sda1 rw " \
-                               "earlyprintk=pl011,0x7ff80000 debug user_debug=31 "\
+                               "rootwait "\
+                               "earlyprintk=pl011,0x7ff80000 debug "\
+                               "user_debug=31 "\
                                "loglevel=9"
 
 /* Copy the kernel and FDT to DRAM memory and boot */
@@ -215,7 +212,7 @@
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-                               "kernel_name=uImage\0"          \
+                               "kernel_name=Image\0"           \
                                "kernel_addr=0x80000000\0"      \
                                "initrd_name=ramdisk.img\0"     \
                                "initrd_addr=0x88000000\0"      \
@@ -229,11 +226,31 @@
                                "loglevel=9"
 
 #define CONFIG_BOOTCOMMAND     "smhload ${kernel_name} ${kernel_addr}; " \
-                               "smhload ${fdt_name} $fdt_addr; " \
-                               "smhload ${initrd_name} $initrd_addr initrd_end; " \
-                               "fdt addr $fdt_addr; fdt resize; " \
-                               "fdt chosen $initrd_addr $initrd_end; " \
-                               "bootm $kernel_addr - $fdt_addr"
+                               "smhload ${fdt_name} ${fdt_addr}; " \
+                               "smhload ${initrd_name} ${initrd_addr} "\
+                               "initrd_end; " \
+                               "fdt addr ${fdt_addr}; fdt resize; " \
+                               "fdt chosen ${initrd_addr} ${initrd_end}; " \
+                               "booti $kernel_addr - $fdt_addr"
+
+#define CONFIG_BOOTDELAY               1
+
+#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM
+#define CONFIG_EXTRA_ENV_SETTINGS      \
+                               "kernel_addr=0x80080000\0"      \
+                               "initrd_addr=0x84000000\0"      \
+                               "fdt_addr=0x83000000\0"         \
+                               "fdt_high=0xffffffffffffffff\0" \
+                               "initrd_high=0xffffffffffffffff\0"
+
+#define CONFIG_BOOTARGS                "console=ttyAMA0 earlyprintk=pl011,"\
+                               "0x1c090000 debug user_debug=31 "\
+                               "androidboot.hardware=fvpbase "\
+                               "root=/dev/vda2 rw "\
+                               "rootwait "\
+                               "loglevel=9"
+
+#define CONFIG_BOOTCOMMAND     "booti $kernel_addr $initrd_addr $fdt_addr"
 
 #define CONFIG_BOOTDELAY               1
 
@@ -247,7 +264,6 @@
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT              "VExpress64# "
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
                                        sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_HUSH_PARSER
@@ -260,10 +276,10 @@
 #ifndef CONFIG_TARGET_VEXPRESS64_JUNO
 #define CONFIG_SYS_NO_FLASH
 #else
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_ARMFLASH
 #define CONFIG_SYS_FLASH_CFI           1
 #define CONFIG_FLASH_CFI_DRIVER                1
+#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 #define CONFIG_SYS_FLASH_SIZE          0x04000000 /* 64 MiB */
 #define CONFIG_SYS_MAX_FLASH_BANKS     2