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
SPDX: Convert all of our single license tags to Linux Kernel style
[platform/kernel/u-boot.git]
/
board
/
freescale
/
c29xpcie
/
c29xpcie.c
diff --git
a/board/freescale/c29xpcie/c29xpcie.c
b/board/freescale/c29xpcie/c29xpcie.c
index
d757709
..
8ee3e14
100644
(file)
--- a/
board/freescale/c29xpcie/c29xpcie.c
+++ b/
board/freescale/c29xpcie/c29xpcie.c
@@
-1,7
+1,6
@@
+// 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 <common.h>
@@
-11,7
+10,7
@@
#include <asm/immap_85xx.h>
#include <asm/io.h>
#include <miiphy.h>
#include <asm/immap_85xx.h>
#include <asm/io.h>
#include <miiphy.h>
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#include <fdt_support.h>
#include <fsl_mdio.h>
#include <tsec.h>
#include <fdt_support.h>
#include <fsl_mdio.h>
#include <tsec.h>
@@
-38,10
+37,10
@@
int checkboard(void)
int board_early_init_f(void)
{
int board_early_init_f(void)
{
- struct fsl_ifc
*ifc = (void *)CONFIG_SYS_IFC_ADDR
;
+ struct fsl_ifc
ifc = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL}
;
/* Clock configuration to access CPLD using IFC(GPCM) */
/* Clock configuration to access CPLD using IFC(GPCM) */
- setbits_be32(&ifc->ifc_gcr, 1 << IFC_GCR_TBCTL_TRN_TIME_SHIFT);
+ setbits_be32(&ifc
.gregs
->ifc_gcr, 1 << IFC_GCR_TBCTL_TRN_TIME_SHIFT);
return 0;
}
return 0;
}
@@
-83,9
+82,9
@@
void pci_init_board(void)
}
#endif /* ifdef CONFIG_PCI */
}
#endif /* ifdef CONFIG_PCI */
-#ifdef CONFIG_TSEC_ENET
int board_eth_init(bd_t *bis)
{
int board_eth_init(bd_t *bis)
{
+#ifdef CONFIG_TSEC_ENET
struct fsl_pq_mdio_info mdio_info;
struct tsec_info_struct tsec_info[2];
int num = 0;
struct fsl_pq_mdio_info mdio_info;
struct tsec_info_struct tsec_info[2];
int num = 0;
@@
-110,10
+109,10
@@
int board_eth_init(bd_t *bis)
fsl_pq_mdio_init(bis, &mdio_info);
tsec_eth_init(bis, tsec_info, num);
fsl_pq_mdio_init(bis, &mdio_info);
tsec_eth_init(bis, tsec_info, num);
+#endif
return pci_eth_init(bis);
}
return pci_eth_init(bis);
}
-#endif
#if defined(CONFIG_OF_BOARD_SETUP)
void fdt_del_sec(void *blob, int offset)
#if defined(CONFIG_OF_BOARD_SETUP)
void fdt_del_sec(void *blob, int offset)
@@
-122,7
+121,7
@@
void fdt_del_sec(void *blob, int offset)
while ((nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,sec-v6.0",
CONFIG_SYS_CCSRBAR_PHYS + CONFIG_SYS_FSL_SEC_OFFSET
while ((nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,sec-v6.0",
CONFIG_SYS_CCSRBAR_PHYS + CONFIG_SYS_FSL_SEC_OFFSET
- + offset *
0x20000
)) >= 0) {
+ + offset *
CONFIG_SYS_FSL_SEC_IDX_OFFSET
)) >= 0) {
fdt_del_node(blob, nodeoff);
offset++;
}
fdt_del_node(blob, nodeoff);
offset++;
}
@@
-138,8
+137,8
@@
int ft_board_setup(void *blob, bd_t *bd)
ft_cpu_setup(blob, bd);
ft_cpu_setup(blob, bd);
- base =
getenv
_bootm_low();
- size =
getenv
_bootm_size();
+ base =
env_get
_bootm_low();
+ size =
env_get
_bootm_size();
#if defined(CONFIG_PCI)
FT_FSL_PCI_SETUP;
#if defined(CONFIG_PCI)
FT_FSL_PCI_SETUP;