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 git://git.denx.de/u-boot-mmc
[oweals/u-boot.git]
/
board
/
freescale
/
p1023rdb
/
p1023rdb.c
diff --git
a/board/freescale/p1023rdb/p1023rdb.c
b/board/freescale/p1023rdb/p1023rdb.c
index d2d4f8390aadfb8c6e5bb38fd38d6fa3f8779f21..a23a5d50786c52cf57eb41583bd805808073cc03 100644
(file)
--- a/
board/freescale/p1023rdb/p1023rdb.c
+++ b/
board/freescale/p1023rdb/p1023rdb.c
@@
-18,6
+18,7
@@
#include <asm/fsl_pci.h>
#include <fsl_ddr_sdram.h>
#include <asm/fsl_portals.h>
#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>
#include <libfdt.h>
#include <fdt_support.h>
#include <netdev.h>
@@
-26,7
+27,7
@@
#include <fsl_mdio.h>
#include <miiphy.h>
#include <phy.h>
#include <fsl_mdio.h>
#include <miiphy.h>
#include <phy.h>
-#include <
asm/
fsl_dtsec.h>
+#include <fsl_dtsec.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-57,7
+58,7
@@
void pci_init_board(void)
int board_early_init_r(void)
{
const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
int board_early_init_r(void)
{
const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
-
const u8
flash_esel = find_tlb_idx((void *)flashbase, 1);
+
int
flash_esel = find_tlb_idx((void *)flashbase, 1);
/*
* Remap Boot flash + PROMJET region to caching-inhibited
/*
* Remap Boot flash + PROMJET region to caching-inhibited
@@
-68,14
+69,20
@@
int board_early_init_r(void)
flush_dcache();
invalidate_icache();
flush_dcache();
invalidate_icache();
- /* invalidate existing TLB entry for flash + promjet */
- disable_tlb(flash_esel);
+ if (flash_esel == -1) {
+ /* very unlikely unless something is messed up */
+ puts("Error: Could not find TLB for FLASH BASE\n");
+ flash_esel = 2; /* give our best effort to continue */
+ } else {
+ /* invalidate existing TLB entry for flash + promjet */
+ disable_tlb(flash_esel);
+ }
set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
- setup_portals();
+ setup_
qbman_
portals();
return 0;
}
return 0;
}
@@
-124,22
+131,24
@@
int board_eth_init(bd_t *bis)
}
#if defined(CONFIG_OF_BOARD_SETUP)
}
#if defined(CONFIG_OF_BOARD_SETUP)
-
void
ft_board_setup(void *blob, bd_t *bd)
+
int
ft_board_setup(void *blob, bd_t *bd)
{
phys_addr_t base;
phys_size_t size;
ft_cpu_setup(blob, bd);
{
phys_addr_t base;
phys_size_t size;
ft_cpu_setup(blob, bd);
- base =
getenv
_bootm_low();
- size =
getenv
_bootm_size();
+ base =
env_get
_bootm_low();
+ size =
env_get
_bootm_size();
fdt_fixup_memory(blob, (u64)base, (u64)size);
#ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_memory(blob, (u64)base, (u64)size);
#ifdef CONFIG_HAS_FSL_DR_USB
- fdt_fixup_dr_usb(blob, bd);
+ f
sl_f
dt_fixup_dr_usb(blob, bd);
#endif
fdt_fixup_fman_ethernet(blob);
#endif
fdt_fixup_fman_ethernet(blob);
+
+ return 0;
}
#endif
}
#endif