[U-Boot] [PULL] : Please pull u-boot-imx

[U-Boot] [PULL] : Please pull u-boot-imx

[Stefano Babic]

Hi Albert,

please pull from u-boot-imx, thanks. A question about the patch "ARM:
implement some Cortex-A9 errata workarounds"

	http://patchwork.ozlabs.org/patch/223419/

I read the general agreement about it, and I have applied 2/3, because
this is i.MX-related. However, the effect is worthless for i.MX6 until
1/3 will be applied. I read before applying that you will merge it, but
I have not found it in arm-tree. Do you see any problem on it ? If you
do not plan to apply it, it is better I revert 2/3, else the errata will
not be set for i.MX6.


The following changes since commit 4cfc611b4a4ce009cfad46804bec2a1caad8e329:

  ARM: ns9750dev: remove remainders of dead board (2013-02-28 14:49:24
+0100)

are available in the git repository at:

  git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4:

  Add Boundary Devices Nitrogen6X boards (2013-03-13 09:04:24 +0100)

----------------------------------------------------------------
Beno?t Th?baudeau (6):
      imx: mx6q DDR3 init: Fix tMRD
      imx: mx6q DDR3 init: Fix tXPR
      imx: mx6q DDR3 init: Fix SDE_to_RST
      imx: mx6q DDR3 init: Fix RST_to_CKE
      imx: mx6q DDR3 init: Fix MR0.PPD
      imx: mx6q DDR3 init: Benefit from available CL = 7

Eric Nelson (8):
      i.MX6Q: mx6qsabre*: Configure to allow CONFIG_SYS_ALT_MEMTEST
      i.MX6: mx6qsabrelite: indent with tabs
      i.MX6: consolidate pad names for multi-CPU boards
      i.MX6: crm_regs: define CCM_CCGRx for use in board config files
      i.MX6: crm_regs: define IOMUXC_GPR4/6/7
      i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO
      i.MX6: Add DDR controller registers
      Add Boundary Devices Nitrogen6X boards

Fabio Estevam (5):
      mx6: Disable Power Down Bit of watchdog
      mx23evk: Remove CONFIG_SYS_BAUDRATE_TABLE
      mx23evk: Turn on caches
      common: cmd_sata: Fix usage text for 'sata init'
      mx6: Provide a structure for accessing HDMI registers

Fadil Berisha (2):
      mxs: timrot: Add support to i.MX23
      mxs: timrot: Rename local macros

Marek Vasut (7):
      mxs: Reset the EMI block on mx23
      mxs: mmc: spi: dma: Better wrap the MXS differences
      mxs: spi: Fix the MXS SPI for mx23
      mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE
      mxs: Squash the header file usage in ehci-mxs
      mxs: Make ehci-mxs multiport capable
      mxs: m28: Enable power to USB port 0

Otavio Salvador (11):
      build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
      mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to
CONFIG_SPL_MXS_PSWITCH_WAIT
      mx23: Document the tRAS lockout setting in memory initialization
      mx23evk: Adjust DRAM control register to use full 128MB of RAM
      led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
      mxs: Fix iomux.h to not break build during assembly stage
      mx23_olinuxino: Add support for status LED
      mx23evk: Enable USB support
      mx23_olinuxino: Enable USB support
      mx23_olinuxino: Add ethernet support
      mx23_olinuxino: Fix warning for implicit declaration

Stefano Babic (3):
      Merge branch 'master' of git://git.denx.de/u-boot-arm
      Merge branch 'master' of git://git.denx.de/u-boot-arm
      USB: drop unneeded header in ehci-mx6

