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

Wolfgang Denk
2 parents cda2a4a996 2dd7082e06
Showing 4 changed files Side-by-side Diff
board/amcc/canyonlands/config.mk
board/amcc/kilauea/kilauea.c
cpu/ppc4xx/cpu.c
include/asm-ppc/processor.h
@@ -30,14 +30,6 @@
 TEXT_BASE = 0xFFFA0000
 endif
  
-ifeq ($(CONFIG_NAND_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
-ifeq ($(CONFIG_PCIBOOT_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
  
 ifeq ($(debug),1)
@@ -230,14 +230,22 @@
 	return 0;
 }
  
-int board_emac_count(void)
+static int is_405exr(void)
 {
 	u32 pvr = get_pvr();
  
+	if (pvr & 0x00000004)
+		return 0;		/* bit 2 set -> 405EX */
+
+	return 1;			/* bit 2 cleared -> 405EXr */
+}
+
+int board_emac_count(void)
+{
 	/*
 	 * 405EXr only has one EMAC interface, 405EX has two
 	 */
-	if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA))
+	if (is_405exr())
 		return 1;
 	else
 		return 2;
  
@@ -245,12 +253,10 @@
  
 static int board_pcie_count(void)
 {
-	u32 pvr = get_pvr();
-
 	/*
 	 * 405EXr only has one EMAC interface, 405EX has two
 	 */
-	if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA))
+	if (is_405exr())
 		return 1;
 	else
 		return 2;
  
@@ -259,9 +265,8 @@
 int checkboard (void)
 {
 	char *s = getenv("serial#");
-	u32 pvr = get_pvr();
  
-	if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA))
+	if (is_405exr())
 		printf("Board: Haleakala - AMCC PPC405EXr Evaluation Board");
 	else
 		printf("Board: Kilauea - AMCC PPC405EX Evaluation Board");
@@ -346,6 +346,26 @@
 		strcpy(addstr, "No Security support");
 		break;
  
+	case PVR_405EX1_RC:
+		puts("EX Rev. C");
+		strcpy(addstr, "Security support");
+		break;
+
+	case PVR_405EX2_RC:
+		puts("EX Rev. C");
+		strcpy(addstr, "No Security support");
+		break;
+
+	case PVR_405EXR1_RC:
+		puts("EXr Rev. C");
+		strcpy(addstr, "Security support");
+		break;
+
+	case PVR_405EXR2_RC:
+		puts("EXr Rev. C");
+		strcpy(addstr, "No Security support");
+		break;
+
 #if defined(CONFIG_440)
 	case PVR_440GP_RB:
 		puts("GP Rev. B");
@@ -772,10 +772,14 @@
 #define PVR_405EP_RA	0x51210950
 #define PVR_405GPR_RB	0x50910951
 #define PVR_405EZ_RA	0x41511460
-#define PVR_405EXR1_RA	0x12911473 /* 405EXr rev A with Security */
-#define PVR_405EXR2_RA	0x12911471 /* 405EXr rev A without Security */
-#define PVR_405EX1_RA	0x12911477 /* 405EX rev A with Security */
-#define PVR_405EX2_RA	0x12911475 /* 405EX rev A without Security */
+#define PVR_405EXR1_RA	0x12911473 /* 405EXr rev A/B with Security */
+#define PVR_405EXR2_RA	0x12911471 /* 405EXr rev A/B without Security */
+#define PVR_405EX1_RA	0x12911477 /* 405EX rev A/B with Security */
+#define PVR_405EX2_RA	0x12911475 /* 405EX rev A/B without Security */
+#define PVR_405EXR1_RC	0x1291147B /* 405EXr rev C with Security */
+#define PVR_405EXR2_RC	0x12911479 /* 405EXr rev C without Security */
+#define PVR_405EX1_RC	0x1291147F /* 405EX rev C with Security */
+#define PVR_405EX2_RC	0x1291147D /* 405EX rev C without Security */
 #define PVR_440GP_RB	0x40120440
 #define PVR_440GP_RC	0x40120481
 #define PVR_440EP_RA	0x42221850
...	...	@@ -30,14 +30,6 @@
30	30	TEXT_BASE = 0xFFFA0000
31	31	endif
32	32
33		-ifeq ($(CONFIG_NAND_U_BOOT),y)
34		-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
35		-endif
36		-
37		-ifeq ($(CONFIG_PCIBOOT_U_BOOT),y)
38		-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
39		-endif
40		-
41	33	PLATFORM_CPPFLAGS += -DCONFIG_440=1
42	34
43	35	ifeq ($(debug),1)
...	...	@@ -230,14 +230,22 @@
230	230	return 0;
231	231	}
232	232
233		-int board_emac_count(void)
	233	+static int is_405exr(void)
