summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-08 00:20:52 +0200
committerWolfgang Denk <wd@denx.de>2008-04-08 00:20:52 +0200
commitaeff6d503b6006573d5c6b04fc658a64bebee5fa (patch)
treea8f27e3fede8e8dc1d78b5f8628ac9294829051b /lib_ppc
parenta1b215e2a2a013327693f2fb990957b746f26cf5 (diff)
parentc2a545ce33b26d80337f80b533828839249fb1c9 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-fdt
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/bootm.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index b893146fcb..29016075d7 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -184,18 +184,6 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
fdt_error ("/chosen node create failed");
goto error;
}
-#ifdef CONFIG_OF_HAS_UBOOT_ENV
- if (fdt_env(of_flat_tree) < 0) {
- fdt_error ("/u-boot-env node create failed");
- goto error;
- }
-#endif
-#ifdef CONFIG_OF_HAS_BD_T
- if (fdt_bd_t(of_flat_tree) < 0) {
- fdt_error ("/bd_t node create failed");
- goto error;
- }
-#endif
#ifdef CONFIG_OF_BOARD_SETUP
/* Call the board-specific fixup routine */
ft_board_setup(of_flat_tree, gd->bd);