scsi: move the partition initialization out of the scsi detection

[people/ms/u-boot.git] / common / image-fdt.c

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 5454227fc9963213b18fe799e337333e95fee228..7468b902b8d4123308a3630d8c22d3f8b8b9f0df 100644 (file)
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -474,12 +474,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
                printf("ERROR: /chosen node create failed\n");
                goto err;
        }
-#ifdef CONFIG_ARCH_FIXUP_FDT
        if (arch_fixup_fdt(blob) < 0) {
                printf("ERROR: arch-specific fdt fixup failed\n");
                goto err;
        }
-#endif
        if (IMAGE_OF_BOARD_SETUP) {
                fdt_ret = ft_board_setup(blob, gd->bd);
                if (fdt_ret) {
@@ -496,7 +494,6 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
                        goto err;
                }
        }
-       fdt_fixup_ethernet(blob);
 
        /* Delete the old LMB reservation */
        if (lmb)