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
layerscape: Disable CONFIG_FMAN_ENET on *aqds* platforms
[platform/kernel/u-boot.git]
/
board
/
freescale
/
corenet_ds
/
corenet_ds.c
diff --git
a/board/freescale/corenet_ds/corenet_ds.c
b/board/freescale/corenet_ds/corenet_ds.c
index
132650c
..
3a83e65
100644
(file)
--- a/
board/freescale/corenet_ds/corenet_ds.c
+++ b/
board/freescale/corenet_ds/corenet_ds.c
@@
-1,12
+1,16
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
/*
* Copyright 2009-2011 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 <image.h>
+#include <init.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>
@@
-184,7
+188,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;
@@
-204,7
+208,9
@@
int ft_board_setup(void *blob, bd_t *bd)
fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN
fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN
+#ifndef CONFIG_DM_ETH
fdt_fixup_fman_ethernet(blob);
fdt_fixup_fman_ethernet(blob);
+#endif
fdt_fixup_board_enet(blob);
#endif
fdt_fixup_board_enet(blob);
#endif