234	234	{
235	235	u32 pvr = get_pvr();
236	236
	237	+ if (pvr & 0x00000004)
	238	+ return 0; /* bit 2 set -> 405EX */
	239	+
	240	+ return 1; /* bit 2 cleared -> 405EXr */
	241	+}
	242	+
	243	+int board_emac_count(void)
	244	+{
237	245	/*
238	246	* 405EXr only has one EMAC interface, 405EX has two
239	247	*/
240		- if ((pvr == PVR_405EXR1_RA) \|\| (pvr == PVR_405EXR2_RA))
	248	+ if (is_405exr())
241	249	return 1;
242	250	else
243	251	return 2;
244	252
...	...	@@ -245,12 +253,10 @@
245	253
246	254	static int board_pcie_count(void)
247	255	{
248		- u32 pvr = get_pvr();
249		-
250	256	/*
251	257	* 405EXr only has one EMAC interface, 405EX has two
252	258	*/
253		- if ((pvr == PVR_405EXR1_RA) \|\| (pvr == PVR_405EXR2_RA))
	259	+ if (is_405exr())
254	260	return 1;
255	261	else
256	262	return 2;
257	263
...	...	@@ -259,9 +265,8 @@
259	265	int checkboard (void)
260	266	{
261	267	char *s = getenv("serial#");
262		- u32 pvr = get_pvr();
263	268
264		- if ((pvr == PVR_405EXR1_RA) \|\| (pvr == PVR_405EXR2_RA))
	269	+ if (is_405exr())
265	270	printf("Board: Haleakala - AMCC PPC405EXr Evaluation Board");
266	271	else
267	272	printf("Board: Kilauea - AMCC PPC405EX Evaluation Board");
...	...	@@ -346,6 +346,26 @@
346	346	strcpy(addstr, "No Security support");
347	347	break;
348	348
	349	+ case PVR_405EX1_RC:
	350	+ puts("EX Rev. C");
	351	+ strcpy(addstr, "Security support");
	352	+ break;
	353	+
	354	+ case PVR_405EX2_RC:
	355	+ puts("EX Rev. C");
	356	+ strcpy(addstr, "No Security support");
	357	+ break;
	358	+
	359	+ case PVR_405EXR1_RC:
	360	+ puts("EXr Rev. C");
	361	+ strcpy(addstr, "Security support");
	362	+ break;
	363	+
	364	+ case PVR_405EXR2_RC:
	365	+ puts("EXr Rev. C");
	366	+ strcpy(addstr, "No Security support");
	367	+ break;
	368	+
349	369	#if defined(CONFIG_440)
350	370	case PVR_440GP_RB:
351	371	puts("GP Rev. B");
...	...	@@ -772,10 +772,14 @@
772	772	#define PVR_405EP_RA 0x51210950
773	773	#define PVR_405GPR_RB 0x50910951
774	774	#define PVR_405EZ_RA 0x41511460
775		-#define PVR_405EXR1_RA 0x12911473 /* 405EXr rev A with Security */
776		-#define PVR_405EXR2_RA 0x12911471 /* 405EXr rev A without Security */
777		-#define PVR_405EX1_RA 0x12911477 /* 405EX rev A with Security */
778		-#define PVR_405EX2_RA 0x12911475 /* 405EX rev A without Security */
	775	+#define PVR_405EXR1_RA 0x12911473 /* 405EXr rev A/B with Security */
	776	+#define PVR_405EXR2_RA 0x12911471 /* 405EXr rev A/B without Security */
	777	+#define PVR_405EX1_RA 0x12911477 /* 405EX rev A/B with Security */
	778	+#define PVR_405EX2_RA 0x12911475 /* 405EX rev A/B without Security */
	779	+#define PVR_405EXR1_RC 0x1291147B /* 405EXr rev C with Security */
	780	+#define PVR_405EXR2_RC 0x12911479 /* 405EXr rev C without Security */
	781	+#define PVR_405EX1_RC 0x1291147F /* 405EX rev C with Security */
	782	+#define PVR_405EX2_RC 0x1291147D /* 405EX rev C without Security */
779	783	#define PVR_440GP_RB 0x40120440
780	784	#define PVR_440GP_RC 0x40120481
781	785	#define PVR_440EP_RA 0x42221850