Stephen Warren (1):
      ARM: mx6: use common CPU errata config options

 MAINTAINERS                                        |    8 +
 Makefile                                           |    4 +-
 arch/arm/cpu/arm926ejs/config.mk                   |    2 +-
 arch/arm/cpu/arm926ejs/mxs/clock.c                 |    3 +-
 arch/arm/cpu/arm926ejs/mxs/mxs_init.h              |    2 +-
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c          |   16 +-
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c        |    2 +-
 arch/arm/cpu/arm926ejs/mxs/timer.c                 |   39 +-
 arch/arm/cpu/armv7/Makefile                        |    2 +-
 arch/arm/cpu/armv7/config.mk                       |    2 +-
 arch/arm/cpu/armv7/mx6/Makefile                    |    1 -
 arch/arm/cpu/armv7/mx6/lowlevel_init.S             |   35 -
 arch/arm/cpu/armv7/mx6/soc.c                       |   16 +
 arch/arm/include/asm/arch-mx6/crm_regs.h           |   12 +
 arch/arm/include/asm/arch-mx6/imx-regs.h           |    8 +
 arch/arm/include/asm/arch-mx6/iomux.h              |    5 +
 arch/arm/include/asm/arch-mx6/mx6-ddr.h            |   85 +
 arch/arm/include/asm/arch-mx6/mx6-pins.h           |   31 +
 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h          |   71 +
 arch/arm/include/asm/arch-mx6/mx6dl_pins.h         |  193 +--
 arch/arm/include/asm/arch-mx6/mx6q-ddr.h           |   69 +
 arch/arm/include/asm/arch-mx6/mx6q_pins.h          | 1671
++++++++++++++++++++
 arch/arm/include/asm/arch-mx6/mx6x_pins.h          | 1671
--------------------
 arch/arm/include/asm/arch-mx6/mxc_hdmi.h           | 1083 ++++++-------
 arch/arm/include/asm/arch-mxs/dma.h                |   19 +-
 arch/arm/include/asm/arch-mxs/imx-regs.h           |    2 +
 arch/arm/include/asm/arch-mxs/iomux.h              |    5 +
 arch/arm/include/asm/arch-mxs/regs-ssp.h           |   26 +
 arch/arm/include/asm/arch-mxs/regs-timrot.h        |  101 ++
 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg    |   58 +
 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg    |   58 +
 board/boundary/nitrogen6x/6x_bootscript.txt        |   63 +
 .../boundary/nitrogen6x/6x_bootscript_android.txt  |   64 +
 .../nitrogen6x/6x_bootscript_android_recovery.txt  |   64 +
 board/boundary/nitrogen6x/6x_upgrade.txt           |   45 +
 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg     |   58 +
 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg     |   58 +
 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg     |   57 +
 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg     |   58 +
 board/boundary/nitrogen6x/Makefile                 |   41 +
 board/boundary/nitrogen6x/README                   |   92 ++
 board/boundary/nitrogen6x/clocks.cfg               |   46 +
 board/boundary/nitrogen6x/ddr-setup.cfg            |  112 ++
 board/boundary/nitrogen6x/nitrogen6dl.cfg          |   45 +
 board/boundary/nitrogen6x/nitrogen6dl2g.cfg        |   45 +
 board/boundary/nitrogen6x/nitrogen6q.cfg           |   45 +
 board/boundary/nitrogen6x/nitrogen6q2g.cfg         |   45 +
 board/boundary/nitrogen6x/nitrogen6s.cfg           |   45 +
 board/boundary/nitrogen6x/nitrogen6s1g.cfg         |   45 +
 board/boundary/nitrogen6x/nitrogen6x.c             |  895 +++++++++++
 board/denx/m28evk/m28evk.c                         |    4 +
 board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg       |   10 +-
 board/freescale/mx23evk/spl_boot.c                 |   10 +
 board/freescale/mx6qarm2/mx6qarm2.c                |   78 +-
 board/freescale/mx6qsabreauto/mx6qsabreauto.c      |   60 +-
 board/freescale/mx6qsabrelite/mx6qsabrelite.c      |  292 ++--
 board/freescale/mx6qsabresd/mx6qsabresd.c          |  102 +-
 board/olimex/mx23_olinuxino/mx23_olinuxino.c       |   13 +
 board/olimex/mx23_olinuxino/spl_boot.c             |    8 +
 boards.cfg                                         |    6 +
 common/cmd_led.c                                   |    6 +-
 common/cmd_sata.c                                  |    2 +-
 drivers/mmc/mxsmmc.c                               |   20 +-
 drivers/spi/mxs_spi.c                              |   39 +-
 drivers/usb/host/ehci-mx6.c                        |    1 -
 drivers/usb/host/ehci-mxs.c                        |  155 +-
 include/configs/apx4devkit.h                       |    3 +-
 include/configs/m28evk.h                           |    5 +-
 include/configs/mx23_olinuxino.h                   |   64 +-
 include/configs/mx23evk.h                          |   14 +-
 include/configs/mx28evk.h                          |    4 +-
 include/configs/mx6_common.h                       |   23 +
 include/configs/mx6qarm2.h                         |    3 +
 include/configs/mx6qsabre_common.h                 |    4 +
 include/configs/mx6qsabrelite.h                    |    4 +
 include/configs/nitrogen6x.h                       |  285 ++++
 include/configs/sc_sps_1.h                         |    3 +-
 77 files changed, 5683 insertions(+), 2758 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6-pins.h
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6q_pins.h
 delete mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h
 create mode 100644 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg
 create mode 100644 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg
 create mode 100644 board/boundary/nitrogen6x/6x_bootscript.txt
 create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android.txt
 create mode 100644
