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 /common | |
| 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 'common')
| -rw-r--r-- | common/bootm_os.c | 2 | ||||
| -rw-r--r-- | common/image-fdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/bootm_os.c b/common/bootm_os.c index 6e463c317e8..e1024069766 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -288,8 +288,6 @@ void do_bootvx_fdt(bootm_headers_t *images) if (ret) return; - fdt_fixup_ethernet(*of_flat_tree); - ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { bootline = getenv("bootargs"); diff --git a/common/image-fdt.c b/common/image-fdt.c index 7468b902b8d..c6e8832d668 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -478,6 +478,8 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } + /* Update ethernet nodes */ + fdt_fixup_ethernet(blob); if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { |