diff mbox

[U-Boot] m68k: Add generic board support for MCF547X/8X and MCF5445X

Message ID 1423737195-14211-1-git-send-email-b18965@freescale.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Alison Wang Feb. 12, 2015, 10:33 a.m. UTC 
This patch adds generic board support for MCF547X/8X and MCF5445X.
It is based on the patch about common generic board support for
M68K architecture sent by Angelo.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
---
 common/board_f.c             | 8 ++++++++
 common/board_r.c             | 2 +-
 include/asm-generic/u-boot.h | 7 ++++++-
 include/configs/M54451EVB.h  | 2 ++
 include/configs/M54455EVB.h  | 2 ++
 include/configs/M5475EVB.h   | 4 +++-
 include/configs/M5485EVB.h   | 4 +++-
 7 files changed, 25 insertions(+), 4 deletions(-)

Comments

Tom Rini March 6, 2015, 3:46 p.m. UTC | #1 
On Thu, Feb 12, 2015 at 06:33:15PM +0800, Alison Wang wrote:

> This patch adds generic board support for MCF547X/8X and MCF5445X.
> It is based on the patch about common generic board support for
> M68K architecture sent by Angelo.
> 
> Signed-off-by: Alison Wang <alison.wang@freescale.com>

Applied to u-boot/master, thanks!
Angelo Dureghello March 6, 2015, 9:23 p.m. UTC | #2 
On 06/03/2015 16:46, Tom Rini wrote:
> On Thu, Feb 12, 2015 at 06:33:15PM +0800, Alison Wang wrote:
>
>> This patch adds generic board support for MCF547X/8X and MCF5445X.
>> It is based on the patch about common generic board support for
>> M68K architecture sent by Angelo.
>>
>> Signed-off-by: Alison Wang <alison.wang@freescale.com>
>
> Applied to u-boot/master, thanks!
>

Dear Tom,

thanks to apply.

For some issues i could start to work on this only yesterday,
and to apply to u-boot-coldfire had to do a quite big rebase
with several conflicts (from end 2013).

Seems a good way to take confidence with custodian tasks
and merge windows.


Best regards,
Angelo Dureghello
diff mbox

Patch

diff --git a/common/board_f.c b/common/board_f.c
index 0de3919..21ea677 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -674,6 +674,14 @@  static int setup_board_part2(void)
 	bd->bi_ipbfreq = gd->arch.ipb_clk;
 	bd->bi_pcifreq = gd->pci_clk;
 #endif /* CONFIG_MPC5xxx */
+#if defined(CONFIG_M68K) && defined(CONFIG_PCI)
+	bd->bi_pcifreq = gd->pci_clk;
+#endif
+#if defined(CONFIG_EXTRA_CLOCK)
+	bd->bi_inpfreq = gd->arch.inp_clk;	/* input Freq in Hz */
+	bd->bi_vcofreq = gd->arch.vco_clk;	/* vco Freq in Hz */
+	bd->bi_flbfreq = gd->arch.flb_clk;	/* flexbus Freq in Hz */
+#endif
 
 	return 0;
 }
diff --git a/common/board_r.c b/common/board_r.c
index b2488c0..05870ef 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -744,7 +744,7 @@  init_fnc_t init_sequence_r[] = {
 	initr_flash,
 #endif
 	INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_PPC)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
 	/* initialize higher level parts of CPU like time base and timers */
 	cpu_init_r,
 #endif
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index e00db7d..5bc13cb 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -62,10 +62,15 @@  typedef struct bd_info {
 #if defined(CONFIG_MPC512X)
 	unsigned long	bi_ipsfreq;	/* IPS Bus Freq, in MHz */
 #endif /* CONFIG_MPC512X */
-#if defined(CONFIG_MPC5xxx)
+#if defined(CONFIG_MPC5xxx) || defined(CONFIG_M68K)
 	unsigned long	bi_ipbfreq;	/* IPB Bus Freq, in MHz */
 	unsigned long	bi_pcifreq;	/* PCI Bus Freq, in MHz */
 #endif
+#if defined(CONFIG_EXTRA_CLOCK)
+	unsigned long bi_inpfreq;	/* input Freq in MHz */
+	unsigned long bi_vcofreq;	/* vco Freq in MHz */
+	unsigned long bi_flbfreq;	/* Flexbus Freq in MHz */
+#endif
 #if defined(CONFIG_405)   || \
 		defined(CONFIG_405GP) || \
 		defined(CONFIG_405EP) || \
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 0f4b726..734a77f 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -22,6 +22,8 @@ 
 #define CONFIG_M54451		/* define processor type */
 #define CONFIG_M54451EVB	/* M54451EVB board */
 
+#define CONFIG_DISPLAY_BOARDINFO
+
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 7a55d3c..2faf581 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -22,6 +22,8 @@ 
 #define CONFIG_M54455		/* define processor type */
 #define CONFIG_M54455EVB	/* M54455EVB board */
 
+#define CONFIG_DISPLAY_BOARDINFO
+
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index e88a6bd..2f4549f 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -22,11 +22,13 @@ 
 #define CONFIG_M547x		/* define processor type */
 #define CONFIG_M5475		/* define processor type */
 
+#define CONFIG_DISPLAY_BOARDINFO
+
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_HW_WATCHDOG
+#undef CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
 /* Command line configuration */
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index e412806..9aa02f7 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -22,11 +22,13 @@ 
 #define CONFIG_M548x		/* define processor type */
 #define CONFIG_M5485		/* define processor type */
 
+#define CONFIG_DISPLAY_BOARDINFO
+
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_HW_WATCHDOG
+#undef CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
 /* Command line configuration */