Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[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 b2c14f9..09cdd3d 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -7,12 +7,6 @@
 #ifndef __VEXPRESS_AEMV8A_H
 #define __VEXPRESS_AEMV8A_H
 
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
-#ifndef CONFIG_SEMIHOSTING
-#error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING
-#endif
-#endif
-
 #define CONFIG_REMAKE_ELF
 
 /* Link Definitions */
@@ -102,7 +96,7 @@
 
 /* PL011 Serial Configuration */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_PL011_CLOCK             7273800
+#define CONFIG_PL011_CLOCK             7372800
 #else
 #define CONFIG_PL011_CLOCK             24000000
 #endif
@@ -126,8 +120,6 @@
 #endif
 
 /* Enable 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
@@ -138,35 +130,33 @@
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                "kernel_name=norkern\0" \
                                "kernel_alt_name=Image\0"       \
-                               "kernel_addr=0x80080000\0" \
-                               "initrd_name=ramdisk.img\0"     \
-                               "initrd_addr=0x84000000\0"      \
+                               "kernel_addr_r=0x80080000\0" \
+                               "ramdisk_name=ramdisk.img\0"    \
+                               "ramdisk_addr_r=0x88000000\0"   \
                                "fdtfile=board.dtb\0" \
                                "fdt_alt_name=juno\0" \
-                               "fdt_addr=0x83000000\0" \
-                               "fdt_high=0xffffffffffffffff\0" \
-                               "initrd_high=0xffffffffffffffff\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} ; " \
+#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};"\
+                               "  afs load ${kernel_alt_name} ${kernel_addr_r};"\
                                "fi ; "\
-                               "afs load  ${fdtfile} ${fdt_addr} ; " \
+                               "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}; "\
+                               "  afs load ${fdt_alt_name} ${fdt_addr_r}; "\
                                "fi ; "\
-                               "fdt addr ${fdt_addr}; fdt resize; " \
-                               "if afs load  ${initrd_name} ${initrd_addr} ; "\
+                               "fdt addr ${fdt_addr_r}; fdt resize; " \
+                               "if afs load  ${ramdisk_name} ${ramdisk_addr_r} ; "\
                                "then "\
-                               "  setenv initrd_param ${initrd_addr}; "\
-                               "  else setenv initrd_param -; "\
+                               "  setenv ramdisk_param ${ramdisk_addr_r}; "\
+                               "  else setenv ramdisk_param -; "\
                                "fi ; " \
-                               "booti ${kernel_addr} ${initrd_param} ${fdt_addr}"
+                               "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
 
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
@@ -177,16 +167,26 @@
                                "initrd_addr=0x88000000\0"      \
                                "fdtfile=devtree.dtb\0"         \
                                "fdt_addr=0x83000000\0"         \
-                               "fdt_high=0xffffffffffffffff\0" \
-                               "initrd_high=0xffffffffffffffff\0"
-
-#define CONFIG_BOOTCOMMAND     "smhload ${kernel_name} ${kernel_addr}; " \
-                               "smhload ${fdtfile} ${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"
+                               "boot_name=boot.img\0"          \
+                               "boot_addr=0x8007f800\0"
+
+#define CONFIG_BOOTCOMMAND     "if smhload ${boot_name} ${boot_addr}; then " \
+                               "  set bootargs; " \
+                               "  abootimg addr ${boot_addr}; " \
+                               "  abootimg get dtb --index=0 fdt_addr; " \
+                               "  bootm ${boot_addr} ${boot_addr} " \
+                               "  ${fdt_addr}; " \
+                               "else; " \
+                               "  set fdt_high 0xffffffffffffffff; " \
+                               "  set initrd_high 0xffffffffffffffff; " \
+                               "  smhload ${kernel_name} ${kernel_addr}; " \
+                               "  smhload ${fdtfile} ${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; " \
+                               "fi"
 
 
 #endif
@@ -201,22 +201,22 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      259
 /* Store environment at top of flash in the same location as blank.img */
 /* in the Juno firmware. */
-#define CONFIG_ENV_ADDR                        0x0BFC0000
-#define CONFIG_ENV_SECT_SIZE           0x00010000
 #else
 #define CONFIG_SYS_FLASH_BASE          0x0C000000
 /* 256 x 256KiB sectors */
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 /* Store environment at top of flash */
-#define CONFIG_ENV_ADDR                        0x0FFC0000
-#define CONFIG_ENV_SECT_SIZE           0x00040000
 #endif
 
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 
+#ifdef CONFIG_USB_EHCI_HCD
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
+#endif
+
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */
 #define FLASH_MAX_SECTOR_SIZE          0x00040000
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
 
 #endif /* __VEXPRESS_AEMV8A_H */