projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Move remaining CONFIG_SYS_* to CFG_SYS_*
[platform/kernel/u-boot.git]
/
board
/
freescale
/
t104xrdb
/
t104xrdb.c
diff --git
a/board/freescale/t104xrdb/t104xrdb.c
b/board/freescale/t104xrdb/t104xrdb.c
index
dc3b59d
..
45ebdd3
100644
(file)
--- a/
board/freescale/t104xrdb/t104xrdb.c
+++ b/
board/freescale/t104xrdb/t104xrdb.c
@@
-8,8
+8,11
@@
#include <env.h>
#include <fdt_support.h>
#include <hwconfig.h>
#include <env.h>
#include <fdt_support.h>
#include <hwconfig.h>
+#include <image.h>
#include <init.h>
#include <init.h>
+#include <log.h>
#include <netdev.h>
#include <netdev.h>
+#include <asm/global_data.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
@@
-59,8
+62,8
@@
int board_early_init_f(void)
int board_early_init_r(void)
{
int board_early_init_r(void)
{
-#ifdef C
ONFI
G_SYS_FLASH_BASE
- const unsigned int flashbase = C
ONFI
G_SYS_FLASH_BASE;
+#ifdef C
F
G_SYS_FLASH_BASE
+ const unsigned int flashbase = C
F
G_SYS_FLASH_BASE;
int flash_esel = find_tlb_idx((void *)flashbase, 1);
/*
int flash_esel = find_tlb_idx((void *)flashbase, 1);
/*
@@
-81,7
+84,7
@@
int board_early_init_r(void)
disable_tlb(flash_esel);
}
disable_tlb(flash_esel);
}
- set_tlb(1, flashbase, C
ONFI
G_SYS_FLASH_BASE_PHYS,
+ set_tlb(1, flashbase, C
F
G_SYS_FLASH_BASE_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
#endif
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
#endif
@@
-90,7
+93,7
@@
int board_early_init_r(void)
int misc_init_r(void)
{
int misc_init_r(void)
{
- ccsr_gur_t __iomem *gur = (void *)(C
ONFI
G_SYS_MPC85xx_GUTS_ADDR);
+ ccsr_gur_t __iomem *gur = (void *)(C
F
G_SYS_MPC85xx_GUTS_ADDR);
u32 srds_s1;
srds_s1 = in_be32(&gur->rcwsr[4]) >> 24;
u32 srds_s1;
srds_s1 = in_be32(&gur->rcwsr[4]) >> 24;
@@
-127,7
+130,7
@@
int misc_init_r(void)
return 0;
}
return 0;
}
-int ft_board_setup(void *blob,
bd_t
*bd)
+int ft_board_setup(void *blob,
struct bd_info
*bd)
{
phys_addr_t base;
phys_size_t size;
{
phys_addr_t base;
phys_size_t size;
@@
-150,8
+153,10
@@
int ft_board_setup(void *blob, bd_t *bd)
#endif
#ifdef CONFIG_SYS_DPAA_FMAN
#endif
#ifdef CONFIG_SYS_DPAA_FMAN
+#ifndef CONFIG_DM_ETH
fdt_fixup_fman_ethernet(blob);
#endif
fdt_fixup_fman_ethernet(blob);
#endif
+#endif
if (hwconfig("qe-tdm"))
fdt_del_diu(blob);
if (hwconfig("qe-tdm"))
fdt_del_diu(blob);