mx35pdk: Remove duplicate CPU revision and reset cause information

PATCH Superseded Fabio Estevam 2 participants 7 messages Feb 10, 2012 Arm (32-bit)

Share & tools

Fabio Estevam

author

2012-02-10 15:34 UTC #0 lore raw

PATCH 1/2 mx35pdk: Remove duplicate CPU revision and reset cause information

MX35PDK board does not need to print CPU revision and reset cause in board file because this is printed by common code when CONFIG_DISPLAY_CPUINFO is selected

Signed-off-by Fabio Estevam <[email protected]>

---
Stefano,

I don't have a mx35pdk board handy to try this.

 board/freescale/mx35pdk/mx35pdk.c |   25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

board/freescale/mx35pdk/mx35pdk.c +0 ~~-25~~

index a5b51a0..5f24fed 100644
@@ -263,10 +263,6 @@ int board_late_init(void)
 
 int checkboard(void)
 {
-	struct ccm_regs *ccm =
-		(struct ccm_regs *)IMX_CCM_BASE;
-	u32 cpu_rev = get_cpu_rev();
-
 	/*
 	 * Be sure that I2C is initialized to check
 	 * the board revision

@@ -276,27 +272,6 @@ int checkboard(void)
 	/* Print board revision */
 	printf("Board: MX35 PDK %d.0 ", ((get_board_rev() >> 8) + 1) & 0x0F);
 
-	/* Print CPU revision */
-	printf("i.MX35 %d.%d [", (cpu_rev & 0xF0) >> 4, cpu_rev & 0x0F);
-
-	switch (readl(&ccm->rcsr) & 0x0F) {
-	case 0x0000:
-		puts("POR");
-		break;
-	case 0x0002:
-		puts("JTAG");
-		break;
-	case 0x0004:
-		puts("RST");
-		break;
-	case 0x0008:
-		puts("WDT");
-		break;
-	default:
-		puts("unknown");
-	}
-	puts("]\n");
-
 	return 0;
 }

Signature · 1 line

1.7.1

Fabio Estevam

author

2012-02-10 15:34 UTC #1 lore raw

PATCH 2/2 mx35: generic: Let get_reset_cause be defined only when CONFIG_DISPLAY_CPUINFO is selected

get_reset_cause() function is only used inside print_cpuinfo(), so let it be defined only when CONFIG_DISPLAY_CPUINFO is selected.

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm/cpu/arm1136/mx35/generic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/cpu/arm1136/mx35/generic.c +1 -1

index d41613e..986b1f9 100644
@@ -422,6 +422,7 @@ U_BOOT_CMD(
 	""
 );
 
+#if defined(CONFIG_DISPLAY_CPUINFO)
 static char *get_reset_cause(void)
 {
 	/* read RCSR register from CCM module */

@@ -444,7 +445,6 @@ static char *get_reset_cause(void)
 	}
 }
 
-#if defined(CONFIG_DISPLAY_CPUINFO)
 int print_cpuinfo(void)
 {
 	u32 srev = get_cpu_rev();

Signature · 1 line

1.7.1

Stefano Babic

2012-02-10 16:49 UTC #2 lore raw

PATCH 2/2 mx35: generic: Let get_reset_cause be defined only when CONFIG_DISPLAY_CPUINFO is selected

Quoted 5 lines · Fabio Estevam

get_reset_cause() function is only used inside print_cpuinfo(), so let it be defined only when CONFIG_DISPLAY_CPUINFO is selected.
Signed-off-by Fabio Estevam <[email protected]>
---

Acked-by Stefano Babic <[email protected]>

Tested-by Stefano Babic <[email protected]>

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Stefano Babic

2012-02-10 15:57 UTC #3 lore raw

PATCH 1/2 mx35pdk: Remove duplicate CPU revision and reset cause information

In reply to Fabio Estevam

Quoted 8 lines · Fabio Estevam

MX35PDK board does not need to print CPU revision and reset cause in board file because this is printed by common code when CONFIG_DISPLAY_CPUINFO is selected
Signed-off-by Fabio Estevam <[email protected]>
---
Stefano,
I don't have a mx35pdk board handy to try this.

Do not worry, I can test it.

Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Stefano Babic

2012-02-10 16:18 UTC #4 lore raw

PATCH 1/2 mx35pdk: Remove duplicate CPU revision and reset cause information

In reply to Fabio Estevam

Quoted 5 lines · Fabio Estevam

MX35PDK board does not need to print CPU revision and reset cause in board file because this is printed by common code when CONFIG_DISPLAY_CPUINFO is selected
Signed-off-by Fabio Estevam <[email protected]>
---

Hi Fabio,

board/freescale/mx35pdk/mx35pdk.c int checkboard(void) · line 273

Quoted 2 lines

board/freescale/mx35pdk/mx35pdk.c +0 -0

 	/* Print board revision */
 	printf("Board: MX35 PDK %d.0 ", ((get_board_rev() >> 8) + 1) & 0x0F);

Now please add a \n here, because the newline is not inserted anymore. The output with your patches is :

Board: MX35 PDK 1.0 I2C:   ready
DRAM:  256 MiB

Thanks,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Fabio Estevam

author

2012-02-10 16:29 UTC #5 lore raw

PATCH v2 1/2 mx35pdk: Remove duplicate CPU revision and reset cause information

In reply to Fabio Estevam

MX35PDK board does not need to print CPU revision and reset cause in board file because this is printed by common code when CONFIG_DISPLAY_CPUINFO is selected

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Introduce \n.

 board/freescale/mx35pdk/mx35pdk.c |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

board/freescale/mx35pdk/mx35pdk.c +1 ~~-26~~

index a5b51a0..cce7123 100644
@@ -263,10 +263,6 @@ int board_late_init(void)
 
 int checkboard(void)
 {
-	struct ccm_regs *ccm =
-		(struct ccm_regs *)IMX_CCM_BASE;
-	u32 cpu_rev = get_cpu_rev();
-
 	/*
 	 * Be sure that I2C is initialized to check
 	 * the board revision

@@ -274,28 +270,7 @@ int checkboard(void)
 	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 
 	/* Print board revision */
-	printf("Board: MX35 PDK %d.0 ", ((get_board_rev() >> 8) + 1) & 0x0F);
-
-	/* Print CPU revision */
-	printf("i.MX35 %d.%d [", (cpu_rev & 0xF0) >> 4, cpu_rev & 0x0F);
-
-	switch (readl(&ccm->rcsr) & 0x0F) {
-	case 0x0000:
-		puts("POR");
-		break;
-	case 0x0002:
-		puts("JTAG");
-		break;
-	case 0x0004:
-		puts("RST");
-		break;
-	case 0x0008:
-		puts("WDT");
-		break;
-	default:
-		puts("unknown");
-	}
-	puts("]\n");
+	printf("Board: MX35 PDK %d.0\n", ((get_board_rev() >> 8) + 1) & 0x0F);
 
 	return 0;
 }

Signature · 1 line

1.7.1

Stefano Babic

2012-02-10 16:49 UTC #6 lore raw

PATCH v2 1/2 mx35pdk: Remove duplicate CPU revision and reset cause information

Quoted 5 lines · Fabio Estevam

MX35PDK board does not need to print CPU revision and reset cause in board file because this is printed by common code when CONFIG_DISPLAY_CPUINFO is selected
Signed-off-by Fabio Estevam <[email protected]>
---

Acked-by Stefano Babic <[email protected]>

Tested-by Stefano Babic <[email protected]>

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================