mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-27 09:52:18 +00:00
2b5dee9485
By pressing "c" key during SPL execution, we force U-boot execution instead of a kernel XIP image. This fixes a hard fault when booting stm32f746-disco in SPL with "c" key pressed during SPL execution. U-Boot SPL 2022.10-rc5-00009-g40d02baa91 (Sep 20 2022 - 17:21:21 +0200) Trying to boot from XIP Hard fault pc : 080083fc lr : 08000d1b xPSR : 21000000 r12 : 2004f108 r3 : 080083fd r2 : 00000028 r1 : 2004f0c8 r0 : 2004f0e4 Resetting CPU ... This is due to SYS_UBOOT_START flag set to 0x080083FD which is not correct. If unset, SYS_UBOOT_START is set by default to CONFIG_SYS_TEXT_BASE which match with our requirement. Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> Tested-by: Waldemar Brodkorb <wbx@openadk.org>
42 lines
1 KiB
C
42 lines
1 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright (C) 2016, STMicroelectronics - All Rights Reserved
|
|
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
#include <linux/sizes.h>
|
|
|
|
/* For booting Linux, use the first 6MB of memory */
|
|
#define CONFIG_SYS_BOOTMAPSZ SZ_4M + SZ_2M
|
|
|
|
#define CONFIG_SYS_FLASH_BASE 0x08000000
|
|
|
|
/*
|
|
* Configuration of the external SDRAM memory
|
|
*/
|
|
|
|
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
|
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 0)
|
|
|
|
#include <config_distro_bootcmd.h>
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"kernel_addr_r=0xC0008000\0" \
|
|
"fdtfile="CONFIG_DEFAULT_DEVICE_TREE".dtb\0" \
|
|
"fdt_addr_r=0xC0408000\0" \
|
|
"scriptaddr=0xC0418000\0" \
|
|
"pxefile_addr_r=0xC0428000\0" \
|
|
"ramdisk_addr_r=0xC0438000\0" \
|
|
BOOTENV
|
|
|
|
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
|
|
#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + \
|
|
CONFIG_SPL_PAD_TO)
|
|
|
|
/* For splashcreen */
|
|
|
|
#endif /* __CONFIG_H */
|