Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: mach-k3: Move J721s2 SPL init functions to mach-k3

Browse source 
This matches AM64 and J721e and removes the need to forward
declare k3_spl_init(), k3_mem_init(), and check_rom_loaded_sysfw()
in sys_proto.h.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Andrew Davis 2023-04-06 11:38:20 -05:00 • committed by Tom Rini
parent ef538cc26e
commit 29627e81c6
3 changed files with 64 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-k3/include/mach/sys_proto.h
View file

@ -7,7 +7,4 @@
#ifndef _SYS_PROTO_H_ #ifndef _SYS_PROTO_H_
#define _SYS_PROTO_H_ #define _SYS_PROTO_H_
void k3_spl_init(void);
void k3_mem_init(void);
bool check_rom_loaded_sysfw(void);
#endif #endif

64
arch/arm/mach-k3/j721s2_init.c
View file

@ -19,6 +19,7 @@
#include <dm.h> #include <dm.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/root.h>
#include <mmc.h> #include <mmc.h>
#include <remoteproc.h> #include <remoteproc.h>
@ -182,6 +183,69 @@ void k3_mem_init(void)
spl_enable_dcache(); spl_enable_dcache();
} }
/* Support for the various EVM / SK families */
#if defined(CONFIG_SPL_OF_LIST) && defined(CONFIG_TI_I2C_BOARD_DETECT)
void do_dt_magic(void)
{
int ret, rescan, mmc_dev = -1;
static struct mmc *mmc;
do_board_detect();
/*
* Board detection has been done.
* Let us see if another dtb wouldn't be a better match
* for our board
*/
if (IS_ENABLED(CONFIG_CPU_V7R)) {
ret = fdtdec_resetup(&rescan);
if (!ret && rescan) {
dm_uninit();
dm_init_and_scan(true);
}
}
/*
* Because of multi DTB configuration, the MMC device has
* to be re-initialized after reconfiguring FDT inorder to
* boot from MMC. Do this when boot mode is MMC and ROM has
* not loaded SYSFW.
*/
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
mmc_dev = 0;
break;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
mmc_dev = 1;
break;
}
if (mmc_dev > 0 && !check_rom_loaded_sysfw()) {
ret = mmc_init_device(mmc_dev);
if (!ret) {
mmc = find_mmc_device(mmc_dev);
if (mmc) {
ret = mmc_init(mmc);
if (ret)
printf("mmc init failed with error: %d\n", ret);
}
}
}
}
#endif
#ifdef CONFIG_SPL_BUILD
void board_init_f(ulong dummy)
{
k3_spl_init();
#if defined(CONFIG_SPL_OF_LIST) && defined(CONFIG_TI_I2C_BOARD_DETECT)
do_dt_magic();
#endif
k3_mem_init();
}
#endif
u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
{ {
switch (boot_device) { switch (boot_device) {

63
board/ti/j721s2/evm.c
View file

@ -192,66 +192,3 @@ int board_late_init(void)
void spl_board_init(void) void spl_board_init(void)
{ {
} }
/* Support for the various EVM / SK families */
#if defined(CONFIG_SPL_OF_LIST) && defined(CONFIG_TI_I2C_BOARD_DETECT)
void do_dt_magic(void)
{
int ret, rescan, mmc_dev = -1;
static struct mmc *mmc;
do_board_detect();
/*
* Board detection has been done.
* Let us see if another dtb wouldn't be a better match
* for our board
*/
if (IS_ENABLED(CONFIG_CPU_V7R)) {
ret = fdtdec_resetup(&rescan);
if (!ret && rescan) {
dm_uninit();
dm_init_and_scan(true);
}
}
/*
* Because of multi DTB configuration, the MMC device has
* to be re-initialized after reconfiguring FDT inorder to
* boot from MMC. Do this when boot mode is MMC and ROM has
* not loaded SYSFW.
*/
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
mmc_dev = 0;
break;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
mmc_dev = 1;
break;
}
if (mmc_dev > 0 && !check_rom_loaded_sysfw()) {
ret = mmc_init_device(mmc_dev);
if (!ret) {
mmc = find_mmc_device(mmc_dev);
if (mmc) {
ret = mmc_init(mmc);
if (ret)
printf("mmc init failed with error: %d\n", ret);
}
}
}
}
#endif
#ifdef CONFIG_SPL_BUILD
void board_init_f(ulong dummy)
{
k3_spl_init();
#if defined(CONFIG_SPL_OF_LIST) && defined(CONFIG_TI_I2C_BOARD_DETECT)
do_dt_magic();
#endif
k3_mem_init();
}
#endif