public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] am3517evm: change console device from ttyS2 to ttyO2
Date: Mon, 18 Jul 2011 09:50:35 +0200	[thread overview]
Message-ID: <4E23E5CB.50406@aribaud.net> (raw)
In-Reply-To: <CAGm1_ksaVrLFgvTBstwANFzz5znuo=8YctYVd5FhBpix-CwK9w@mail.gmail.com>

Hi Yegor,

Le 18/07/2011 09:32, Yegor Yefremov a ?crit :
> Hi Albert,
>
>>> the serial device names have been changed from ttySx to ttyOx, so the
>>> console device name
>>> should be also changed to support the latest kernel versions.
>>>
>>> Signed-off-by: Yegor Yefremov<yegorslists@googlemail.com>
>>>
>>> ---
>>
>> This does not apply cleanly -- sorry, I should have pulled this earlier. Can
>> you rebase and submit a V2 of the patch? Thanks.
>
> What git repo are we talking about? The patch applies without problems
> against both:
>
> git://git.denx.de/u-boot-ti.git
> git://git.denx.de/u-boot.git

Weird...

It has not been applied yet (current config file still has ttyS2) but 
does not applean cleanly on either u-boot-arm/master (which I applied it 
to in the first place), u-boot/master (which I tried then) or 
u-boot-ti/master (which I just tried). All three end up with:

Checking patch include/configs/am3517_evm.h...
error: while searching for:

#define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x82000000\0" \
        "console=ttyS2,115200n8\0" \
        "mmcargs=setenv bootargs console=${console} " \
                "root=/dev/mmcblk0p2 rw " \
                "rootfstype=ext3 rootwait\0" \

error: patch failed: include/configs/am3517_evm.h:190
Applying patch include/configs/am3517_evm.h with 1 rejects...
Rejected hunk #1.

The master branches I used are the latest ones (git fetch done just 
before applying) and their respectve commit IDs are:

u-boot-arm/master: a55d23ccf6cb90acb9667a46427670add9486aec
u-boot/master: 68d4230c3ccce96a72c5b99e48399bf1796fe3c6
u-boot-ti/master: 7b2fac7654f7420c2787f74ec3b1540fa3b343e9

> Yegor

Amicalement,
-- 
Albert.

  reply	other threads:[~2011-07-18  7:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-22  8:33 [U-Boot] [PATCH] am3517evm: change console device from ttyS2 to ttyO2 Yegor Yefremov
2011-07-17 15:09 ` Albert ARIBAUD
2011-07-18  7:32   ` Yegor Yefremov
2011-07-18  7:50     ` Albert ARIBAUD [this message]
2011-07-18  8:49       ` Yegor Yefremov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4E23E5CB.50406@aribaud.net \
    --to=albert.u.boot@aribaud.net \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox