[U-Boot] Adding dataflash support for at91sam9m10g45ek

2012-05-12 Thread Thad Phetteplace
Hello all,

I am trying to add dataflash support for the at91sam9m10g45ek to a
recent version of u-boot (2010.06 or later).  I have a patched version
of u-boot-1.3.4 from linux4sam that works, and a glance at more recent
code seems to show dataflash supported on other at91 boards in
versions >= 2010.06.  Using the linux4sam code and other atmel boards
as a reference, I've added dataflash support for the at91sam9m10g45ek.
 It almost works, but I'm getting occasional bad reads leading to CRC
failures and occasionally the SPI bus stops talking completely.  After
reviewing code, spec sheets, etc... I'm at a loss as why this is
failing.  I am mostly riding on top of the existing Atmel SPI
dataflash support already in u-boot, basically just adding some board
specific calls to init the SPI interface.  Anyone here have any ideas?
 Any known hardware issues I need to be working around?  Patches I
should be looking at?

Thanks,

Thad Phetteplace
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] UBI: volume auto-resize

2012-05-12 Thread Matevz Langus
Hi,

I found an interesting situation where I can not decide whether it is a bug or 
functionality that should not be included at all.

If I generate UBI image consisting of 3 Volumes to NAND flash on my board, 
U-boot  does not attach UBI to MTD. This happens only if UBI contains a volume 
that has auto-resize flag set.
U-boot tries to resize it but fails.

Just started fixing it, but I have a question. Is it desirable that U-boot 
changes something in the FS? Would it not be better if U-boot would just read 
things out (that is all I want, to get uImage and dtb file) and leave the rest 
to Linux.
(Linux handles the procedure without any issues).

Any opinion welcome.

Creating 1 MTD partitions on "nand0":
0x0020-0x0800 : "mtd=2"
Bad block table found at page 65472, version 0x01
Bad block table found at page 65408, version 0x01
nand_read_bbt: Bad block at 0x011a
UBI: attaching mtd1 to ubi0
UBI: physical eraseblock size:   131072 bytes (128 KiB)
UBI: logical eraseblock size:129024 bytes
UBI: smallest flash I/O unit:2048
UBI: sub-page size:  512
UBI: VID header offset:  512 (aligned 512)
UBI: data offset:2048
UBI error: ubi_io_write: error -5 while writing 512 bytes to PEB 1003:512, 
written 0 bytes
UBI warning: ubi_eba_write_leb: failed to write VID header to LEB 2147479551:0, 
PEB 1003
UBI: try another PEB
UBI error: ubi_io_write: error -5 while writing 512 bytes to PEB 1003:512, 
written 0 bytes
UBI warning: ubi_eba_write_leb: failed to write VID header to LEB 2147479551:0, 
PEB 1003
UBI: try another PEB
UBI error: ubi_io_write: error -5 while writing 512 bytes to PEB 1003:512, 
written 0 bytes
UBI warning: ubi_eba_write_leb: failed to write VID header to LEB 2147479551:0, 
PEB 1003
UBI: try another PEB
UBI error: ubi_io_write: error -5 while writing 512 bytes to PEB 1003:512, 
written 0 bytes
UBI warning: ubi_eba_write_leb: failed to write VID header to LEB 2147479551:0, 
PEB 1003
UBI warning: ubi_ro_mode: switch to read-only mode
UBI error: autoresize: cannot auto-resize volume 2
UBI error: ubi_init: cannot attach mtd1
UBI error: ubi_init: UBI error: cannot initialize UBI, error -30
UBI init error 30


Best regards,
  Matevz Langus
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Alexander Holler

Am 11.05.2012 21:09, schrieb Wolfgang Denk:

Dear Alexander Holler,

In message<1336720486-7424-1-git-send-email-hol...@ahsoftware.de>  you wrote:

This is used for compatibility with text files which are
using CRLF instead of LF as the end of a line.


I don't think we should do this.  If you have text files with CR-LF
line endings, then please use external tools (like dos2unix) to filter
these and bring them into the appropriate format.

I would like to put as little restrictions on the content of an
environment variable as possible.  I can see valid use for strings
that contain a CR character.


I don't see any reasonable usage for carriage returns in imported 
environment variables, but I've seen many people from the windows camp 
struggling in writing small text files to set some environment variables 
(which mostly end up in the kernel cmdline). Especially because those 
CR's often will lead to obscure errors because almost nothing (in u-boot 
or linux) is able to handle them.


Anyway I don't really care, I just found it very user friendly to strip 
the carriage returns, especially for those embedded newbies which are in 
need to use some unnamed windows IDE.


So I've decided (after having that patch lying around for about a year) 
to finally post it.


Regards,

Alexander
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Alexander Holler

Am 12.05.2012 08:17, schrieb Marek Vasut:

Dear Alexander Holler,


This is used for compatibility with text files which are
using CRLF instead of LF as the end of a line.

Signed-off-by: Alexander Holler


Why don't you run the file trough dos2unix or tr -d '\r' ?


Because my files don't contain CRs. ;)

Regards,

Alexander




---
  lib/hashtable.c |   18 +++---
  1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/hashtable.c b/lib/hashtable.c
index abd61c8..6e146ce 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -623,9 +623,9 @@ ssize_t hexport_r(struct hsearch_data *htab, const char
sep, * (entries separated by newline characters).
   *
   * To allow for nicely formatted text input, leading white space
- * (sequences of SPACE and TAB chars) is ignored, and entries starting
- * (after removal of any leading white space) with a '#' character are
- * considered comments and ignored.
+ * (sequences of SPACE and TAB chars) is ignored, all Carriage Returns
+ * are ignored and entries starting (after removal of any leading white
+ * space) with a '#' character are considered comments and ignored.
   *
   * [NOTE: this means that a variable name cannot start with a '#'
   * character.]
@@ -642,6 +642,7 @@ int himport_r(struct hsearch_data *htab,
  const char *env, size_t size, const char sep, int flag)
  {
char *data, *sp, *dp, *name, *value;
+   unsigned ignored_crs;

/* Test for correct arguments.  */
if (htab == NULL) {
@@ -698,6 +699,17 @@ int himport_r(struct hsearch_data *htab,
}
}

+   /* Remove all Carriage Returns */
+   ignored_crs = 0;
+   for(;dp<  data + size&&  *dp; ++dp) {
+   if( *dp == '\r' )
+   ++ignored_crs;
+   else if(ignored_crs)
+   *(dp-ignored_crs) = *dp;
+   }
+   size -= ignored_crs;
+   dp = data;
+
/* Parse environment; allow for '\0' and 'sep' as separators */
do {
ENTRY e, *rv;


Best regards,
Marek Vasut


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] Question about md output

2012-05-12 Thread ffile...@libero.it
Dear all,

I need to access data values stored in flash for integrity checking.

Thus, I would like to parse the output of md (memory display) and store its 
output to enviromental varaibles.

For example, when invoking:

=> md 0x10 1
0010: 8083764e bd86200a 60a19054 2c12c402

I would like to store one ore more memory values in some env variables.

1) Is it feasible with the current uboot scripting features?

2) Would it be possible to modify the md command so that it also store its 
output to env variables?