board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt
 create mode 100644 board/boundary/nitrogen6x/6x_upgrade.txt
 create mode 100644 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg
 create mode 100644 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg
 create mode 100644 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg
 create mode 100644 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg
 create mode 100644 board/boundary/nitrogen6x/Makefile
 create mode 100644 board/boundary/nitrogen6x/README
 create mode 100644 board/boundary/nitrogen6x/clocks.cfg
 create mode 100644 board/boundary/nitrogen6x/ddr-setup.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6dl.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6dl2g.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6q.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6q2g.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6s.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6s1g.cfg
 create mode 100644 board/boundary/nitrogen6x/nitrogen6x.c
 create mode 100644 include/configs/mx6_common.h
 create mode 100644 include/configs/nitrogen6x.h


Thanks,
Stefano

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

[U-Boot] [PULL] : Please pull u-boot-imx

[Albert ARIBAUD]

Hi Stefano,

On Wed, 13 Mar 2013 09:43:46 +0100, Stefano Babic <sbabic@denx.de>
wrote:

> Hi Albert,
> 
> please pull from u-boot-imx, thanks. A question about the patch "ARM:
> implement some Cortex-A9 errata workarounds"
> 
> 	http://patchwork.ozlabs.org/patch/223419/
> 
> I read the general agreement about it, and I have applied 2/3, because
> this is i.MX-related. However, the effect is worthless for i.MX6 until
> 1/3 will be applied. I read before applying that you will merge it, but
> I have not found it in arm-tree. Do you see any problem on it ? If you
> do not plan to apply it, it is better I revert 2/3, else the errata will
> not be set for i.MX6.

Sorry -- I should have taken 1/3 and 2/3 and haven't yet. No worries,
though: I'll take them in, then merge your tree; you don't need to
revert 2/3, it'll merge properly anyway.

> Thanks,
> Stefano

Amicalement,
-- 
Albert.

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Albert ARIBAUD]

On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Stefano,
> 
> On Wed, 13 Mar 2013 09:43:46 +0100, Stefano Babic <sbabic@denx.de>
> wrote:
> 
> > Hi Albert,
> > 
> > please pull from u-boot-imx, thanks. A question about the patch "ARM:
> > implement some Cortex-A9 errata workarounds"
> > 
> > 	http://patchwork.ozlabs.org/patch/223419/
> > 
> > I read the general agreement about it, and I have applied 2/3, because
> > this is i.MX-related. However, the effect is worthless for i.MX6 until
> > 1/3 will be applied. I read before applying that you will merge it, but
> > I have not found it in arm-tree. Do you see any problem on it ? If you
> > do not plan to apply it, it is better I revert 2/3, else the errata will
> > not be set for i.MX6.
> 
> Sorry -- I should have taken 1/3 and 2/3 and haven't yet. No worries,
> though: I'll take them in, then merge your tree; you don't need to
> revert 2/3, it'll merge properly anyway.

Regardless of applying the two patches above, there is a merge conflict
between u-boot-imx/master and u-boot-arm/master between:

