Merge git://git.denx.de/u-boot-fsl-qoriq

This commit is contained in:
Tom Rini
2018-01-11 11:18:49 -05:00
47 changed files with 641 additions and 390 deletions

View File

@@ -27,3 +27,8 @@ M: Udit Agarwal <udit.agarwal@nxp.com>
M: Vinitha Pillai-B57223 <vinitha.pillai@nxp.com>
S: Maintained
F: configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
LS1088ARDB_SD_SECURE_BOOT BOARD
M: Sumit Garg <sumit.garg@nxp.com>
S: Maintained
F: configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig

View File

@@ -5,6 +5,8 @@
#
obj-y += ls1088a.o
obj-y += ddr.o
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_TARGET_LS1088ARDB) += eth_ls1088ardb.o
obj-$(CONFIG_TARGET_LS1088AQDS) += eth_ls1088aqds.o
obj-y += ddr.o
endif

View File

@@ -25,6 +25,13 @@
DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void)
{
fsl_lsch3_early_init_f();
return 0;
}
#ifdef CONFIG_FSL_QIXIS
unsigned long long get_qixis_addr(void)
{
unsigned long long addr;
@@ -42,7 +49,9 @@ unsigned long long get_qixis_addr(void)
return addr;
}
#endif
#if !defined(CONFIG_SPL_BUILD)
int checkboard(void)
{
char buf[64];
@@ -342,12 +351,6 @@ int board_init(void)
return 0;
}
int board_early_init_f(void)
{
fsl_lsch3_early_init_f();
return 0;
}
void detail_board_ddr_info(void)
{
puts("\nDDR ");
@@ -451,3 +454,4 @@ int ft_board_setup(void *blob, bd_t *bd)
return 0;
}
#endif
#endif /* defined(CONFIG_SPL_BUILD) */

View File

@@ -18,6 +18,7 @@
#include <asm/fsl_pci.h>
#include <fsl_ddr_sdram.h>
#include <asm/fsl_portals.h>
#include <fsl_qbman.h>
#include <libfdt.h>
#include <fdt_support.h>
#include <netdev.h>
@@ -81,7 +82,7 @@ int board_early_init_r(void)
MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
setup_portals();
setup_qbman_portals();
return 0;
}

View File

@@ -126,7 +126,7 @@ int board_early_init_r(void)
invalidate_icache();
set_liodns();
setup_portals();
setup_qbman_portals();
ret = trigger_fpga_config();
if (ret)

View File

@@ -69,7 +69,7 @@ int board_early_init_r(void)
set_liodns();
#ifdef CONFIG_SYS_DPAA_QBMAN
setup_portals();
setup_qbman_portals();
#endif
print_lbc_regs();
return 0;