3) Or, would it be possible to modify the md command so that its output is 
just a word value which can be used for uboot scripting capabilities?
e.g. 

=> md 0x10 1 2 
bd86200a

=> md 0x10 1 4 
2c12c402

Best Regards,

FF
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] Question about md output

2012-05-12 Thread Wolfgang Denk
Dear "ffile...@libero.it",

In message <28478089.7028571336829211206.JavaMail.defaultUser@defaultHost> you 
wrote:
> 
> I need to access data values stored in flash for integrity checking.

This is something where teh test / itest commands come in handy.

> Thus, I would like to parse the output of md (memory display) and store its 
> output to enviromental varaibles.

This is probably the wrong approach to do what you have in mind.

> 1) Is it feasible with the current uboot scripting features?

No.  But actually it is not needed either.  Use itest instead.

> 2) Would it be possible to modify the md command so that it also store its 
> output to env variables?

It would be possible, but it makes little sense to me.

> 3) Or, would it be possible to modify the md command so that its output is 
> just a word value which can be used for uboot scripting capabilities?
> e.g. 

Ditto.

Have a look at itest; if you still make no progress then please
describe what you actually want to do, so we can show you how to do it
efficiently - without need to modify code.

Best regards,

Wolfgang Denk

-- 
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: w...@denx.de
America has been discovered before, but it has always been hushed up.
- Oscar Wilde
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Marek Vasut
Dear Alexander Holler,

> Am 12.05.2012 08:17, schrieb Marek Vasut:
> > Dear Alexander Holler,
> > 
> >> This is used for compatibility with text files which are
> >> using CRLF instead of LF as the end of a line.
> >> 
> >> Signed-off-by: Alexander Holler
> > 
> > Why don't you run the file trough dos2unix or tr -d '\r' ?
> 
> Because my files don't contain CRs. ;)

s/you/someone else/ :)

> 
> Regards,
> 
> Alexander
> 
> >> ---
> >> 
> >>   lib/hashtable.c |   18 +++---
> >>   1 files changed, 15 insertions(+), 3 deletions(-)
> >> 
> >> diff --git a/lib/hashtable.c b/lib/hashtable.c
> >> index abd61c8..6e146ce 100644
> >> --- a/lib/hashtable.c
> >> +++ b/lib/hashtable.c
> >> @@ -623,9 +623,9 @@ ssize_t hexport_r(struct hsearch_data *htab, const
> >> char sep, * (entries separated by newline characters).
> >> 
> >>*
> >>* To allow for nicely formatted text input, leading white space
> >> 
> >> - * (sequences of SPACE and TAB chars) is ignored, and entries starting
> >> - * (after removal of any leading white space) with a '#' character are
> >> - * considered comments and ignored.
> >> + * (sequences of SPACE and TAB chars) is ignored, all Carriage Returns
> >> + * are ignored and entries starting (after removal of any leading white
> >> + * space) with a '#' character are considered comments and ignored.
> >> 
> >>*
> >>* [NOTE: this means that a variable name cannot start with a '#'
> >>* character.]
> >> 
> >> @@ -642,6 +642,7 @@ int himport_r(struct hsearch_data *htab,
> >> 
> >>  const char *env, size_t size, const char sep, int flag)
> >>   
> >>   {
> >>   
> >>char *data, *sp, *dp, *name, *value;
> >> 
> >> +  unsigned ignored_crs;
> >> 
> >>/* Test for correct arguments.  */
> >>if (htab == NULL) {
> >> 
> >> @@ -698,6 +699,17 @@ int himport_r(struct hsearch_data *htab,
> >> 
> >>}
> >>
> >>}
> >> 
> >> +  /* Remove all Carriage Returns */
> >> +  ignored_crs = 0;
> >> +  for(;dp<  data + size&&  *dp; ++dp) {
> >> +  if( *dp == '\r' )
> >> +  ++ignored_crs;
> >> +  else if(ignored_crs)
> >> +  *(dp-ignored_crs) = *dp;
> >> +  }
> >> +  size -= ignored_crs;
> >> +  dp = data;
> >> +
> >> 
> >>/* Parse environment; allow for '\0' and 'sep' as separators */
> >>do {
> >>
> >>ENTRY e, *rv;
> > 
> > Best regards,
> > Marek Vasut
> 
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Alexander Holler

Am 12.05.2012 16:46, schrieb Marek Vasut:

Dear Alexander Holler,


Am 12.05.2012 08:17, schrieb Marek Vasut:

Dear Alexander Holler,


This is used for compatibility with text files which are
using CRLF instead of LF as the end of a line.

Signed-off-by: Alexander Holler


Why don't you run the file trough dos2unix or tr -d '\r' ?


Because my files don't contain CRs. ;)


s/you/someone else/ :)


Try to explain a windows user that a text file should not contain 
carriage returns and how he can achieve that.


You'll do it once, maybe twice, than you will surrender. ;)

Regards,

Alexander
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 1/1] fat: FAT sector offsets overflow on large disks and/or FAT partitions

2012-05-12 Thread Anatolij Gustschin
Hello,

On Wed, 02 May 2012 19:17:41 -0700
Aaron Williams  wrote:

> This patch fixes several issues where sector offsets can overflow due to
> being limited to 16-bits.  There are many cases which can cause an
> overflow, including large FAT32 partitions and partitions that start at
> a sufficiently large offset on the storage device.

For large FAT32 partitions only changing of fatlength, rootdir_sect and
data_begin is needed to avoid overflows. Changing of fat_sect shouldn't
be needed.

What do you mean exactly by "partitions starting at a sufficiently large
offset on the storage device"? How do you create such partition?
I've tested with a 210 GB FAT32 partition as the fourth primary partition
on a 2 TB disk. This partition is the last partition on the disk, so its
offset is sufficiently large. For this test only fatlength, rootdir_sect
and data_begin was changed to __u32 and int and I do not see issues when
listing or loading the files from this partition.

> Numerous issues were observed and fixed when a 64GB FAT32 filesystem was
> accessed due to truncation.
> 
> Signed-off-by: Aaron Williams 
> ---
>  include/fat.h |   10 +-
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/fat.h b/include/fat.h
> index 4c92442..7215628 100644
> --- a/include/fat.h
> +++ b/include/fat.h
> @@ -178,12 +178,12 @@ typedef struct dir_slot {
>  typedef struct {
> __u8*fatbuf;/* Current FAT buffer */
> int fatsize;/* Size of FAT in bits */
> -   __u16   fatlength;  /* Length of FAT in sectors */
> -   __u16   fat_sect;   /* Starting sector of the FAT */
> -   __u16   rootdir_sect;   /* Start sector of root directory */
> -   __u16   sect_size;  /* Size of sectors in bytes */
> +   __u32   fat_sect;   /* Starting sector of the FAT */
> +   __u32   rootdir_sect;   /* Start sector of root directory */
> +   __u32   fatlength;  /* Length of FAT in sectors */
> __u16   clust_size; /* Size of clusters in sectors */
> -   short   data_begin; /* The sector of the first cluster, can be 
> negative */
> +   __u16   sect_size;  /* Size of sectors in bytes */
> +   int data_begin; /* The sector of the first cluster, can be 
> negative */
> int fatbufnum;  /* Used by get_fatent, init to -1 */
>  } fsdata;

The patch is probably corrupted by your mailer, it doesn't apply.

Thanks,
Anatolij
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] Commit acc4959fc breaks mx28evk

2012-05-12 Thread Fabio Estevam
Hi Marek,

This commit in u-boot-imx causes mx28evk board to not boot:

commit acc4959fc1b3e61beb372f686595eb2f90240c92
Author: Marek Vasut 
Date:   Thu May 3 05:47:18 2012 +

Revert "i.MX28: Enable additional DRAM address bits"

Can you please check?

Regards,

Fabio Estevam
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] Commit acc4959fc breaks mx28evk

2012-05-12 Thread Fabio Estevam
On Sat, May 12, 2012 at 12:53 PM, Fabio Estevam  wrote:
> Hi Marek,
>
> This commit in u-boot-imx causes mx28evk board to not boot:
>
> commit acc4959fc1b3e61beb372f686595eb2f90240c92
> Author: Marek Vasut 
> Date:   Thu May 3 05:47:18 2012 +
>
>    Revert "i.MX28: Enable additional DRAM address bits"
>
> Can you please check?

Ok, I fixed it and will post the patch.

Basically I had to do the same as:

commit 19a2066b578f826c7bcb2b96a90434382e8ec8f3
Author: Marek Vasut 
Date:   Thu May 3 05:47:19 2012 +

M28: Scan only first 512 MB of DRAM to avoid memory wraparound

Will submit the patch.

BTW, having a common environment for mx28evk and m28evk would really
help to avoid such breakages.

Regards,

Fabio Estevam
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] Commit acc4959fc breaks mx28evk

2012-05-12 Thread Marek Vasut
Dear Fabio Estevam,

> On Sat, May 12, 2012 at 12:53 PM, Fabio Estevam  wrote:
> > Hi Marek,
> > 
> > This commit in u-boot-imx causes mx28evk board to not boot:
> > 
> > commit acc4959fc1b3e61beb372f686595eb2f90240c92
> > Author: Marek Vasut 
> > Date:   Thu May 3 05:47:18 2012 +
> > 
> >Revert "i.MX28: Enable additional DRAM address bits"
> > 
> > Can you please check?
> 
> Ok, I fixed it and will post the patch.
> 
> Basically I had to do the same as:
> 
> commit 19a2066b578f826c7bcb2b96a90434382e8ec8f3
> Author: Marek Vasut 
> Date:   Thu May 3 05:47:19 2012 +
> 
> M28: Scan only first 512 MB of DRAM to avoid memory wraparound
> 
> Will submit the patch.
> 
> BTW, having a common environment for mx28evk and m28evk would really
> help to avoid such breakages.

Well I have another patch in queue that might help, but if you do avoid the 
wraparound, that's ok too. Sorry for the hassle.

> 
> Regards,
> 
> Fabio Estevam

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Fabio Estevam
From: Fabio Estevam 

Scan only first 512 MB of DRAM to avoid memory wraparound.

This fixes mx28evk boot and it follows the same idea of commit
19a2066b57 (M28: Scan only first 512 MB of DRAM to avoid memory wraparound)

Signed-off-by: Fabio Estevam 
---
 include/configs/mx28evk.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 0c18e50..a4ea12d 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -75,7 +75,7 @@
  */
 #define CONFIG_NR_DRAM_BANKS   1   /* 1 bank of DRAM */
 #define PHYS_SDRAM_1   0x4000  /* Base address */
-#define PHYS_SDRAM_1_SIZE  0x4000  /* Max 1 GB RAM */
+#define PHYS_SDRAM_1_SIZE  0x2000  /* Max 512MB RAM */
 #define CONFIG_STACKSIZE   (128 * 1024)/* 128 KB stack */
 #define CONFIG_SYS_MALLOC_LEN  0x0040  /* 4 MB for malloc */
 #define CONFIG_SYS_MEMTEST_START   0x4000  /* Memtest start adr */
-- 
1.7.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Marek Vasut
Dear Alexander Holler,

> Am 12.05.2012 16:46, schrieb Marek Vasut:
> > Dear Alexander Holler,
> > 
> >> Am 12.05.2012 08:17, schrieb Marek Vasut:
> >>> Dear Alexander Holler,
> >>> 
>  This is used for compatibility with text files which are
>  using CRLF instead of LF as the end of a line.
>  
>  Signed-off-by: Alexander Holler
> >>> 
> >>> Why don't you run the file trough dos2unix or tr -d '\r' ?
> >> 
> >> Because my files don't contain CRs. ;)
> > 
> > s/you/someone else/ :)
> 
> Try to explain a windows user that a text file should not contain
> carriage returns and how he can achieve that.
> 
> You'll do it once, maybe twice, than you will surrender. ;)

But you're fixing the problem at a wrong place, aren't you? Besides, removing 
\r 
might harm some environments, don't you think?

> Regards,
> 
> Alexander

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Marek Vasut
Dear Fabio Estevam,

> From: Fabio Estevam 
> 
> Scan only first 512 MB of DRAM to avoid memory wraparound.
> 
> This fixes mx28evk boot and it follows the same idea of commit
> 19a2066b57 (M28: Scan only first 512 MB of DRAM to avoid memory wraparound)

Thanks, sorry for the breakage.

Acked-by: Marek Vasut 

btw. I think Otavio was working on some common config, wasn't he?
btw2. won't there ever be MX28EVK with more than 512MB of DRAM?

> 
> Signed-off-by: Fabio Estevam 
> ---
>  include/configs/mx28evk.h |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
> index 0c18e50..a4ea12d 100644
> --- a/include/configs/mx28evk.h
> +++ b/include/configs/mx28evk.h
> @@ -75,7 +75,7 @@
>   */
>  #define CONFIG_NR_DRAM_BANKS 1   /* 1 bank of DRAM */
>  #define PHYS_SDRAM_1 0x4000  /* Base address */
> -#define PHYS_SDRAM_1_SIZE0x4000  /* Max 1 GB RAM */
> +#define PHYS_SDRAM_1_SIZE0x2000  /* Max 512MB RAM */
>  #define CONFIG_STACKSIZE (128 * 1024)/* 128 KB stack */
>  #define CONFIG_SYS_MALLOC_LEN0x0040  /* 4 MB for 
malloc */
>  #define CONFIG_SYS_MEMTEST_START 0x4000  /* Memtest start adr */

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] R: Re: Question about md output

2012-05-12 Thread ffile...@libero.it

>
>Ditto.
>
>Have a look at itest; if you still make no progress then please
>describe what you actually want to do, so we can show you how to do it
>efficiently - without need to modify code.
>
>Best regards,
>
>Wolfgang Denk
>


Dear Wolfgang,

thanks for your support.
Let me understand if I get this right.

for example, I have a block of 8 words, starting at 0x0:

: a b c d
0010: e f g h

where a is the crc32 computed on b,c,d,e,f,g,h

Within uboot, I would like to compute the crc32 of  b,c,d,e,f,g,h and compare 
it with a.

-- Compute CRC and store at address 20
crc 1 7 20
-- Compare CRCs
if itest *0 == *20; then echo CRC ok; else echo CRC bad; fi


Is that correct?

Thanks and best regards,

FF

 



___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Fabio Estevam
On Sat, May 12, 2012 at 1:10 PM, Marek Vasut  wrote:

> Thanks, sorry for the breakage.
>
> Acked-by: Marek Vasut 
>
> btw. I think Otavio was working on some common config, wasn't he?

Yes, I think Otavio is working on that.

> btw2. won't there ever be MX28EVK with more than 512MB of DRAM?

I don't think there will be other revision of mx28evk board.

Regards,

Fabio Estevam
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Marek Vasut
Dear Fabio Estevam,

> On Sat, May 12, 2012 at 1:10 PM, Marek Vasut  wrote:
> > Thanks, sorry for the breakage.
> > 
> > Acked-by: Marek Vasut 
> > 
> > btw. I think Otavio was working on some common config, wasn't he?
> 
> Yes, I think Otavio is working on that.

That'd be so cool ... :)

> 
> > btw2. won't there ever be MX28EVK with more than 512MB of DRAM?
> 
> I don't think there will be other revision of mx28evk board.

All right, this approach is valid then. Btw. Fabio, can you verify that you 
don't see any memory aliasing now (just to avoid trouble).

> Regards,
> 
> Fabio Estevam

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Fabio Estevam
On Sat, May 12, 2012 at 1:19 PM, Marek Vasut  wrote:

> All right, this approach is valid then. Btw. Fabio, can you verify that you
> don't see any memory aliasing now (just to avoid trouble).

How can I verify this, please?

Regards,

Fabio Estevam
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Fabio Estevam
On Sat, May 12, 2012 at 1:19 PM, Marek Vasut  wrote:

> All right, this approach is valid then. Btw. Fabio, can you verify that you
> don't see any memory aliasing now (just to avoid trouble).

Actually I think it would be better to define the total size of RAM
for mx28evk as 128MB.

Do you agree?

Regards,

Fabio Estevam
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Marek Vasut
Dear Fabio Estevam,

> On Sat, May 12, 2012 at 1:19 PM, Marek Vasut  wrote:
> > All right, this approach is valid then. Btw. Fabio, can you verify that
> > you don't see any memory aliasing now (just to avoid trouble).
> 
> How can I verify this, please?

Try writing some pattern into DRAM at "offset-sizeof(pattern area)" and try 
reading it from "2*offset + sizeof(pattern area)" ... try doing the same for 
4*offset etc.

You might also be able to read data from memory behind what uboot considers as 
detected DRAM which will have the same contents as the detected DRAM etc. 

> 
> Regards,
> 
> Fabio Estevam

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Marek Vasut
Dear Fabio Estevam,

> On Sat, May 12, 2012 at 1:19 PM, Marek Vasut  wrote:
> > All right, this approach is valid then. Btw. Fabio, can you verify that
> > you don't see any memory aliasing now (just to avoid trouble).
> 
> Actually I think it would be better to define the total size of RAM
> for mx28evk as 128MB.
> 
> Do you agree?

Yes, it's fine with me.

> 
> Regards,
> 
> Fabio Estevam

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v2] mx28evk: Scan only first 128MB of DRAM to avoid memory wraparound

2012-05-12 Thread Fabio Estevam
From: Fabio Estevam 

Scan only first 128MB of DRAM to avoid memory wraparound.

This fixes mx28evk boot and it follows the same idea of commit
19a2066b57 (M28: Scan only first 512 MB of DRAM to avoid memory wraparound)

Signed-off-by: Fabio Estevam 
---
Change since v1:
- Set the RAM size as 128MB.

 include/configs/mx28evk.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 0c18e50..41037fc 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -75,7 +75,7 @@
  */
 #define CONFIG_NR_DRAM_BANKS   1   /* 1 bank of DRAM */
 #define PHYS_SDRAM_1   0x4000  /* Base address */
-#define PHYS_SDRAM_1_SIZE  0x4000  /* Max 1 GB RAM */
+#define PHYS_SDRAM_1_SIZE  0x0800  /* 128MB RAM */
 #define CONFIG_STACKSIZE   (128 * 1024)/* 128 KB stack */
 #define CONFIG_SYS_MALLOC_LEN  0x0040  /* 4 MB for malloc */
 #define CONFIG_SYS_MEMTEST_START   0x4000  /* Memtest start adr */
-- 
1.7.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH] mx28evk: Fix PSWITCH key position

2012-05-12 Thread Fabio Estevam
Fix the position for PSWITCH key.

The good benefit of doing this is that boot time is greatly reduced: 
from 5 seconds to less then 1 second.

Signed-off-by: Fabio Estevam 
---
 doc/README.mx28evk |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/README.mx28evk b/doc/README.mx28evk
index c6c3d37..571dfda 100644
--- a/doc/README.mx28evk
+++ b/doc/README.mx28evk
@@ -17,7 +17,7 @@ Jumper configuration
 To boot MX28EVK from an SD card, set the boot mode DIP switches as:
 
* Boot Mode Select: 1 0 0 1 (Boot from SD card Slot 0 - U42)
-   * JTAG PSWITCH RESET: To the left (reset enabled)
+   * JTAG PSWITCH RESET: To the right (reset disabled)
* Battery Source: Down
* Wall 5V: Up
* VDD 5V: To the left (off)
-- 
1.7.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Fix PSWITCH key position

2012-05-12 Thread Marek Vasut
Dear Fabio Estevam,

> Fix the position for PSWITCH key.
> 
> The good benefit of doing this is that boot time is greatly reduced:
> from 5 seconds to less then 1 second.
> 
> Signed-off-by: Fabio Estevam 
> ---
>  doc/README.mx28evk |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/doc/README.mx28evk b/doc/README.mx28evk
> index c6c3d37..571dfda 100644
> --- a/doc/README.mx28evk
> +++ b/doc/README.mx28evk
> @@ -17,7 +17,7 @@ Jumper configuration
>  To boot MX28EVK from an SD card, set the boot mode DIP switches as:
> 
> * Boot Mode Select: 1 0 0 1 (Boot from SD card Slot 0 - U42)
> -   * JTAG PSWITCH RESET: To the left (reset enabled)
> +   * JTAG PSWITCH RESET: To the right (reset disabled)
> * Battery Source: Down
> * Wall 5V: Up
> * VDD 5V: To the left (off)

Thanks

Acked-by: Marek Vasut 

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Alexander Holler
Am 12.05.2012 18:08, schrieb Marek Vasut:
> Dear Alexander Holler,
> 
>> Am 12.05.2012 16:46, schrieb Marek Vasut:
>>> Dear Alexander Holler,
>>>
 Am 12.05.2012 08:17, schrieb Marek Vasut:
> Dear Alexander Holler,
>
>> This is used for compatibility with text files which are
>> using CRLF instead of LF as the end of a line.
>>
>> Signed-off-by: Alexander Holler
>
> Why don't you run the file trough dos2unix or tr -d '\r' ?

 Because my files don't contain CRs. ;)
>>>
>>> s/you/someone else/ :)
>>
>> Try to explain a windows user that a text file should not contain
>> carriage returns and how he can achieve that.
>>
>> You'll do it once, maybe twice, than you will surrender. ;)
> 
> But you're fixing the problem at a wrong place, aren't you? Besides, removing 
> \r 
> might harm some environments, don't you think?

No, there is no other layer between the user and that function.

Anyway, as already said, I don't care, just had this patch lying around
a year and I finally surrendered to post it here (in favor of those
users). But it seems I was right in not posting it. ;)

Regards,

Alexander
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Marek Vasut
Dear Alexander Holler,

> Am 12.05.2012 18:08, schrieb Marek Vasut:
> > Dear Alexander Holler,
> > 
> >> Am 12.05.2012 16:46, schrieb Marek Vasut:
> >>> Dear Alexander Holler,
> >>> 
>  Am 12.05.2012 08:17, schrieb Marek Vasut:
> > Dear Alexander Holler,
> > 
> >> This is used for compatibility with text files which are
> >> using CRLF instead of LF as the end of a line.
> >> 
> >> Signed-off-by: Alexander Holler
> > 
> > Why don't you run the file trough dos2unix or tr -d '\r' ?
>  
>  Because my files don't contain CRs. ;)
> >>> 
> >>> s/you/someone else/ :)
> >> 
> >> Try to explain a windows user that a text file should not contain
> >> carriage returns and how he can achieve that.
> >> 
> >> You'll do it once, maybe twice, than you will surrender. ;)
> > 
> > But you're fixing the problem at a wrong place, aren't you? Besides,
> > removing \r might harm some environments, don't you think?
> 
> No, there is no other layer between the user and that function.
> 
> Anyway, as already said, I don't care, just had this patch lying around
> a year and I finally surrendered to post it here (in favor of those
> users). But it seems I was right in not posting it. ;)

Don't get me wrong, I'm not opposed to this patch, nor I want to demotivate you 
in further submissions. I'm just trying to figure out if actually surrending to 
crappy software on one side is a good move on our side. I'd prefer to get more 
oppinions from other people actually, I don't want the guilt to fall on me :-)

> 
> Regards,
> 
> Alexander

Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Alexander Holler

Am 12.05.2012 20:37, schrieb Marek Vasut:

Dear Alexander Holler,


Am 12.05.2012 18:08, schrieb Marek Vasut:

Dear Alexander Holler,


Am 12.05.2012 16:46, schrieb Marek Vasut:

Dear Alexander Holler,


Am 12.05.2012 08:17, schrieb Marek Vasut:

Dear Alexander Holler,


This is used for compatibility with text files which are
using CRLF instead of LF as the end of a line.

Signed-off-by: Alexander Holler


Why don't you run the file trough dos2unix or tr -d '\r' ?


Because my files don't contain CRs. ;)


s/you/someone else/ :)


Try to explain a windows user that a text file should not contain
carriage returns and how he can achieve that.

You'll do it once, maybe twice, than you will surrender. ;)


But you're fixing the problem at a wrong place, aren't you? Besides,
removing \r might harm some environments, don't you think?


No, there is no other layer between the user and that function.

Anyway, as already said, I don't care, just had this patch lying around
a year and I finally surrendered to post it here (in favor of those
users). But it seems I was right in not posting it. ;)


Don't get me wrong, I'm not opposed to this patch, nor I want to demotivate you
in further submissions. I'm just trying to figure out if actually surrending to
crappy software on one side is a good move on our side. I'd prefer to get more
oppinions from other people actually, I don't want the guilt to fall on me :-)


In the good old days (tm) with line printers and almost endless paper 
from dead trees, CRLF instead only LF as line endings in text files did 
made sense.


Regards,

Alexander
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Wolfgang Denk
Dear Alexander Holler,

In message <4fae7232.1050...@ahsoftware.de> you wrote:
>
> > I would like to put as little restrictions on the content of an
> > environment variable as possible.  I can see valid use for strings
> > that contain a CR character.
> 
> I don't see any reasonable usage for carriage returns in imported 
> environment variables, but I've seen many people from the windows camp 

A CR causes the output to re-start from start of line. I can
construct all kind of fancy disply by using "echo $var" - especially
so if "var" can contain control characters including CR.  It makes no
sense striiping these out.

> struggling in writing small text files to set some environment variables 
> (which mostly end up in the kernel cmdline). Especially because those 
> CR's often will lead to obscure errors because almost nothing (in u-boot 
> or linux) is able to handle them.

This is a problem that is as old as DOS, and solutions for this have
been known since.  I already mentioned dos2unix.

> Anyway I don't really care, I just found it very user friendly to strip 
> the carriage returns, especially for those embedded newbies which are in 
> need to use some unnamed windows IDE.
> 
> So I've decided (after having that patch lying around for about a year) 
> to finally post it.

Thanks - but it adds restrictions to doing perfectly valid things.  I
see the disadvantages significantly bigger than what we can win - keep
in mind, that dealing wqith DOS line endings is a topic that is
decades old.

Best regards,

Wolfgang Denk

-- 
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: w...@denx.de
You get a wonderful view from the point of no return.
- Terry Pratchett, _Making_Money_
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Wolfgang Denk
Dear Alexander Holler,

In message <4fae78be.3090...@ahsoftware.de> you wrote:
>
> Try to explain a windows user that a text file should not contain 
> carriage returns and how he can achieve that.
> 
> You'll do it once, maybe twice, than you will surrender. ;)

I disagree here.  But of course YMMV.


But we should not remove functionality to make life easier for
ignorant people who don't listen to your advice.

Best regards,

Wolfgang Denk

-- 
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: w...@denx.de
Save yourself!  Reboot in 5 seconds!
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] Ignore all Carriage Returns when importing an environment.

2012-05-12 Thread Wolfgang Denk
Dear Alexander Holler,

In message <4faeb5c2.40...@ahsoftware.de> you wrote:
>
> In the good old days (tm) with line printers and almost endless paper 
> from dead trees, CRLF instead only LF as line endings in text files did 
> made sense.

It still makes a lot of sense in tty output.  Guess how all the
one-line status status lines are being printed?

Best regards,

Wolfgang Denk

-- 
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: w...@denx.de
Is the glass half empty, half full, or twice as large as it needs to
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH] mx28evk: Scan only first 512 MB of DRAM to avoid memory wraparound

2012-05-12 Thread Wolfgang Denk
Dear Fabio Estevam,

In message <1336838852-14235-1-git-send-email-feste...@gmail.com> you wrote:
> From: Fabio Estevam 
> 
> Scan only first 512 MB of DRAM to avoid memory wraparound.
> 
> This fixes mx28evk boot and it follows the same idea of commit
> 19a2066b57 (M28: Scan only first 512 MB of DRAM to avoid memory wraparound)

Actually I think this should not be needed.  Such wrap-arounds are
supposed to be detected by get_ram_size(), which should result in
properly sized RAM mappings.

Why is this failing here?

Best regards,

Wolfgang Denk

-- 
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: w...@denx.de
He'd heard her use that sweet, innocent  tone  of  voice  before.  It
meant that, pretty soon, there was going to be trouble.
- Terry Pratchett, _Truckers_
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH v2] mx28evk: Scan only first 128MB of DRAM to avoid memory wraparound

2012-05-12 Thread Wolfgang Denk
Dear Fabio Estevam,

In message <1336843047-27479-1-git-send-email-feste...@gmail.com> you wrote:
> From: Fabio Estevam 
> 
> Scan only first 128MB of DRAM to avoid memory wraparound.
> 
> This fixes mx28evk boot and it follows the same idea of commit
> 19a2066b57 (M28: Scan only first 512 MB of DRAM to avoid memory wraparound)
> 
> Signed-off-by: Fabio Estevam 
> ---
> Change since v1:
> - Set the RAM size as 128MB.

I think this is the wrong approach.  We should let get_ram_size() do
it's job.  Or can you explain why it isn't working for you?

Best regards,

Wolfgang Denk

-- 
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: w...@denx.de
It would seem that evil retreats when forcibly confronted
-- Yarnek of Excalbia, "The Savage Curtain", stardate 5906.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH v2] mx28evk: Scan only first 128MB of DRAM to avoid memory wraparound

2012-05-12 Thread Fabio Estevam
Hi Wolfgang,

On Sat, May 12, 2012 at 6:24 PM, Wolfgang Denk  wrote:

> I think this is the wrong approach.  We should let get_ram_size() do
> it's job.  Or can you explain why it isn't working for you?

I haven't done a deeper investigation yet, but with current u-boot-imx
I cannot get mx28evk to boot.

If I revert this commit:
commit acc4959fc1b3e61beb372f686595eb2f90240c92
Author: Marek Vasut 
Date:   Thu May 3 05:47:18 2012 +

Revert "i.MX28: Enable additional DRAM address bits"

,then it boots fine.

I followed then the same approach of commit:

commit 19a2066b578f826c7bcb2b96a90434382e8ec8f3
Author: Marek Vasut 
Date:   Thu May 3 05:47:19 2012 +

M28: Scan only first 512 MB of DRAM to avoid memory wraparound

,that fixed the boot.

Also, on the other i.MX boards we put the total size of RAM in the
config files, and I did the same here with this patch.

If anyone has better suggestion on how to better handle this, please let know.

Regards,

Fabio Estevam
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack

2012-05-12 Thread Otavio Salvador
Signed-off-by: Otavio Salvador 
---
 include/configs/m28evk.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c62f4d0..7472ddc 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -88,7 +88,7 @@
 #defineCONFIG_NR_DRAM_BANKS1   /* 1 bank of 
DRAM */
 #definePHYS_SDRAM_10x4000  /* Base address 
*/
 #definePHYS_SDRAM_1_SIZE   0x2000  /* Max 512 MB 
RAM */
-#defineCONFIG_STACKSIZE0x0001  /* 128 KB stack 
*/
+#defineCONFIG_STACKSIZE(128 * 1024)/* 128 KB stack 
*/
 #defineCONFIG_SYS_MALLOC_LEN   0x0040  /* 4 MB for 
malloc */
 #defineCONFIG_SYS_GBL_DATA_SIZE128 /* Initial data 
*/
 #defineCONFIG_SYS_MEMTEST_START0x4000  /* Memtest 
start adr */
-- 
1.7.10

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC

2012-05-12 Thread Otavio Salvador
This patchset include some small fixes found while looking at code to
start converting it to use a common mxs SoC code in preparation for
inclusion of i.MX23 support.

Otavio Salvador (8):
  m28evk: use same notation to alloc the 128kB stack
  m28evk: use "M28EVK U-Boot =>" as prompt
  mx28evk: ensure command definition is in alphabetic order
  mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS
SoCs
  m28evk: fix board config include guardian macro name
  mx28evk: fix board config include guardian macro name
  mxs: reorganize source directory for easy sharing of code in i.MXS