- commit af73034c6ba131a93ed215098f43595637ef6ac3 ("led: Use
  STATUS_LED_ON and STATUS_LED_OFF when calling __led_set"), author
  Otavio Salvador <otavio@ossystems.com.br>, from the IMX tree, and

- commit 4f47aceb118b291831a603d7e6ca651d76bf88e0 ("led: The gpio_led.c
  code expects that LED state is from the enum"), author Holger Hans
  Peter Freyther <holger@freyther.de>, from the TI tree through the ARM
  tree.

Actually, both commits are functionally exactly the same, Otavio's one
being better only in that it causes smaller line widths.

I have merged the IMX tree with -Xtheirs so that the conflicts is
automatically resolved in favor of Otavio's version.

However, MAKEALL -a arm fails on three boards: nitrogen6s1g, with an
error, and nitrogen6dl2g and nitrogen6q2g, with a warning.

nitrogen6s1g:

nitrogen6x.c:89:17: error: 'CONFIG_DDR_MB' undeclared (first use in
this function)
nitrogen6x.c:89:17: note: each undeclared identifier is reported only
once for each function it appears in

nitrogen6dl2g and nitrogen6q2g:

nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow]

These failures also happen on IMX ToT before merge. Stefano, can you
have a look? I can obviously not locate the actual faulty commit, as
support for these boards appears only in the very last commit of the IMX
branch.

> > Thanks,
> > Stefano

Amicalement,
-- 
Albert.

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Eric Nelson]

Hi Albert,

On 03/13/2013 03:26 PM, Albert ARIBAUD wrote:
> On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
> <albert.u.boot@aribaud.net> wrote:
>
 > <snip>
>
> However, MAKEALL -a arm fails on three boards: nitrogen6s1g, with an
> error, and nitrogen6dl2g and nitrogen6q2g, with a warning.
>
> nitrogen6s1g:
>
> nitrogen6x.c:89:17: error: 'CONFIG_DDR_MB' undeclared (first use in
> this function)
> nitrogen6x.c:89:17: note: each undeclared identifier is reported only
> once for each function it appears in
>

This one's on me.

Sorry for not running MAKEALL before submission:

The line beginning with nitrogen6s1g should say "DDR_MB=1024", not
"SDRAM_MB=1024":

http://git.denx.de/u-boot.git/?p=u-boot/u-boot-imx.git;a=blobdiff;f=boards.cfg;h=fb3b197eef192fe5bf5ecaad8bcca5cab3bf1c43;hp=7a0b79dd072f4b8a8c39fe75d638c4d163bdc385;hb=d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4;hpb=7315e3bf2cc95abf9ae53f43ccbd31c6f638aacd

> nitrogen6dl2g and nitrogen6q2g:
>
> nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow]
>

Looking into this now.

Regards,


Eric

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Fabio Estevam]

Hi Eric,

On Wed, Mar 13, 2013 at 7:36 PM, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:
> Hi Albert,
>
>
> On 03/13/2013 03:26 PM, Albert ARIBAUD wrote:
>>
>> On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
>> <albert.u.boot@aribaud.net> wrote:
>>
>> <snip>
>
>>
>> However, MAKEALL -a arm fails on three boards: nitrogen6s1g, with an
>> error, and nitrogen6dl2g and nitrogen6q2g, with a warning.
>>
>> nitrogen6s1g:
>>
>> nitrogen6x.c:89:17: error: 'CONFIG_DDR_MB' undeclared (first use in
>> this function)
>> nitrogen6x.c:89:17: note: each undeclared identifier is reported only
>> once for each function it appears in
>>
>
> This one's on me.
>
> Sorry for not running MAKEALL before submission:
>
> The line beginning with nitrogen6s1g should say "DDR_MB=1024", not
> "SDRAM_MB=1024":
>
> http://git.denx.de/u-boot.git/?p=u-boot/u-boot-imx.git;a=blobdiff;f=boards.cfg;h=fb3b197eef192fe5bf5ecaad8bcca5cab3bf1c43;hp=7a0b79dd072f4b8a8c39fe75d638c4d163bdc385;hb=d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4;hpb=7315e3bf2cc95abf9ae53f43ccbd31c6f638aacd
>
>
>> nitrogen6dl2g and nitrogen6q2g:
>>
>> nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow]
>>
>
> Looking into this now.

