Skip to contentSkip to conversation

8xx: Add OF support to adder87x board

PATCH New Bryan O'Donoghue 3 participants 5 messages Feb 12, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 8xx: Add OF support to adder87x board

Fits in with recent work done in Linux.

Adds u-boot support in conjunction with two previous patches to boot a Linux uImage in conjunction with a .dtb generated from the in-tree adder875-uboot.dts in recent PowerPC Linux kernel patches.

Works too !

---

board/adder/adder.c +14 -0
index aa78158..03db678 100644
@@ -27,6 +27,12 @@
 #include <common.h>
 #include <mpc8xx.h>
 
+#if defined(CONFIG_OF_FLAT_TREE)
+	#include <ft_build.h>
+#elif defined(CONFIG_OF_LIBFDT)
+	#include <libfdt.h>
+#endif
+
 /*
  * SDRAM is single Samsung K4S643232F-T70   chip (8MB)
  *       or single Micron  MT48LC4M32B2TG-7 chip (16MB).
@@ -111,3 +117,11 @@ int checkboard( void )
 
 	return 0;
 }
+
+#if defined(CONFIG_OF_BOARD_SETUP)
+void ft_board_setup(void *blob, bd_t *bd)
+{
+	ft_cpu_setup(blob, bd);
+
+}
+#endif
include/configs/Adder.h +11 -0
index 4304ecc..d66bc2d 100644
@@ -37,6 +37,8 @@
 
 #define CONFIG_ETHER_ON_FEC1
 #define CONFIG_ETHER_ON_FEC2
+#define CONFIG_HAS_ETH0
+#define CONFIG_HAS_ETH1
 
 #if defined(CONFIG_ETHER_ON_FEC1) || defined(CONFIG_ETHER_ON_FEC2)
 #define CFG_DISCOVER_PHY
@@ -212,4 +214,13 @@
 #define BOOTFLAG_COLD		0x01	/* Normal Power-On: Boot from flash	*/
 #define BOOTFLAG_WARM		0x02	/* Software reboot			*/
 
+/* pass open firmware flat tree */
+#undef  CONFIG_OF_FLAT_TREE
+#define CONFIG_OF_LIBFDT	1
+#define CONFIG_OF_BOARD_SETUP	1
+#define CONFIG_OF_CHOSEN_UPDATE 1
+
+#define OF_CPU			"PowerPC,875 at 0"
+#define OF_SOC			"soc at ff000000"
+
 #endif /* __CONFIG_H */
#1 lore raw

PATCH 3/3 8xx: Add OF support to adder87x board

Quoted 16 lines · Bryan O'Donoghue

Fits in with recent work done in Linux.

Adds u-boot support in conjunction with two previous patches to boot a Linux uImage in conjunction with a .dtb generated from the in-tree adder875-uboot.dts in recent PowerPC Linux kernel patches.

Works too !

---

board/adder/adder.c +0 -0
index aa78158..03db678 100644

board/adder/adder.c line 35

Quoted 9 lines
board/adder/adder.c +6 -0
@@ -27,6 +27,12 @@
 #include <common.h>
 #include <mpc8xx.h>
 
+#if defined(CONFIG_OF_FLAT_TREE)
+	#include <ft_build.h>
+#elif defined(CONFIG_OF_LIBFDT)
+	#include <libfdt.h>
+#endif
+

Please do only "#if defined(CONFIG_OF_LIBFDT)", skip CONFIG_OF_FLAT_TREE support entirely. CONFIG_OF_FLAT_TREE is deprecated and will be removed RSN.

[snip]

board/adder/adder.c line 37

Quoted 2 lines
board/adder/adder.c +2 -0
+/* pass open firmware flat tree */
+#undef  CONFIG_OF_FLAT_TREE

Obviously, this goes too.

Thanks,
gvb

#2 lore raw

PATCH 3/3 8xx: Add OF support to adder87x board

In reply to Bryan O'Donoghue

include/configs/Adder.h line 224

Quoted 2 lines · Bryan O'Donoghue
include/configs/Adder.h +2 -0
+#define OF_CPU			"PowerPC,875 at 0"
+#define OF_SOC			"soc at ff000000"

Do we really still need this? We should be able to search by compatible or device_type instead of using hardcoded paths.

-Scott

#3 lore raw

PATCH 3/3 8xx: Add OF support to adder87x board

Quoted 6 lines · On Tue, 12 Feb 2008 13:13:13 -0600 Scott Wood <[email protected]> wrote:

include/configs/Adder.h line 224

Quoted 2 lines · Bryan O'Donoghue
include/configs/Adder.h +2 -0
+#define OF_CPU			"PowerPC,875 at 0"
+#define OF_SOC			"soc at ff000000"

Do we really still need this? We should be able to search by compatible or device_type instead of using hardcoded paths.

Still ? Beats me Scott - you probably know better then I do - I really just cloned some of the entries in the other board .h files - which seemed to make sense at the time...

I'll have a go at removing them for the next drop...

#4 lore raw

PATCH 3/3 8xx: Add OF support to adder87x board

Quoted 5 lines · Bryan O'Donoghue

Still ? Beats me Scott - you probably know better then I do - I really just cloned some of the entries in the other board .h files - which seemed to make sense at the time...

I'll have a go at removing them for the next drop...

They're leftovers from before we had node iteration ability.

-Scott