Merge branch 'master' of git://git.denx.de/u-boot-x86

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

diff --git a/common/bootm_os.c b/common/bootm_os.c
index 72477f0b810b154c58fb7e581e89c905cc95cd06..9ec84bd0dbe0349741b09b44010f3e4f75709be8 100644 (file)
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -288,6 +288,8 @@ 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");
@@ -482,9 +484,8 @@ int boot_selected_os(int argc, char * const argv[], int state,
            state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */
                return 0;
        bootstage_error(BOOTSTAGE_ID_BOOT_OS_RETURNED);
-#ifdef DEBUG
-       puts("\n## Control returned to monitor - resetting...\n");
-#endif
+       debug("\n## Control returned to monitor - resetting...\n");
+
        return BOOTM_ERR_RESET;
 }