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 !
Signed-off-by: Bryan O'Donoghue bodonoghue@codehermit.ie ---
diff --git a/board/adder/adder.c b/board/adder/adder.c index aa78158..03db678 100644 --- a/board/adder/adder.c +++ b/board/adder/adder.c @@ -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 diff --git a/include/configs/Adder.h b/include/configs/Adder.h index 4304ecc..d66bc2d 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -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@0" +#define OF_SOC "soc@ff000000" + #endif /* __CONFIG_H */