Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

Tom Rini
2 parents 50dcf89d90 5fc3494fdb
Showing 3 changed files Side-by-side Diff
arch/powerpc/cpu/mpc5xxx/start.S
include/configs/a3m071.h
include/configs/a4m072.h
@@ -76,6 +76,21 @@
 	 * been done in the SPL u-boot version.
 	 */
 	GET_GOT			/* initialize GOT access		*/
+
+	/*
+	 * The GD (global data) struct needs to get cleared. Lets do
+	 * this by calling memset().
+	 * This function is called when the platform is build with SPL
+	 * support from the main (full-blown) U-Boot. And the GD needs
+	 * to get cleared (again) so that the following generic
+	 * board support code, defined via CONFIG_SYS_GENERIC_BOARD,
+	 * initializes all variables correctly.
+	 */
+	mr	r3, r2		/* parameter 1:	 GD pointer		*/
+	li	r4,0		/* parameter 2:	 value to fill		*/
+	li	r5,GD_SIZE	/* parameter 3:	 count			*/
+	bl	memset
+
 	bl	board_init_f	/* run 1st part of board init code (in Flash)*/
 	/* NOTREACHED - board_init_f() does not return */
 #else
@@ -14,6 +14,8 @@
  
 #define CONFIG_MPC5200
 #define CONFIG_A3M071			/* A3M071 board */
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_GENERIC_BOARD
  
 #define	CONFIG_SYS_TEXT_BASE	0x01000000	/* boot low for 32 MiB boards */
  
@@ -19,6 +19,8 @@
 #define CONFIG_MPC5200		1	/* This is a MPC5200 CPU */
 #define CONFIG_A4M072		1	/* ... on A4M072 board */
 #define CONFIG_MPC5200_DDR	1	/* ... use DDR RAM */
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_GENERIC_BOARD
  
 #define CONFIG_SYS_TEXT_BASE	0xFE000000
...	...	@@ -76,6 +76,21 @@
76	76	* been done in the SPL u-boot version.
77	77	*/
78	78	GET_GOT /* initialize GOT access */
	79	+
	80	+ /*
	81	+ * The GD (global data) struct needs to get cleared. Lets do
	82	+ * this by calling memset().
	83	+ * This function is called when the platform is build with SPL
	84	+ * support from the main (full-blown) U-Boot. And the GD needs
	85	+ * to get cleared (again) so that the following generic
	86	+ * board support code, defined via CONFIG_SYS_GENERIC_BOARD,
	87	+ * initializes all variables correctly.
	88	+ */
	89	+ mr r3, r2 /* parameter 1: GD pointer */
	90	+ li r4,0 /* parameter 2: value to fill */
	91	+ li r5,GD_SIZE /* parameter 3: count */
	92	+ bl memset
	93	+
79	94	bl board_init_f /* run 1st part of board init code (in Flash)*/
80	95	/* NOTREACHED - board_init_f() does not return */
81	96	#else
...	...	@@ -14,6 +14,8 @@
14	14
15	15	#define CONFIG_MPC5200
16	16	#define CONFIG_A3M071 /* A3M071 board */
	17	+#define CONFIG_DISPLAY_BOARDINFO
	18	+#define CONFIG_SYS_GENERIC_BOARD
17	19
18	20	#define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */
19	21
...	...	@@ -19,6 +19,8 @@
19	19	#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
20	20	#define CONFIG_A4M072 1 /* ... on A4M072 board */
21	21	#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
	22	+#define CONFIG_DISPLAY_BOARDINFO
	23	+#define CONFIG_SYS_GENERIC_BOARD
22	24
23	25	#define CONFIG_SYS_TEXT_BASE 0xFE000000
24	26