projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-05-18-reduce-size-of-common.h'
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv8
/
fsl-layerscape
/
spl.c
diff --git
a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 3bb6e5b3db9a1f18bc9579cd7db5386e20bfa1cd..77724336d62c1c7dc5be5a39dfb3927a7606b9c0 100644
(file)
--- a/
arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/
arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@
-4,7
+4,14
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <clock_legacy.h>
+#include <cpu_func.h>
+#include <env.h>
+#include <image.h>
+#include <init.h>
+#include <log.h>
#include <spl.h>
#include <spl.h>
+#include <asm/cache.h>
#include <asm/io.h>
#include <fsl_ifc.h>
#include <i2c.h>
#include <asm/io.h>
#include <fsl_ifc.h>
#include <i2c.h>
@@
-22,6
+29,9
@@
u32 spl_boot_device(void)
#endif
#ifdef CONFIG_SPL_NAND_SUPPORT
return BOOT_DEVICE_NAND;
#endif
#ifdef CONFIG_SPL_NAND_SUPPORT
return BOOT_DEVICE_NAND;
+#endif
+#ifdef CONFIG_QSPI_BOOT
+ return BOOT_DEVICE_NOR;
#endif
return 0;
}
#endif
return 0;
}
@@
-30,7
+40,7
@@
u32 spl_boot_device(void)
void spl_board_init(void)
{
void spl_board_init(void)
{
-#if defined(CONFIG_
SECURE_BOOT
) && defined(CONFIG_FSL_LSCH2)
+#if defined(CONFIG_
NXP_ESBC
) && defined(CONFIG_FSL_LSCH2)
/*
* In case of Secure Boot, the IBR configures the SMMU
* to allow only Secure transactions.
/*
* In case of Secure Boot, the IBR configures the SMMU
* to allow only Secure transactions.
@@
-66,9
+76,11
@@
void board_init_f(ulong dummy)
preloader_console_init();
spl_set_bd();
preloader_console_init();
spl_set_bd();
+#ifdef CONFIG_SYS_I2C
#ifdef CONFIG_SPL_I2C_SUPPORT
i2c_init_all();
#endif
#ifdef CONFIG_SPL_I2C_SUPPORT
i2c_init_all();
#endif
+#endif
#ifdef CONFIG_VID
init_func_vid();
#endif
#ifdef CONFIG_VID
init_func_vid();
#endif
@@
-124,7
+136,7
@@
int spl_start_uboot(void)
}
#endif /* CONFIG_SPL_OS_BOOT */
#ifdef CONFIG_SPL_LOAD_FIT
}
#endif /* CONFIG_SPL_OS_BOOT */
#ifdef CONFIG_SPL_LOAD_FIT
-int board_fit_config_name_match(const char *name)
+
__weak
int board_fit_config_name_match(const char *name)
{
/* Just empty function now - can't decide what to choose */
debug("%s: %s\n", __func__, name);
{
/* Just empty function now - can't decide what to choose */
debug("%s: %s\n", __func__, name);