[U-Boot] Please pull u-boot-ti/master

[Javier Martinez Canillas]

On Sat, Jan 26, 2013 at 11:55 AM, Albert ARIBAUD
<albert.u.boot at aribaud.net> wrote:
> Hi Tom,
>
> On Fri, 25 Jan 2013 17:13:43 -0500, Tom Rini <trini at ti.com> wrote:
>
>> Hello,
>>
>> The following changes since commit 7cb70a34b976e68f6348ea0718780e8f38901482:
>>
>>   fdt: fix dts preprocessor options (2013-01-17 09:07:59 -0700)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-ti.git master
>>
>> for you to fetch changes up to e25a6b504bb0c6e7a3a20cc0d2afacb6d88d29b1:
>>
>>   AM335X: Set fdt_high for AM335X devices to enable booting with Device Tree (2013-01-25 17:10:43 -0500)
>>
>> ----------------------------------------------------------------
>> Javier Martinez Canillas (3):
>>       OMAP3: use a single board file for IGEP devices
>>       OMAP3: igep00x0: add boot status GPIO LED
>>       omap4: allow the use of a plain text env file instead boot scripts
>>
>> Jeff Lance (1):
>>       Add DDR3 support for AM335x-EVM (Version 1.5A)
>>
>> Lars Poeschel (3):
>>       am33xx: add a pulldown macro to pinmux config
>>       pcm051: Add support for Phytec phyCORE-AM335x
>>       am335x: display msg when reading MAC from efuse
>>
>> hvaibhav at ti.com (1):
>>       AM335X: Set fdt_high for AM335X devices to enable booting with Device Tree
>>
>>  MAINTAINERS                                        |    3 +
>>  arch/arm/include/asm/arch-am33xx/ddr_defs.h        |   34 +++
>>  arch/arm/include/asm/arch-am33xx/mux.h             |    3 +-
>>  board/isee/igep0020/igep0020.h                     |  151 ----------
>>  board/isee/igep0030/Makefile                       |   43 ---
>>  board/isee/igep0030/igep0030.c                     |  117 --------
>>  board/isee/{igep0020 => igep00x0}/Makefile         |    2 +-
>>  .../{igep0020/igep0020.c => igep00x0/igep00x0.c}   |   51 +++-
>>  .../{igep0030/igep0030.h => igep00x0/igep00x0.h}   |   35 ++-
>>  board/phytec/pcm051/Makefile                       |   46 +++
>>  board/phytec/pcm051/board.c                        |  266 +++++++++++++++++
>>  board/phytec/pcm051/board.h                        |   33 +++
>>  board/phytec/pcm051/mux.c                          |  133 +++++++++
>>  board/ti/am335x/board.c                            |   43 ++-
>>  boards.cfg                                         |    9 +-
>>  include/configs/am335x_evm.h                       |    1 +
>>  include/configs/igep00x0.h                         |    5 +
>>  include/configs/omap4_common.h                     |   17 +-
>>  include/configs/pcm051.h                           |  301 ++++++++++++++++++++
>>  19 files changed, 951 insertions(+), 342 deletions(-)
>>  delete mode 100644 board/isee/igep0020/igep0020.h
>>  delete mode 100644 board/isee/igep0030/Makefile
>>  delete mode 100644 board/isee/igep0030/igep0030.c
>>  rename board/isee/{igep0020 => igep00x0}/Makefile (98%)
>>  rename board/isee/{igep0020/igep0020.c => igep00x0/igep00x0.c} (86%)
>>  rename board/isee/{igep0030/igep0030.h => igep00x0/igep00x0.h} (93%)
>>  create mode 100644 board/phytec/pcm051/Makefile
>>  create mode 100644 board/phytec/pcm051/board.c
>>  create mode 100644 board/phytec/pcm051/board.h
>>  create mode 100644 board/phytec/pcm051/mux.c
>>  create mode 100644 include/configs/pcm051.h
>
> Tested with ELDK5.3, this PR introduces warnings in 5 boards.
>
> pcm051 (introduced by 372d1d9367265e2ca698f82197ad657567c405f9):
>
> mux.c:66:30: warning: 'gpio0_7_pin_mux' defined but not used
> [-Wunused-variable]
>
> igep0020, igem0020_nand, igep0030, igep0030_nand (introduced by
> b689cd584c17b985e15744c24710d5ad34a450b0):
>
> igep00x0.h:168:24: warning: backslash-newline at end of file [enabled
> by default]
>
> Commit authors CC:ed.
>
> Amicalement,
> --
> Albert.

Hi Albert,

I didn't see the warning until now, sorry for being so carelessly. In
the future I'll always check for warnings before sending patches.

I already sent a patch to fix this which btw is just this one-liner:

diff --git a/board/isee/igep00x0/igep00x0.h b/board/isee/igep00x0/igep00x0.h
index 3a84335..ea1e9ac 100644
--- a/board/isee/igep00x0/igep00x0.h
+++ b/board/isee/igep00x0/igep00x0.h
@@ -167,4 +167,4 @@ static void setup_net_chip(void);

 #define MUX_IGEP0030() \
        MUX_VAL(CP(UART1_TX),       (IDIS | PTD | DIS | M0)) /* UART1_TX */\
-       MUX_VAL(CP(UART1_RX),       (IEN  | PTD | DIS | M0)) /* UART1_RX */\
+       MUX_VAL(CP(UART1_RX),       (IEN  | PTD | DIS | M0)) /* UART1_RX */

Thanks a lot and sorry for the inconvenience.

Best regards,
Javier