Just fixed it. Will send the patches now.

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Eric Nelson]

Thanks Fabio.

On 03/13/2013 03:40 PM, Fabio Estevam wrote:
> Hi Eric,
>
> On Wed, Mar 13, 2013 at 7:36 PM, Eric Nelson
> <eric.nelson@boundarydevices.com> wrote:
>> Hi Albert,
>>
>>
>> On 03/13/2013 03:26 PM, Albert ARIBAUD wrote:
>>>
>>> On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
>>> <albert.u.boot@aribaud.net> wrote:
>>>
>>> <snip>
>>
>>>
>>> However, MAKEALL -a arm fails on three boards: nitrogen6s1g, with an
>>> error, and nitrogen6dl2g and nitrogen6q2g, with a warning.
>>>
>>> nitrogen6s1g:
>>>
>>> nitrogen6x.c:89:17: error: 'CONFIG_DDR_MB' undeclared (first use in
>>> this function)
>>> nitrogen6x.c:89:17: note: each undeclared identifier is reported only
>>> once for each function it appears in
>>>
>>
>> This one's on me.
>>
>> Sorry for not running MAKEALL before submission:
>>
>> The line beginning with nitrogen6s1g should say "DDR_MB=1024", not
>> "SDRAM_MB=1024":
>>
>> http://git.denx.de/u-boot.git/?p=u-boot/u-boot-imx.git;a=blobdiff;f=boards.cfg;h=fb3b197eef192fe5bf5ecaad8bcca5cab3bf1c43;hp=7a0b79dd072f4b8a8c39fe75d638c4d163bdc385;hb=d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4;hpb=7315e3bf2cc95abf9ae53f43ccbd31c6f638aacd
>>
>>
>>> nitrogen6dl2g and nitrogen6q2g:
>>>
>>> nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow]
>>>
>>
>> Looking into this now.
>
> Just fixed it. Will send the patches now.
>

Something like this?

diff --git a/board/boundary/nitrogen6x/nitrogen6x.c 
b/board/boundary/nitrogen6x/nitrogen6x.c
index 0dbb6d2..38e7f78 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -86,7 +86,7 @@ DECLARE_GLOBAL_DATA_PTR;

  int dram_init(void)
  {
-       gd->ram_size = CONFIG_DDR_MB * 1024 * 1024;
+       gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024;

         return 0;
  }

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Fabio Estevam]

On Wed, Mar 13, 2013 at 7:43 PM, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:
> Thanks Fabio.
>
>
> On 03/13/2013 03:40 PM, Fabio Estevam wrote:
>>
>> Hi Eric,
>>
>> On Wed, Mar 13, 2013 at 7:36 PM, Eric Nelson
>> <eric.nelson@boundarydevices.com> wrote:
>>>
>>> Hi Albert,
>>>
>>>
>>> On 03/13/2013 03:26 PM, Albert ARIBAUD wrote:
>>>>
>>>>
>>>> On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
>>>> <albert.u.boot@aribaud.net> wrote:
>>>>
>>>> <snip>
>>>
>>>
>>>>
>>>> However, MAKEALL -a arm fails on three boards: nitrogen6s1g, with an
>>>> error, and nitrogen6dl2g and nitrogen6q2g, with a warning.
>>>>
>>>> nitrogen6s1g:
>>>>
>>>> nitrogen6x.c:89:17: error: 'CONFIG_DDR_MB' undeclared (first use in
>>>> this function)
>>>> nitrogen6x.c:89:17: note: each undeclared identifier is reported only
>>>> once for each function it appears in
>>>>
>>>
>>> This one's on me.
>>>
>>> Sorry for not running MAKEALL before submission:
>>>
>>> The line beginning with nitrogen6s1g should say "DDR_MB=1024", not
>>> "SDRAM_MB=1024":
>>>
>>>
>>> http://git.denx.de/u-boot.git/?p=u-boot/u-boot-imx.git;a=blobdiff;f=boards.cfg;h=fb3b197eef192fe5bf5ecaad8bcca5cab3bf1c43;hp=7a0b79dd072f4b8a8c39fe75d638c4d163bdc385;hb=d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4;hpb=7315e3bf2cc95abf9ae53f43ccbd31c6f638aacd
>>>
>>>
>>>> nitrogen6dl2g and nitrogen6q2g:
>>>>
>>>> nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow]
>>>>
>>>
>>> Looking into this now.
>>
>>
>> Just fixed it. Will send the patches now.
>>
>
> Something like this?
>
> diff --git a/board/boundary/nitrogen6x/nitrogen6x.c
> b/board/boundary/nitrogen6x/nitrogen6x.c
> index 0dbb6d2..38e7f78 100644
> --- a/board/boundary/nitrogen6x/nitrogen6x.c
> +++ b/board/boundary/nitrogen6x/nitrogen6x.c
> @@ -86,7 +86,7 @@ DECLARE_GLOBAL_DATA_PTR;
>
>  int dram_init(void)
>  {
> -       gd->ram_size = CONFIG_DDR_MB * 1024 * 1024;
> +       gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024;

Yes, but I used (ulong) instead.

Would it be OK?

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Eric Nelson]

