Skip to contentSkip to conversation

remove remaining CONFIG_OF_HAS_{UBOOT_ENV, BD_T} code

PATCH New Kim Phillips 2 participants 2 messages Mar 28, 2008 – Mar 29, 2008

lore
Share & tools
lore

Kim Phillips

author
#0 lore raw

PATCH 1/1 remove remaining CONFIG_OF_HAS_{UBOOT_ENV, BD_T} code

finish off what commit 43ddd9c820fec44816188f53346b464e20b3142d, "Remove deprecated CONFIG_OF_HAS_UBOOT_ENV and CONFIG_OF_HAS_BD_T" started.

Signed-off-by Kim Phillips <[email protected]>

---
This one's for you, Wolfgang.

 README            |   13 ------
 common/ft_build.c |  113 -----------------------------------------------------
 lib_ppc/bootm.c   |   12 ------
 3 files changed, 0 insertions(+), 138 deletions(-)
README +0 -13
index 5cbe7c1..18b720c 100644
@@ -372,19 +372,6 @@ The following options need to be configured:
 
 		boards with QUICC Engines require OF_QE to set UCC mac addresses
 
-		CONFIG_OF_HAS_BD_T
-
-		 * CONFIG_OF_LIBFDT - enables the "fdt bd_t" command
-		 * CONFIG_OF_FLAT_TREE - The resulting flat device tree
-		     will have a copy of the bd_t.  Space should be
-		     pre-allocated in the dts for the bd_t.
-
-		CONFIG_OF_HAS_UBOOT_ENV
-
-		 * CONFIG_OF_LIBFDT - enables the "fdt env" command
-		 * CONFIG_OF_FLAT_TREE - The resulting flat device tree
-		     will have a copy of u-boot's environment variables
-
 		CONFIG_OF_BOARD_SETUP
 
 		Board code has addition modification that it wants to make
common/ft_build.c +0 -113

138 lines not on this page · raw message

lib_ppc/bootm.c +0 -12
index b893146..2901607 100644
@@ -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);
Signature · 1 line
1.5.5.rc0.16.g02b00
#1 lore raw

PATCH 1/1 remove remaining CONFIG_OF_HAS_{UBOOT_ENV, BD_T} code

Quoted 4 lines · Kim Phillips

finish off what commit 43ddd9c820fec44816188f53346b464e20b3142d, "Remove deprecated CONFIG_OF_HAS_UBOOT_ENV and CONFIG_OF_HAS_BD_T" started.

Quoted 8 lines
Signed-off-by Kim Phillips <[email protected]>

---
This one's for you, Wolfgang.

 README            |   13 ------
 common/ft_build.c |  113 -----------------------------------------------------
 lib_ppc/bootm.c   |   12 ------
 3 files changed, 0 insertions(+), 138 deletions(-)

My bad, I missed these pieces. Thanks for catching this, Kim.

Acked-by Gerald Van Baren <[email protected]>