Skip to contentSkip to conversation

ppc4xx: Add board specific function to return the detected flash size

PATCH New Stefan Roese 2 participants 3 messages Sep 16, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 ppc4xx: Add board specific function to return the detected flash size

This function will be called to fixup size of the "reg" property of the NOR flash device tree nodes. Ebony can't use the weak default, since it has a special chip-select to bank-number binding.

---
 board/amcc/ebony/flash.c |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)
board/amcc/ebony/flash.c +31 -0
index 8fe3ba1..79d2c4c 100644
@@ -34,6 +34,7 @@
 #include <common.h>
 #include <ppc4xx.h>
 #include <asm/processor.h>
+#include <asm/io.h>
 
 #undef DEBUG
 #ifdef DEBUG
@@ -71,6 +72,36 @@ static unsigned long flash_addr_table[8][CONFIG_SYS_MAX_FLASH_BANKS] = {
  */
 static ulong flash_get_size(vu_long * addr, flash_info_t * info);
 
+/*
+ * Override the weak default mapping function with a board specific one
+ */
+u32 flash_get_bank_size(int cs, int idx)
+{
+	u8 reg = in_8((void *)CONFIG_SYS_FPGA_BASE);
+
+	if ((reg & BOOT_SMALL_FLASH) && !(reg & FLASH_ONBD_N)) {
+		/*
+		 * cs0: small flash (512KiB)
+		 * cs2: 2 * big flash (2 * 2MiB)
+		 */
+		if (cs == 0)
+			return flash_info[2].size;
+		if (cs == 2)
+			return flash_info[0].size + flash_info[1].size;
+	} else {
+		/*
+		 * cs0: 2 * big flash (2 * 2MiB)
+		 * cs2: small flash (512KiB)
+		 */
+		if (cs == 0)
+			return flash_info[0].size + flash_info[1].size;
+		if (cs == 2)
+			return flash_info[2].size;
+	}
+
+	return 0;
+}
+
 unsigned long flash_init(void)
 {
 	unsigned long total_b = 0;
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 2/2 ppc4xx: Add board specific function to return the detected flash size

Dear Stefan Roese,

Quoted 8 lines · In message <[email protected]> you wrote:

This function will be called to fixup size of the "reg" property of the NOR flash device tree nodes. Ebony can't use the weak default, since it has a special chip-select to bank-number binding.

---
 board/amcc/ebony/flash.c |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

I think this commit must be merged into the previous one to keep the code bi-sectable (my understanding is that Ebony will break / not work correctly with only the first patch applied?).

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The whole problem with the world is  that  fools  and  fanatics  are
always so certain of themselves, but wiser people so full of doubts."
- Bertrand Russell
#2 lore raw

PATCH 2/2 ppc4xx: Add board specific function to return the detected flash size

Hi Wolfgang,

Quoted 7 lines · On Thursday 16 September 2010 14:44:07 Wolfgang Denk wrote:
Quoted 7 lines

This function will be called to fixup size of the "reg" property of the NOR flash device tree nodes. Ebony can't use the weak default, since it has a special chip-select to bank-number binding.

---

Quoted 6 lines
Quoted 2 lines
 board/amcc/ebony/flash.c |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

I think this commit must be merged into the previous one to keep the code bi-sectable (my understanding is that Ebony will break / not work correctly with only the first patch applied?).

Without this patch, Ebony will continue to not work correctly (status quo). Only with both patches applied, this problem is fixed.

But, yes. I can squash them together and pull them into the ppc4xx repository for upstream merge, if nobody objects. Gerald, are you ok with this?

Cheers,
Stefan

--
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