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
3227652
..
45ebdd3
100644
(file)
--- a/
board/freescale/t104xrdb/t104xrdb.c
+++ b/
board/freescale/t104xrdb/t104xrdb.c
@@
-1,13
+1,18
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2013 Freescale Semiconductor, Inc.
/*
* Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
+#include <fdt_support.h>
#include <hwconfig.h>
#include <hwconfig.h>
+#include <image.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>
@@
-16,7
+21,6
@@
#include <asm/fsl_fdt.h>
#include <asm/fsl_law.h>
#include <asm/fsl_serdes.h>
#include <asm/fsl_fdt.h>
#include <asm/fsl_law.h>
#include <asm/fsl_serdes.h>
-#include <asm/fsl_portals.h>
#include <asm/fsl_liodn.h>
#include <fm_eth.h>
#include "../common/sleep.h"
#include <asm/fsl_liodn.h>
#include <fm_eth.h>
#include "../common/sleep.h"
@@
-30,7
+34,7
@@
int checkboard(void)
struct cpu_type *cpu = gd->arch.cpu;
u8 sw;
struct cpu_type *cpu = gd->arch.cpu;
u8 sw;
-#if
def CONFIG_T104XD4RDB
+#if
defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
printf("Board: %sD4RDB\n", cpu->name);
#else
printf("Board: %sRDB\n", cpu->name);
printf("Board: %sD4RDB\n", cpu->name);
#else
printf("Board: %sRDB\n", cpu->name);
@@
-58,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);
/*
@@
-80,21
+84,16
@@
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
- set_liodns();
-#ifdef CONFIG_SYS_DPAA_QBMAN
- setup_portals();
-#endif
-
return 0;
}
int misc_init_r(void)
{
return 0;
}
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;
@@
-111,7
+110,7
@@
int misc_init_r(void)
CPLD_WRITE(misc_ctl_status, CPLD_READ(misc_ctl_status) |
MISC_CTL_SG_SEL | MISC_CTL_AURORA_SEL);
CPLD_WRITE(misc_ctl_status, CPLD_READ(misc_ctl_status) |
MISC_CTL_SG_SEL | MISC_CTL_AURORA_SEL);
-#if defined(CONFIG_T1040D4RDB)
+#if defined(CONFIG_T
ARGET_T
1040D4RDB)
if (hwconfig("qe-tdm")) {
CPLD_WRITE(sfp_ctl_status, CPLD_READ(sfp_ctl_status) |
MISC_MUX_QE_TDM);
if (hwconfig("qe-tdm")) {
CPLD_WRITE(sfp_ctl_status, CPLD_READ(sfp_ctl_status) |
MISC_MUX_QE_TDM);
@@
-131,15
+130,15
@@
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;
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);
fdt_fixup_memory(blob, (u64)base, (u64)size);
@@
-150,12
+149,14
@@
int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_liodn(blob);
#ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_liodn(blob);
#ifdef CONFIG_HAS_FSL_DR_USB
- fdt_fixup_dr_usb(blob, bd);
+ f
sl_f
dt_fixup_dr_usb(blob, 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);