Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into...

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

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 09cdd3d..df22584 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -68,7 +68,7 @@
 #define V2M_SYS_CFGSTAT                        (V2M_SYSREGS + 0x0a8)
 
 /* Generic Timer Definitions */
-#define COUNTER_FREQUENCY              (0x1800000)     /* 24MHz */
+#define COUNTER_FREQUENCY              24000000        /* 24MHz */
 
 /* Generic Interrupt Controller Definitions */
 #ifdef CONFIG_GICV3
@@ -85,9 +85,6 @@
 #endif
 #endif /* !CONFIG_GICV3 */
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (8 << 20))
-
 #ifndef CONFIG_TARGET_VEXPRESS64_JUNO
 /* The Vexpress64 simulators use SMSC91C111 */
 #define CONFIG_SMC91111                        1
@@ -105,7 +102,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LOAD_ADDR           (V2M_BASE + 0x10000000)
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   (V2M_BASE)      /* SDRAM Bank #1 */
@@ -117,12 +113,48 @@
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define PHYS_SDRAM_2                   (0x880000000)
 #define PHYS_SDRAM_2_SIZE              0x180000000
+#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP && CONFIG_NR_DRAM_BANKS == 2
+#define PHYS_SDRAM_2                   (0x880000000)
+#define PHYS_SDRAM_2_SIZE              0x80000000
 #endif
 
 /* Enable memtest */
 
 /* Initial environment variables */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
+/* Copy the kernel and FDT to DRAM memory and boot */
+#define BOOTENV_DEV_AFS(devtypeu, devtypel, instance) \
+       "bootcmd_afs="                                                  \
+               "afs load ${kernel_name} ${kernel_addr_r} ;"\
+               "if test $? -eq 1; then "\
+               "  echo Loading ${kernel_alt_name} instead of ${kernel_name}; "\
+               "  afs load ${kernel_alt_name} ${kernel_addr_r};"\
+               "fi ; "\
+               "afs load ${fdtfile} ${fdt_addr_r} ;"\
+               "if test $? -eq 1; then "\
+               "  echo Loading ${fdt_alt_name} instead of ${fdtfile}; "\
+               "  afs load ${fdt_alt_name} ${fdt_addr_r}; "\
+               "fi ; "\
+               "fdt addr ${fdt_addr_r}; fdt resize; " \
+               "if afs load  ${ramdisk_name} ${ramdisk_addr_r} ; "\
+               "then "\
+               "  setenv ramdisk_param ${ramdisk_addr_r}; "\
+               "else "\
+               "  setenv ramdisk_param -; "\
+               "fi ; " \
+               "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}\0"
+#define BOOTENV_DEV_NAME_AFS(devtypeu, devtypel, instance) "afs "
+
+#define BOOT_TARGET_DEVICES(func)      \
+       func(USB, usb, 0)               \
+       func(SATA, sata, 0)             \
+       func(SATA, sata, 1)             \
+       func(PXE, pxe, na)              \
+       func(DHCP, dhcp, na)            \
+       func(AFS, afs, na)
+
+#include <config_distro_bootcmd.h>
+
 /*
  * Defines where the kernel and FDT exist in NOR flash and where it will
  * be copied into DRAM
@@ -136,28 +168,7 @@
                                "fdtfile=board.dtb\0" \
                                "fdt_alt_name=juno\0" \
                                "fdt_addr_r=0x80000000\0" \
-
-/* Copy the kernel and FDT to DRAM memory and boot */
-#define CONFIG_BOOTCOMMAND     "afs load ${kernel_name} ${kernel_addr_r} ;"\
-                               "if test $? -eq 1; then "\
-                               "  echo Loading ${kernel_alt_name} instead of "\
-                               "${kernel_name}; "\
-                               "  afs load ${kernel_alt_name} ${kernel_addr_r};"\
-                               "fi ; "\
-                               "afs load ${fdtfile} ${fdt_addr_r} ;"\
-                               "if test $? -eq 1; then "\
-                               "  echo Loading ${fdt_alt_name} instead of "\
-                               "${fdtfile}; "\
-                               "  afs load ${fdt_alt_name} ${fdt_addr_r}; "\
-                               "fi ; "\
-                               "fdt addr ${fdt_addr_r}; fdt resize; " \
-                               "if afs load  ${ramdisk_name} ${ramdisk_addr_r} ; "\
-                               "then "\
-                               "  setenv ramdisk_param ${ramdisk_addr_r}; "\
-                               "  else setenv ramdisk_param -; "\
-                               "fi ; " \
-                               "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
-
+                               BOOTENV
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS      \
@@ -170,6 +181,7 @@
                                "boot_name=boot.img\0"          \
                                "boot_addr=0x8007f800\0"
 
+#ifndef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND     "if smhload ${boot_name} ${boot_addr}; then " \
                                "  set bootargs; " \
                                "  abootimg addr ${boot_addr}; " \
@@ -187,8 +199,7 @@
                                "  fdt chosen ${initrd_addr} ${initrd_end}; " \
                                "  booti $kernel_addr - $fdt_addr; " \
                                "fi"
-
-
+#endif
 #endif
 
 /* Monitor Command Prompt */