From: "Mark A. Greer" <mgreer@mvista.com>
To: linuxppc-dev <Linuxppc-dev@ozlabs.org>
Subject: [PATCH 2/2] powerpc: prpmc2800 - Don't overwrite user FLASH size
Date: Thu, 25 Oct 2007 16:42:35 -0700 [thread overview]
Message-ID: <20071025234235.GA22913@mag.az.mvista.com> (raw)
In-Reply-To: <20071025233948.GA22703@mag.az.mvista.com>
From: Mark A. Greer <mgreer@mvista.com>
The prpmc2800 bootwrapper code currently overwrites the DTS' user FLASH
size with a predetermined value. Intead make it use whatever is specified
in the DTS unless the prpmc2800 variant the bootwrapper is running on has
no user FLASH. In that case, set the user FLASH size to 0.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
arch/powerpc/boot/prpmc2800.c | 54 ++++++++++++++++----------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/arch/powerpc/boot/prpmc2800.c b/arch/powerpc/boot/prpmc2800.c
index 9614e1d..a8b3213 100644
--- a/arch/powerpc/boot/prpmc2800.c
+++ b/arch/powerpc/boot/prpmc2800.c
@@ -58,7 +58,7 @@ struct prpmc2800_board_info {
u32 core_speed;
u32 mem_size;
u32 boot_flash;
- u32 user_flash;
+ u8 has_user_flash;
};
static struct prpmc2800_board_info prpmc2800_board_info[] = {
@@ -73,7 +73,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 512*MB,
.boot_flash = 1*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -86,7 +86,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 512*MB,
.boot_flash = 0,
- .user_flash = 0,
+ .has_user_flash = 0,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -99,7 +99,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 733*MHz,
.mem_size = 512*MB,
.boot_flash = 1*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -112,7 +112,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 1*GB,
.boot_flash = 1*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -125,7 +125,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 512*MB,
.boot_flash = 1*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -138,7 +138,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 733*MHz,
.mem_size = 128*MB,
.boot_flash = 1*MB,
- .user_flash = 0,
+ .has_user_flash = 0,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -151,7 +151,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 256*MB,
.boot_flash = 1*MB,
- .user_flash = 0,
+ .has_user_flash = 0,
},
{
.model = BOARD_MODEL_PRPMC280,
@@ -164,7 +164,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 1*GB,
.boot_flash = 1*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -177,7 +177,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 512*MB,
.boot_flash = 2*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -190,7 +190,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 512*MB,
.boot_flash = 0,
- .user_flash = 0,
+ .has_user_flash = 0,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -203,7 +203,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 733*MHz,
.mem_size = 512*MB,
.boot_flash = 2*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -216,7 +216,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 1*GB,
.boot_flash = 2*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -229,7 +229,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 512*MB,
.boot_flash = 2*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -242,7 +242,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 733*MHz,
.mem_size = 128*MB,
.boot_flash = 2*MB,
- .user_flash = 0,
+ .has_user_flash = 0,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -255,7 +255,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 1*GHz,
.mem_size = 2*GB,
.boot_flash = 2*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
{
.model = BOARD_MODEL_PRPMC2800,
@@ -268,7 +268,7 @@ static struct prpmc2800_board_info prpmc2800_board_info[] = {
.core_speed = 733*MHz,
.mem_size = 1*GB,
.boot_flash = 2*MB,
- .user_flash = 64*MB,
+ .has_user_flash = 1,
},
};
@@ -451,15 +451,17 @@ static void prpmc2800_fixups(void)
setprop(devp, "model", "mv64362", strlen("mv64362") + 1);
}
- /* Set User FLASH size */
- devp = finddevice("/mv64x60/flash@a0000000");
- if (devp == NULL)
- fatal("Error: Missing User FLASH device tree node\n\r");
- rc = getprop(devp, "reg", v, sizeof(v));
- if (rc != sizeof(v))
- fatal("Error: Can't find User FLASH reg property\n\r");
- v[1] = bip->user_flash;
- setprop(devp, "reg", v, sizeof(v));
+ /* Some PrPMC2800 variants have no User FLASH */
+ if (!bip->has_user_flash) {
+ devp = finddevice("/mv64x60/flash@a0000000");
+ if (devp != NULL) {
+ rc = getprop(devp, "reg", v, sizeof(v));
+ if (rc == sizeof(v)) {
+ v[1] = 0;
+ setprop(devp, "reg", v, sizeof(v));
+ }
+ }
+ }
}
#define MV64x60_MPP_CNTL_0 0xf000
next prev parent reply other threads:[~2007-10-25 23:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-25 23:39 [PATCH 1/2] powerpc: prpmc2800 - Add MTD support Mark A. Greer
2007-10-25 23:42 ` Mark A. Greer [this message]
2007-10-26 0:23 ` Stephen Rothwell
2007-10-26 1:06 ` Mark A. Greer
2007-10-26 2:19 ` [PATCH v2 " Mark A. Greer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071025234235.GA22913@mag.az.mvista.com \
--to=mgreer@mvista.com \
--cc=Linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox