Patchwork [U-Boot] Please pull u-boot-x86.git

login
register
mail settings
Submitter Simon Glass
Date March 1, 2013, 3:55 a.m.
Message ID <CAPnjgZ2sdq3q_Ly6=_AfiEk6+tcK1709pZreTo1KqG0FdeUpfA@mail.gmail.com>
Download mbox
Permalink /patch/224223/
State Under Review, archived
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-x86.git mem

Comments

Simon Glass - March 1, 2013, 3:55 a.m.
Hi Tom,

On Thu, Feb 28, 2013 at 4:22 PM, Simon Glass <sjg@chromium.org> wrote:
> Hi Tom,
>
> On Thu, Feb 28, 2013 at 3:00 PM, Tom Rini <trini@ti.com> wrote:
>> On Wed, Feb 27, 2013 at 01:18:23PM -0800, Simon Glass wrote:
>>
>>> Hi Tom,
>>>
>>> I have pulled the latest series into a branch in the x86 tree. You can
>>> also get it from patchwork. If you are happy with it, please see
>>> below. I haven't seen any comments for a few days.
>>
>> OK, building with ELDK4.2 for a number of ARM boards such as igep0030:
>> cmd_mem.c: In function 'do_mem_mtest':
>> cmd_mem.c:979: warning: passing argument 1 of 'unmap_sysmem' discards
>> qualifiers from pointer target type
>> cmd_mem.c:980: warning: passing argument 1 of 'unmap_sysmem' discards
>> qualifiers from pointer target type
>>
>
> Strange - there is even an explicit cast,. But mine is gcc 4.4.1 so
> may be a bit later. I could just remove those two lines since they are
> only there for semantic correctness and compile to nothing anyway. But
> I will track down that tool chain and see if I can work out a fix.

OK I have repeated this - it seems that the compiler does not like a
direct 'cast away' of volatile in a function argument. I have added a
work-around, and sent out an updated patch 20. You can either pull
this in from patchwork, or I have updated the pull information below.

Rather ominously this might mean that I need to start building with
multiple tool chains for each architecture. I was rather hoping to
avoid that...

Thanks for spotting it.

Regards,
Simon

>
>> Please fix and re-submit, thanks.


The following changes since commit a1eac57a2001ecf86a46f520cd85ef8e9c8b3687:

  common/env_nand.c: calculate crc only when readenv was OK
(2013-02-22 19:59:53 -0600)

are available in the git repository at:

  git://git.denx.de/u-boot-x86.git mem

for you to fetch changes up to 218da0f35f4b5e5bf13d3dba6d975d4d5d65516f:

  hash: Use lower case for hash algorithm names (2013-02-28 19:49:13 -0800)

----------------------------------------------------------------
Allen Martin (1):
      sandbox: fix compiler warning

Simon Glass (21):
      Tidy up error checking and fix bug in hash command
      Update print_buffer() to use const
      sandbox: Add un/map_sysmen() to deal with sandbox's ram_buf
      sandbox: Change memory commands to use map_physmem
      Split out the memory tests into separate functions
      Use common mtest iteration counting
      Fix mtest indenting
      Bring mtest putc() into common code
      Reduce casting in mtest
      Update set_working_fdt_addr() to use setenv_addr()
      common: Use new numeric setenv functions
      fs: Use new numeric setenv functions
      net: Use new numeric setenv functions
      image: Use crc header file instead of C prototypes
      hash: Add a flag to support saving hashes in the environment
      Roll crc32 into hash infrastructure
      sandbox: config: Enable hash functions and mtest
      Move CONFIG_SYS_MEMTEST_SCRATCH #ifdef to top of file
      sandbox: Update mtest to fix crashes
      sandbox: Allow hash functions to work correctly
      hash: Use lower case for hash algorithm names

Taylor Hutt (1):
      sandbox: Improve sandbox serial port keyboard interface

 README                        |   9 +
 arch/sandbox/config.mk        |   1 +
 arch/sandbox/cpu/os.c         |   8 +
 arch/sandbox/cpu/start.c      |   3 +
 arch/sandbox/include/asm/io.h |  10 +
 common/cmd_bootm.c            |  11 +-
 common/cmd_cbfs.c             |   4 +-
 common/cmd_cramfs.c           |   4 +-
 common/cmd_fdos.c             |   4 +-
 common/cmd_fdt.c              |  11 +-
 common/cmd_hash.c             |  14 +-
 common/cmd_jffs2.c            |   4 +-
 common/cmd_load.c             |  12 +-
 common/cmd_mem.c              | 809
++++++++++++++++++++++++++++++++--------------------------------
 common/cmd_mtdparts.c         |   4 +-
 common/cmd_nand.c             |  12 +-
 common/cmd_nvedit.c           |  11 +-
 common/cmd_reiser.c           |   4 +-
 common/cmd_setexpr.c          |  39 +++-
 common/cmd_sha1sum.c          |   6 +-
 common/cmd_unzip.c            |   4 +-
 common/cmd_ximg.c             |   7 +-
 common/cmd_zfs.c              |   3 +-
 common/cmd_zip.c              |   4 +-
 common/hash.c                 | 194 +++++++++++-----
 common/image.c                |   4 +-
 drivers/net/fm/fm.c           |   4 +-
 drivers/serial/sandbox.c      |  44 +++-
 fs/fs.c                       |   4 +-
 fs/ubifs/ubifs.c              |   4 +-
 include/common.h              |  29 ++-
 include/configs/sandbox.h     |   9 +-
 include/hash.h                |  13 +-
 include/os.h                  |  10 +
 include/u-boot/crc.h          |  11 +
 lib/crc32.c                   |   9 +
 lib/display_options.c         |   3 +-
 net/net.c                     |   8 +-
 38 files changed, 761 insertions(+), 583 deletions(-)
Tom Rini - March 1, 2013, 2:20 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/28/2013 10:55 PM, Simon Glass wrote:
> Hi Tom,
> 
> On Thu, Feb 28, 2013 at 4:22 PM, Simon Glass <sjg@chromium.org>
> wrote:
>> Hi Tom,
>> 
>> On Thu, Feb 28, 2013 at 3:00 PM, Tom Rini <trini@ti.com> wrote:
>>> On Wed, Feb 27, 2013 at 01:18:23PM -0800, Simon Glass wrote:
>>> 
>>>> Hi Tom,
>>>> 
>>>> I have pulled the latest series into a branch in the x86
>>>> tree. You can also get it from patchwork. If you are happy
>>>> with it, please see below. I haven't seen any comments for a
>>>> few days.
>>> 
>>> OK, building with ELDK4.2 for a number of ARM boards such as
>>> igep0030: cmd_mem.c: In function 'do_mem_mtest': cmd_mem.c:979:
>>> warning: passing argument 1 of 'unmap_sysmem' discards 
>>> qualifiers from pointer target type cmd_mem.c:980: warning:
>>> passing argument 1 of 'unmap_sysmem' discards qualifiers from
>>> pointer target type
>>> 
>> 
>> Strange - there is even an explicit cast,. But mine is gcc 4.4.1
>> so may be a bit later. I could just remove those two lines since
>> they are only there for semantic correctness and compile to
>> nothing anyway. But I will track down that tool chain and see if
>> I can work out a fix.
> 
> OK I have repeated this - it seems that the compiler does not like
> a direct 'cast away' of volatile in a function argument. I have
> added a work-around, and sent out an updated patch 20. You can
> either pull this in from patchwork, or I have updated the pull
> information below.

Thanks, I'll give it a day or two in public before re-pulling.

> Rather ominously this might mean that I need to start building
> with multiple tool chains for each architecture. I was rather
> hoping to avoid that...
> 
> Thanks for spotting it.

Sadly, it's a must.  ELDK4.2 is the oldest toolchain we support, but
we do support it for ARM (except when THUMB is required, those fail
gracefully tho).  My build loops include ELDK4.2/arm, ELDK5.2/arm and
whatever Linaro PPA has up, for ARM (and eldk5.2 for powerpc).

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRMLkvAAoJENk4IS6UOR1W5SUQAJ8a/lgm4/0IC3iQidTuhYr7
7/Xp3lwZkFvcIYYcV3hlMwejHwEZ6+YLynCNwRaRcLu2rPjrO2VrCyezFF0lXBRB
+REFPzPelUWRmzNlJNE95rlf1R1Oj+NMalou/BLtP6UYP/BDsYqEO1DSg+b+xAzU
1ynx4Jbz/elszgII8On/rn6fjbLn1Nx8r+GvEd/EoZQNb4ykgp/P23FY5n1SpDav
QgLsOBnoGNh3t+iM/d1Uqkp9SxaCmgVkgCVjWMYBsLrDB0lQKS92P3cXPQ7eYPPu
wW3mlKxJI3E42X+XLxk961BmGvyzWDxs92/YW+ctTZ52jKmbBciD1+Yk7p7jlKLP
inBPKmBChswzpZOyyg/aOCJ3DENc6ad8JQA5kELtn3wOlJJcwUDJdEzvaRFwvbQV
qUqSO+aUjL6Kd7lvn72MI40sqgPxleP84fCy3ZjqFISGPtcFGrsc9NVteJM4k59R
S6FEwYdWYarMhJq+1Q25tyfEMjUzvLLARdPx88nh97Ew4D7d3ZGt8ma6ClfO0/Ku
dzS0bBhlRn2ZUfSHjPRl8SvoyjjRT19VO5zrucIupnU5Zx+wU4g1h/bMoGlDxTVw
3Yf8OhFCAXWnhPtsIQTj7KM5Asgl1waX5jc4afiEyTt+SqT2BNtcShjyfUR2c3gh
pI2LEszwK0iD7K0E6p5m
=oihH
-----END PGP SIGNATURE-----
Tom Rini - March 4, 2013, 9:27 p.m.
On Thu, Feb 28, 2013 at 07:55:39PM -0800, Simon Glass wrote:

[snip]
> The following changes since commit a1eac57a2001ecf86a46f520cd85ef8e9c8b3687:
> 
>   common/env_nand.c: calculate crc only when readenv was OK
> (2013-02-22 19:59:53 -0600)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-x86.git mem
> 
> for you to fetch changes up to 218da0f35f4b5e5bf13d3dba6d975d4d5d65516f:
> 
>   hash: Use lower case for hash algorithm names (2013-02-28 19:49:13 -0800)
> 
> ----------------------------------------------------------------
> Allen Martin (1):
>       sandbox: fix compiler warning
> 
> Simon Glass (21):
>       Tidy up error checking and fix bug in hash command
>       Update print_buffer() to use const
>       sandbox: Add un/map_sysmen() to deal with sandbox's ram_buf
>       sandbox: Change memory commands to use map_physmem
>       Split out the memory tests into separate functions
>       Use common mtest iteration counting
>       Fix mtest indenting
>       Bring mtest putc() into common code
>       Reduce casting in mtest
>       Update set_working_fdt_addr() to use setenv_addr()
>       common: Use new numeric setenv functions
>       fs: Use new numeric setenv functions
>       net: Use new numeric setenv functions
>       image: Use crc header file instead of C prototypes
>       hash: Add a flag to support saving hashes in the environment
>       Roll crc32 into hash infrastructure
>       sandbox: config: Enable hash functions and mtest
>       Move CONFIG_SYS_MEMTEST_SCRATCH #ifdef to top of file
>       sandbox: Update mtest to fix crashes
>       sandbox: Allow hash functions to work correctly
>       hash: Use lower case for hash algorithm names
> 
> Taylor Hutt (1):
>       sandbox: Improve sandbox serial port keyboard interface
> 
>  README                        |   9 +
>  arch/sandbox/config.mk        |   1 +
>  arch/sandbox/cpu/os.c         |   8 +
>  arch/sandbox/cpu/start.c      |   3 +
>  arch/sandbox/include/asm/io.h |  10 +
>  common/cmd_bootm.c            |  11 +-
>  common/cmd_cbfs.c             |   4 +-
>  common/cmd_cramfs.c           |   4 +-
>  common/cmd_fdos.c             |   4 +-
>  common/cmd_fdt.c              |  11 +-
>  common/cmd_hash.c             |  14 +-
>  common/cmd_jffs2.c            |   4 +-
>  common/cmd_load.c             |  12 +-
>  common/cmd_mem.c              | 809
> ++++++++++++++++++++++++++++++++--------------------------------
>  common/cmd_mtdparts.c         |   4 +-
>  common/cmd_nand.c             |  12 +-
>  common/cmd_nvedit.c           |  11 +-
>  common/cmd_reiser.c           |   4 +-
>  common/cmd_setexpr.c          |  39 +++-
>  common/cmd_sha1sum.c          |   6 +-
>  common/cmd_unzip.c            |   4 +-
>  common/cmd_ximg.c             |   7 +-
>  common/cmd_zfs.c              |   3 +-
>  common/cmd_zip.c              |   4 +-
>  common/hash.c                 | 194 +++++++++++-----
>  common/image.c                |   4 +-
>  drivers/net/fm/fm.c           |   4 +-
>  drivers/serial/sandbox.c      |  44 +++-
>  fs/fs.c                       |   4 +-
>  fs/ubifs/ubifs.c              |   4 +-
>  include/common.h              |  29 ++-
>  include/configs/sandbox.h     |   9 +-
>  include/hash.h                |  13 +-
>  include/os.h                  |  10 +
>  include/u-boot/crc.h          |  11 +
>  lib/crc32.c                   |   9 +
>  lib/display_options.c         |   3 +-
>  net/net.c                     |   8 +-
>  38 files changed, 761 insertions(+), 583 deletions(-)

Applied to u-boot/master, thanks!