On 03/13/2013 03:44 PM, Fabio Estevam wrote:
> On Wed, Mar 13, 2013 at 7:43 PM, Eric Nelson
> <eric.nelson@boundarydevices.com> wrote:
>> Thanks Fabio.
>>
>>
>> On 03/13/2013 03:40 PM, Fabio Estevam wrote:
>>>
>>> Hi Eric,
>>>
>>> On Wed, Mar 13, 2013 at 7:36 PM, Eric Nelson
>>> <eric.nelson@boundarydevices.com> wrote:
>>>>
>>>> Hi Albert,
>>>>
>>>>
>>>> On 03/13/2013 03:26 PM, Albert ARIBAUD wrote:
>>>>>
>>>>>
>>>>> On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
>>>>> <albert.u.boot@aribaud.net> wrote:
>>>>>
>>>>> <snip>
>>>>
>>>>
>>>>>
>>>>> However, MAKEALL -a arm fails on three boards: nitrogen6s1g, with an
>>>>> error, and nitrogen6dl2g and nitrogen6q2g, with a warning.
>>>>>
>>>>> nitrogen6s1g:
>>>>>
>>>>> nitrogen6x.c:89:17: error: 'CONFIG_DDR_MB' undeclared (first use in
>>>>> this function)
>>>>> nitrogen6x.c:89:17: note: each undeclared identifier is reported only
>>>>> once for each function it appears in
>>>>>
>>>>
>>>> This one's on me.
>>>>
>>>> Sorry for not running MAKEALL before submission:
>>>>
>>>> The line beginning with nitrogen6s1g should say "DDR_MB=1024", not
>>>> "SDRAM_MB=1024":
>>>>
>>>>
>>>> http://git.denx.de/u-boot.git/?p=u-boot/u-boot-imx.git;a=blobdiff;f=boards.cfg;h=fb3b197eef192fe5bf5ecaad8bcca5cab3bf1c43;hp=7a0b79dd072f4b8a8c39fe75d638c4d163bdc385;hb=d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4;hpb=7315e3bf2cc95abf9ae53f43ccbd31c6f638aacd
>>>>
>>>>
>>>>> nitrogen6dl2g and nitrogen6q2g:
>>>>>
>>>>> nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow]
>>>>>
>>>>
>>>> Looking into this now.
>>>
>>>
>>> Just fixed it. Will send the patches now.
>>>
>>
>> Something like this?
>>
>> diff --git a/board/boundary/nitrogen6x/nitrogen6x.c
>> b/board/boundary/nitrogen6x/nitrogen6x.c
>> index 0dbb6d2..38e7f78 100644
>> --- a/board/boundary/nitrogen6x/nitrogen6x.c
>> +++ b/board/boundary/nitrogen6x/nitrogen6x.c
>> @@ -86,7 +86,7 @@ DECLARE_GLOBAL_DATA_PTR;
>>
>>   int dram_init(void)
>>   {
>> -       gd->ram_size = CONFIG_DDR_MB * 1024 * 1024;
>> +       gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024;
>
> Yes, but I used (ulong) instead.
>
> Would it be OK?
>

Works for me...

Note that Troy wanted to see DDR_MB expressed as bytes instead,
which would have solved the overflow problem.

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Stefano Babic]

