diff options
| author | Tom Rini <[email protected]> | 2017-04-28 08:51:44 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-05-01 09:11:59 -0400 |
| commit | 26d61195f87006f2d37915de7eee8bb0f537e8a0 (patch) | |
| tree | 8dbc2211c6bb802af798548d25ceb0e5ffc58f7f /arch/nios2/cpu | |
| parent | c9032ce168c1344fe8ffe8604825ec343ec14adf (diff) | |
fdt: Move fdt_fixup_ethernet to a common place
With 3f66149d9fb4 we no longer have a common call fdt_fixup_ethernet.
This was fine to do on PowerPC as they largely had calls already in
ft_cpu_fixup. On ARM however we largely relied on this call. Rather
than introduce a large number of changes to ft_cpu_fixup /
ft_board_fixup we recognize that this is a common enough call that we
should be doing it in a central location. Do it early enough that we
can do any further updates in ft_cpu_fixup / ft_board_fixup.
Cc: Gerd Hoffmann <[email protected]>
Cc: Chen-Yu Tsai <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Thomas Chou <[email protected]> (maintainer:NIOS)
Cc: York Sun <[email protected]> (maintainer:POWERPC MPC85XX)
Cc: Stefan Roese <[email protected]> (maintainer:POWERPC PPC4XX)
Cc: Simon Glass <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Fixes: 3f66149d9fb4 ("Remove extra fdt_fixup_ethernet() call")
Signed-off-by: Tom Rini <[email protected]>
Acked-by: Stefan Roese <[email protected]>
Acked-by: York Sun <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'arch/nios2/cpu')
| -rw-r--r-- | arch/nios2/cpu/Makefile | 1 | ||||
| -rw-r--r-- | arch/nios2/cpu/fdt.c | 38 |
2 files changed, 0 insertions, 39 deletions
diff --git a/arch/nios2/cpu/Makefile b/arch/nios2/cpu/Makefile index 185ca3cdb76..c859b46bf83 100644 --- a/arch/nios2/cpu/Makefile +++ b/arch/nios2/cpu/Makefile @@ -8,4 +8,3 @@ extra-y = start.o obj-y = exceptions.o obj-y += cpu.o interrupts.o traps.o -obj-y += fdt.o diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c deleted file mode 100644 index a44f51a7f2a..00000000000 --- a/arch/nios2/cpu/fdt.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * (C) Copyright 2011, Missing Link Electronics - * Joachim Foerster <[email protected]> - * - * Taken from arch/powerpc/cpu/ppc4xx/fdt.c: - * - * (C) Copyright 2007-2008 - * Stefan Roese, DENX Software Engineering, [email protected]. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> - -#ifdef CONFIG_OF_BOARD_SETUP -#include <libfdt.h> -#include <fdt_support.h> - -DECLARE_GLOBAL_DATA_PTR; - -int __ft_board_setup(void *blob, bd_t *bd) -{ - ft_cpu_setup(blob, bd); - - return 0; -} -int ft_board_setup(void *blob, bd_t *bd) - __attribute__((weak, alias("__ft_board_setup"))); - -void ft_cpu_setup(void *blob, bd_t *bd) -{ - /* - * Fixup all ethernet nodes - * Note: aliases in the dts are required for this - */ - fdt_fixup_ethernet(blob); -} -#endif /* CONFIG_OF_BOARD_SETUP */ |
