Skip to contentSkip to conversation

arm: Add CONFIG_OF_BOARD_SETUP support to bootm

PATCH New Joe Hershberger 2 participants 2 messages Aug 17, 2012 – Oct 4, 2012 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: Add CONFIG_OF_BOARD_SETUP support to bootm

ARM boards need to change device tree settings as well

---
 arch/arm/lib/bootm.c | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/lib/bootm.c +3 -0
index 599547d..2e0b0c1 100644
@@ -258,6 +258,9 @@ static int create_fdt(bootm_headers_t *images)
 	fixup_memory_node(*of_flat_tree);
 	fdt_fixup_ethernet(*of_flat_tree);
 	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
+#ifdef CONFIG_OF_BOARD_SETUP
+	ft_board_setup(*of_flat_tree, gd->bd);
+#endif
 
 	return 0;
 }
Signature · 1 line
1.7.11.5
#1 lore raw

PATCH 1/1 arm: Add CONFIG_OF_BOARD_SETUP support to bootm

Hi Joe,

Quoted 12 lines · Joe Hershberger

ARM boards need to change device tree settings as well

---
 arch/arm/lib/bootm.c | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/lib/bootm.c +0 -0
index 599547d..2e0b0c1 100644

arch/arm/lib/bootm.c static int create_fdt(bootm_headers_t *images) · line 266

Quoted 9 lines
arch/arm/lib/bootm.c +3 -0
@@ -258,6 +258,9 @@ static int create_fdt(bootm_headers_t *images)
 	fixup_memory_node(*of_flat_tree);
 	fdt_fixup_ethernet(*of_flat_tree);
 	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
+#ifdef CONFIG_OF_BOARD_SETUP
+	ft_board_setup(*of_flat_tree, gd->bd);
+#endif
 
 	return 0;
 }

Applied to u-boot-arm/master, thanks!

Amicalement,

Signature · 1 line
Albert.