SoCs
  mxs: prefix register acessor macros with 'mxs' prefix

 arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile  |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c   |4 +-
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c   |6 +-
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c|6 +-
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h   |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c|0
 .../cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c   |0
 .../arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c |0
 .../cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c   |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S   |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c   |0
 .../arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds |2 +-
 .../include/asm/{arch-mx28 => arch-mxs}/clock.h|0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h |0
 .../arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h |0
 .../include/asm/{arch-mx28 => arch-mxs}/imx-regs.h |0
 .../asm/{arch-mx28 => arch-mxs}/iomux-mx28.h   |0
 .../include/asm/{arch-mx28 => arch-mxs}/iomux.h|0
 .../asm/{arch-mx28 => arch-mxs}/regs-apbh.h|  254 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-base.h|0
 .../include/asm/{arch-mx28 => arch-mxs}/regs-bch.h |   42 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h |   58 ++---
 .../asm/{arch-mx28 => arch-mxs}/regs-common.h  |   34 +--
 .../asm/{arch-mx28 => arch-mxs}/regs-digctl.h  |   50 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-gpmi.h|   26 +-
 .../include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h |   28 +--
 .../asm/{arch-mx28 => arch-mxs}/regs-lcdif.h   |   64 ++---
 .../asm/{arch-mx28 => arch-mxs}/regs-lradc.h   |   48 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-ocotp.h   |   86 +++
 .../asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h |  168 ++---
 .../asm/{arch-mx28 => arch-mxs}/regs-power.h   |   28 +--
 .../include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h |   28 +--
 .../include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h |   40 +--
 .../asm/{arch-mx28 => arch-mxs}/regs-timrot.h  |   38 +--
 .../include/asm/{arch-mx28 => arch-mxs}/regs-usb.h |0
 .../asm/{arch-mx28 => arch-mxs}/regs-usbphy.h  |   20 +-
 .../asm/{arch-mx28 => arch-mxs}/sys_proto.h|6 +-
 boards.cfg |4 +-
 doc/README.m28 |4 +-
 doc/README.mx28evk |4 +-
 drivers/gpio/mxs_gpio.c|   16 +-
 drivers/usb/host/ehci-mxs.c|8 +-
 include/configs/m28evk.h   |   14 +-
 include/configs/mx28evk.h  |   12 +-
 tools/mxsboot.c|  110 -
 45 files changed, 604 insertions(+), 604 deletions(-)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c (98%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c (94%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c (97%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds (97%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h (77%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h (92%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h (89%)
 rename arch/arm

[U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt

2012-05-12 Thread Otavio Salvador
Signed-off-by: Otavio Salvador 
---
 include/configs/m28evk.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 7472ddc..ebf7e39 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -114,7 +114,7 @@
  * U-Boot general configurations
  */
 #defineCONFIG_SYS_LONGHELP
-#defineCONFIG_SYS_PROMPT   "=> "
+#defineCONFIG_SYS_PROMPT   "M28EVK U-Boot => "
 #defineCONFIG_SYS_CBSIZE   1024/* Console I/O buffer 
size */
 #defineCONFIG_SYS_PBSIZE   \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-- 
1.7.10

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order

2012-05-12 Thread Otavio Salvador
Signed-off-by: Otavio Salvador 
---
 include/configs/mx28evk.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 0c18e50..5ccfe70 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -54,11 +54,11 @@
 #include 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_FAT
 
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_FAT
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
-- 
1.7.10

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs

2012-05-12 Thread Otavio Salvador
Signed-off-by: Otavio Salvador 
---
 tools/mxsboot.c |  110 +++
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/tools/mxsboot.c b/tools/mxsboot.c
index 6c05aa4..9661a48 100644
--- a/tools/mxsboot.c
+++ b/tools/mxsboot.c
@@ -1,5 +1,5 @@
 /*
- * Freescale i.MX28 image generator
+ * Freescale i.MXS image generator
  *
  * Copyright (C) 2011 Marek Vasut 
  * on behalf of DENX Software Engineering GmbH
@@ -60,13 +60,13 @@ uint32_t sd_sector = 2048;
  */
 #defineMAX_BOOTSTREAM_SIZE (1 * 1024 * 1024)
 
-/* i.MX28 NAND controller-specific constants. DO NOT TWEAK! */
+/* i.MXS NAND controller-specific constants. DO NOT TWEAK! */
 #defineMXS_NAND_DMA_DESCRIPTOR_COUNT   4
 #defineMXS_NAND_CHUNK_DATA_CHUNK_SIZE  512
 #defineMXS_NAND_METADATA_SIZE  10
 #defineMXS_NAND_COMMAND_BUFFER_SIZE32
 
-struct mx28_nand_fcb {
+struct mxs_nand_fcb {
uint32_tchecksum;
uint32_tfingerprint;
uint32_tversion;
@@ -111,7 +111,7 @@ struct mx28_nand_fcb {
uint32_tbb_marker_physical_offset;
 };
 
-struct mx28_nand_dbbt {
+struct mxs_nand_dbbt {
uint32_tchecksum;
uint32_tfingerprint;
uint32_tversion;
@@ -119,13 +119,13 @@ struct mx28_nand_dbbt {
uint32_tnumber_2k_pages_bb;
 };
 
-struct mx28_nand_bbt {
+struct mxs_nand_bbt {
uint32_tnand;
uint32_tnumber_bb;
uint32_tbadblock[510];
 };
 
-struct mx28_sd_drive_info {
+struct mxs_sd_drive_info {
uint32_tchip_num;
uint32_tdrive_type;
uint32_ttag;
@@ -133,20 +133,20 @@ struct mx28_sd_drive_info {
uint32_tsector_count;
 };
 
-struct mx28_sd_config_block {
+struct mxs_sd_config_block {
uint32_tsignature;
uint32_tprimary_boot_tag;
uint32_tsecondary_boot_tag;
uint32_tnum_copies;
-   struct mx28_sd_drive_info   drv_info[1];
+   struct mxs_sd_drive_infodrv_info[1];
 };
 
-static inline uint32_t mx28_nand_ecc_size_in_bits(uint32_t ecc_strength)
+static inline uint32_t mxs_nand_ecc_size_in_bits(uint32_t ecc_strength)
 {
return ecc_strength * 13;
 }
 
-static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size,
+static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
uint32_t page_oob_size)
 {
if (page_data_size == 2048)
@@ -163,7 +163,7 @@ static inline uint32_t mx28_nand_get_ecc_strength(uint32_t 
page_data_size,
return 0;
 }
 
-static inline uint32_t mx28_nand_get_mark_offset(uint32_t page_data_size,
+static inline uint32_t mxs_nand_get_mark_offset(uint32_t page_data_size,
uint32_t ecc_strength)
 {
uint32_t chunk_data_size_in_bits;
@@ -174,7 +174,7 @@ static inline uint32_t mx28_nand_get_mark_offset(uint32_t 
page_data_size,
uint32_t block_mark_bit_offset;
 
chunk_data_size_in_bits = MXS_NAND_CHUNK_DATA_CHUNK_SIZE * 8;
-   chunk_ecc_size_in_bits  = mx28_nand_ecc_size_in_bits(ecc_strength);
+   chunk_ecc_size_in_bits  = mxs_nand_ecc_size_in_bits(ecc_strength);
 
chunk_total_size_in_bits =
chunk_data_size_in_bits + chunk_ecc_size_in_bits;
@@ -212,21 +212,21 @@ static inline uint32_t mx28_nand_get_mark_offset(uint32_t 
page_data_size,
return block_mark_bit_offset;
 }
 
-static inline uint32_t mx28_nand_mark_byte_offset(void)
+static inline uint32_t mxs_nand_mark_byte_offset(void)
 {
uint32_t ecc_strength;
-   ecc_strength = mx28_nand_get_ecc_strength(nand_writesize, nand_oobsize);
-   return mx28_nand_get_mark_offset(nand_writesize, ecc_strength) >> 3;
+   ecc_strength = mxs_nand_get_ecc_strength(nand_writesize, nand_oobsize);
+   return mxs_nand_get_mark_offset(nand_writesize, ecc_strength) >> 3;
 }
 
-static inline uint32_t mx28_nand_mark_bit_offset(void)
+static inline uint32_t mxs_nand_mark_bit_offset(void)
 {
uint32_t ecc_strength;
-   ecc_strength = mx28_nand_get_ecc_strength(nand_writesize, nand_oobsize);
-   return mx28_nand_get_mark_offset(nand_writesize, ecc_strength) & 0x7;
+   ecc_strength = mxs_nand_get_ecc_strength(nand_writesize, nand_oobsize);
+   return mxs_nand_get_mark_offset(nand_writesize, ecc_strength) & 0x7;
 }
 
-static uint32_t mx28_nand_block_csum(uint8_t *block, uint32_t size)
+static uint32_t mxs_nand_block_csum(uint8_t *block, uint32_t size)
 {
uint32_t csum = 0;
int i;
@@ -237,9 +237,9 @@ static uint32_t mx28_nand_block_csum(uint8_t *block, 

[U-Boot] [PATCH 6/8] mx28evk: fix board config include guardian macro name

2012-05-12 Thread Otavio Salvador
Signed-off-by: Otavio Salvador 
---
 include/configs/mx28evk.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 5ccfe70..e98a746 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -16,8 +16,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  */
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __MX28EVK_CONFIG_H__
+#define __MX28EVK_CONFIG_H__
 
 #include 
 
@@ -252,4 +252,4 @@
"run netargs; " \
"dhcp ${uimage}; bootm\0" \
 
-#endif /* __CONFIG_H */
+#endif /* __MX28EVK_CONFIG_H__ */
-- 
1.7.10

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name

2012-05-12 Thread Otavio Salvador
Signed-off-by: Otavio Salvador 
---
 include/configs/m28evk.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index ebf7e39..c1ae996 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
-#ifndef __M28_H__
-#define __M28_H__
+#ifndef __M28EVK_CONFIG_H__
+#define __M28EVK_CONFIG_H__
 
 #include 
 
@@ -327,4 +327,4 @@
"fi ; " \
"fi\0"
 
-#endif /* __M28_H__ */
+#endif /* __M28EVK_CONFIG_H__ */
-- 
1.7.10

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 7/8] mxs: reorganize source directory for easy sharing of code in i.MXS SoCs

2012-05-12 Thread Otavio Salvador
Most code can be shared between i.MX23 and i.MX28 as both are from
i.MXS family; this source directory structure makes easy to share code
among them.

Signed-off-by: Otavio Salvador 
---
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile   |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c|0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c|0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h|0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c   |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c   |0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S|0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c|0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds |2 +-
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h|0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h  |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h   |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h|0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h|0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h|0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h  |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h  |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h|0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h   |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lradc.h   |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h   |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-power.h   |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-timrot.h  |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h  |0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h|0
 boards.cfg  |4 ++--
 doc/README.m28  |4 ++--
 doc/README.mx28evk  |4 ++--
 include/configs/m28evk.h|4 ++--
 include/configs/mx28evk.h   |4 ++--
 42 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds (97%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mx

[U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix

2012-05-12 Thread Otavio Salvador
As the register accessing mode is the same for all i.MXS SoCs we ought
to use 'mxs' prefix intead of 'mx28'.

Signed-off-by: Otavio Salvador 
---
 arch/arm/cpu/arm926ejs/mxs/clock.c   |4 +-
 arch/arm/cpu/arm926ejs/mxs/iomux.c   |6 +-
 arch/arm/cpu/arm926ejs/mxs/mx28.c|6 +-
 arch/arm/include/asm/arch-mxs/regs-apbh.h|  254 +-
 arch/arm/include/asm/arch-mxs/regs-bch.h |   42 ++---
 arch/arm/include/asm/arch-mxs/regs-clkctrl.h |   58 +++---
 arch/arm/include/asm/arch-mxs/regs-common.h  |   34 ++--
 arch/arm/include/asm/arch-mxs/regs-digctl.h  |   50 ++---
 arch/arm/include/asm/arch-mxs/regs-gpmi.h|   26 +--
 arch/arm/include/asm/arch-mxs/regs-i2c.h |   28 +--
 arch/arm/include/asm/arch-mxs/regs-lcdif.h   |   64 +++
 arch/arm/include/asm/arch-mxs/regs-lradc.h   |   48 ++---
 arch/arm/include/asm/arch-mxs/regs-ocotp.h   |   86 -
 arch/arm/include/asm/arch-mxs/regs-pinctrl.h |  168 -
 arch/arm/include/asm/arch-mxs/regs-power.h   |   28 +--
 arch/arm/include/asm/arch-mxs/regs-rtc.h |   28 +--
 arch/arm/include/asm/arch-mxs/regs-ssp.h |   40 ++--
 arch/arm/include/asm/arch-mxs/regs-timrot.h  |   38 ++--
 arch/arm/include/asm/arch-mxs/regs-usbphy.h  |   20 +-
 arch/arm/include/asm/arch-mxs/sys_proto.h|6 +-
 drivers/gpio/mxs_gpio.c  |   16 +-
 drivers/usb/host/ehci-mxs.c  |8 +-
 22 files changed, 529 insertions(+), 529 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c 
b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 0439f9c..3e29c56 100644
--- a/arch/arm/cpu/arm926ejs/mxs/clock.c
+++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -207,7 +207,7 @@ void mx28_set_sspclk(enum mxs_sspclock ssp, uint32_t freq, 
int xtal)
return;
 
clkreg = (uint32_t)(&clkctrl_regs->hw_clkctrl_ssp0) +
-   (ssp * sizeof(struct mx28_register_32));
+   (ssp * sizeof(struct mxs_register_32));
 
clrbits_le32(clkreg, CLKCTRL_SSP_CLKGATE);
while (readl(clkreg) & CLKCTRL_SSP_CLKGATE)
@@ -256,7 +256,7 @@ static uint32_t mx28_get_sspclk(enum mxs_sspclock ssp)
return XTAL_FREQ_KHZ;
 
clkreg = (uint32_t)(&clkctrl_regs->hw_clkctrl_ssp0) +
-   (ssp * sizeof(struct mx28_register_32));
+   (ssp * sizeof(struct mxs_register_32));
 
tmp = readl(clkreg) & CLKCTRL_SSP_DIV_MASK;
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c 
b/arch/arm/cpu/arm926ejs/mxs/iomux.c
index 12916b6..73f1446 100644
--- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
+++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
@@ -43,7 +43,7 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad)
 {
u32 reg, ofs, bp, bm;
void *iomux_base = (void *)MXS_PINCTRL_BASE;
-   struct mx28_register_32 *mxs_reg;
+   struct mxs_register_32 *mxs_reg;
 
/* muxsel */
ofs = 0x100;
@@ -70,7 +70,7 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad)
/* vol */
if (PAD_VOL_VALID(pad)) {
bp = PAD_PIN(pad) % 8 * 4 + 2;
-   mxs_reg = (struct mx28_register_32 *)(iomux_base + ofs);
+   mxs_reg = (struct mxs_register_32 *)(iomux_base + ofs);
if (PAD_VOL(pad))
writel(1 << bp, &mxs_reg->reg_set);
else
@@ -82,7 +82,7 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad)
ofs = PULL_OFFSET;
ofs += PAD_BANK(pad) * 0x10;
bp = PAD_PIN(pad);
-   mxs_reg = (struct mx28_register_32 *)(iomux_base + ofs);
+   mxs_reg = (struct mxs_register_32 *)(iomux_base + ofs);
if (PAD_PULL(pad))
writel(1 << bp, &mxs_reg->reg_set);
else
diff --git a/arch/arm/cpu/arm926ejs/mxs/mx28.c 
b/arch/arm/cpu/arm926ejs/mxs/mx28.c
index a82ff25..a0ec06e 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mx28.c
@@ -81,7 +81,7 @@ void enable_caches(void)
 #endif
 }
 
-int mx28_wait_mask_set(struct mx28_register_32 *reg, uint32_t mask, int 
timeout)
+int mx28_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 {
while (--timeout) {
if ((readl(®->reg) & mask) == mask)
@@ -92,7 +92,7 @@ int mx28_wait_mask_set(struct mx28_register_32 *reg, uint32_t 
mask, int timeout)
return !timeout;
 }
 
-int mx28_wait_mask_clr(struct mx28_register_32 *reg, uint32_t mask, int 
timeout)
+int mx28_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 {
while (--timeout) {
if ((readl(®->reg) & mask) == 0)
@@ -103,7 +103,7 @@ int mx28_wait_mask_clr(struct mx28_register_32 *reg, 
uint32_t mask, int timeout)
return !timeout;
 }
 
-int mx28_reset_block(struct mx28_register_32 *reg)
+int mx28_reset_block(struct mxs_register_32 *reg)
 {
/* Clear SFTRST */
writel(MX28_BLOCK_SFTRST, ®->reg_clr);
diff --git a/