On 13/03/2013 23:26, Albert ARIBAUD wrote:
> On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD
> <albert.u.boot@aribaud.net> wrote:
> 
>> Hi Stefano,

Hi Albert,

> Regardless of applying the two patches above, there is a merge conflict
> between u-boot-imx/master and u-boot-arm/master between:
> 
> - commit af73034c6ba131a93ed215098f43595637ef6ac3 ("led: Use
>   STATUS_LED_ON and STATUS_LED_OFF when calling __led_set"), author
>   Otavio Salvador <otavio@ossystems.com.br>, from the IMX tree, and
> 
> - commit 4f47aceb118b291831a603d7e6ca651d76bf88e0 ("led: The gpio_led.c
>   code expects that LED state is from the enum"), author Holger Hans
>   Peter Freyther <holger@freyther.de>, from the TI tree through the ARM
>   tree.
> 
> Actually, both commits are functionally exactly the same, Otavio's one
> being better only in that it causes smaller line widths.
> 
> I have merged the IMX tree with -Xtheirs so that the conflicts is
> automatically resolved in favor of Otavio's version.
> 

Thanks for fixing that.

> These failures also happen on IMX ToT before merge. Stefano, can you
> have a look? I can obviously not locate the actual faulty commit, as
> support for these boards appears only in the very last commit of the IMX
> branch.

Sorry for that - I have already seen patches from Fabio fixing that. I
will test it and then I will send a pull request to fix it.

Best regards,
Stefano


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

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Stefano Babic]

On 13/03/2013 23:49, Eric Nelson wrote:

>> Yes, but I used (ulong) instead.
>>
>> Would it be OK?
>>
> 
> Works for me...
> 
> Note that Troy wanted to see DDR_MB expressed as bytes instead,
> which would have solved the overflow problem.

Ok, I sent also a fix, but I will wait for Troy's patch.

Regards,
Stefano


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

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Eric Nelson]

On 03/14/2013 02:38 AM, Stefano Babic wrote:
> On 13/03/2013 23:49, Eric Nelson wrote:
>
>>> Yes, but I used (ulong) instead.
>>>
>>> Would it be OK?
>>>
>>
>> Works for me...
>>
>> Note that Troy wanted to see DDR_MB expressed as bytes instead,
>> which would have solved the overflow problem.
>
> Ok, I sent also a fix, but I will wait for Troy's patch.
>

Troy wasn't planning a patch.

His comments were verbal and I may have convinced him that
it is easier to understand and validate correctness of
	DDR_MB=1024
than
	DDR_SIZE=1073741824

And I don't think anyone will be building an i.MX6-based
board whose RAM size isn't an even multiple of a megabyte.

Regards,


Eric

[U-Boot] [PULL] : Please pull u-boot-imx -- 3 build failures

[Stefano Babic]

On 14/03/2013 14:48, Eric Nelson wrote:
> On 03/14/2013 02:38 AM, Stefano Babic wrote:
>> On 13/03/2013 23:49, Eric Nelson wrote:
>>
>>>> Yes, but I used (ulong) instead.
>>>>
>>>> Would it be OK?
>>>>
>>>
>>> Works for me...
>>>
>>> Note that Troy wanted to see DDR_MB expressed as bytes instead,
>>> which would have solved the overflow problem.
>>
>> Ok, I sent also a fix, but I will wait for Troy's patch.
>>
> 
> Troy wasn't planning a patch.
> 
> His comments were verbal and I may have convinced him that
> it is easier to understand and validate correctness of
>     DDR_MB=1024
> than
>     DDR_SIZE=1073741824
> 
> And I don't think anyone will be building an i.MX6-based
> board whose RAM size isn't an even multiple of a megabyte.

Ok, understood. I will apply Fabio's patch, then.

Regards,
Stefano


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