ARM: rmobile: Point load address to more sane area on Gen2

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

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index aae2cb8301d80018d1001f8a37c0353cb0f44d1f..09ec429b1f455fc08f163118f0c869f010e62f91 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  *
  * Configuration settings for the STM32MP15x CPU
- *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
  */
 
 #ifndef __CONFIG_H
@@ -17,8 +16,11 @@
  * Number of clock ticks in 1 sec
  */
 #define CONFIG_SYS_HZ                          1000
-#define CONFIG_SYS_ARCH_TIMER
-#define CONFIG_SYS_HZ_CLOCK                    64000000
+
+/* PSCI support */
+#define CONFIG_ARMV7_PSCI_1_0
+#define CONFIG_ARMV7_SECURE_BASE               STM32_SYSRAM_BASE
+#define CONFIG_ARMV7_SECURE_MAX_SIZE           STM32_SYSRAM_SIZE
 
 /*
  * malloc() pool size
@@ -71,6 +73,7 @@
 
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE      3
+#define CONFIG_SUPPORT_EMMC_BOOT
 
 #if !defined(CONFIG_SPL) || !defined(CONFIG_SPL_BUILD)
 
@@ -81,6 +84,12 @@
 
 #include <config_distro_bootcmd.h>
 
+#define STM32MP_PREBOOT        \
+       "echo \"Boot over ${boot_device}${boot_instance}!\"; " \
+       "if test \"${boot_device}\" = \"mmc\"; then " \
+               "env set boot_targets \"mmc${boot_instance}\"; "\
+       "fi;"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "scriptaddr=0xC0000000\0" \
        "pxefile_addr_r=0xC0000000\0" \
@@ -89,6 +98,7 @@
        "ramdisk_addr_r=0xC4100000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
+       "preboot=" STM32MP_PREBOOT "\0" \
        BOOTENV
 
 #endif /* ifndef CONFIG_SPL_BUILD */