summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorJerry Van Baren <gvb.uboot@gmail.com>2008-03-22 14:23:49 -0400
committerWolfgang Denk <wd@denx.de>2008-03-26 00:22:39 +0100
commit43ddd9c820fec44816188f53346b464e20b3142d (patch)
treed0e0e312c8d6d647d96716c3c4c9b8b0383ca05f /common/cmd_bootm.c
parent22ed2285743359fd1fe73e411dff914b2256e68f (diff)
downloadu-boot-imx-43ddd9c820fec44816188f53346b464e20b3142d.zip
u-boot-imx-43ddd9c820fec44816188f53346b464e20b3142d.tar.gz
u-boot-imx-43ddd9c820fec44816188f53346b464e20b3142d.tar.bz2
Remove deprecated CONFIG_OF_HAS_UBOOT_ENV and CONFIG_OF_HAS_BD_T
These defines embedded the u-boot env variables and/or the bd_t structure in the fdt blob. The conclusion of discussion on the u-boot email list was that embedding these in the fdt blob is not useful: there are better ways of passing the data (in fact, the fdt blob itself replaces the bd_t struct). The only board that enables these is the stxxtc and they don't appear to be used by linux. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9deb781..5a85726 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -984,20 +984,6 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
"must RESET the board to recover.\n");
do_reset (cmdtp, flag, argc, argv);
}
-#ifdef CONFIG_OF_HAS_UBOOT_ENV
- if (fdt_env(of_flat_tree) < 0) {
- puts ("ERROR: /u-boot-env node create failed - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
-#endif
-#ifdef CONFIG_OF_HAS_BD_T
- if (fdt_bd_t(of_flat_tree) < 0) {
- puts ("ERROR: /bd_t node create failed - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
-#endif
#ifdef CONFIG_OF_BOARD_SETUP
/* Call the board-specific fixup routine */
ft_board_setup(of_flat_tree, gd->bd);