From: Lukasz Majewski <l.majewski@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Date: Tue, 08 Apr 2014 10:34:09 +0200 [thread overview]
Message-ID: <20140408103409.14669e93@amdc2363> (raw)
In-Reply-To: <E1WXQmU-0003ZN-Pm@janus>
Hi Albert,
>
> include/configs/trats.h:
> - commits fe601647 (Piotr) and 9960d9a8 (Lukasz)
> - note: I manually removed CONFIG_EFI_PARTITION and
> CONFIG_PARTITION_UUIDS which are already defined in
> include/configs/exynos4-dt.h
>
I can confirm that Albert's solution provided at u-boot-denx-arm/merged
works at Samsung's Trats device.
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
next prev parent reply other threads:[~2014-04-08 8:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-08 7:49 [U-Boot] Merge conflicts between ARM and mainline U-Boot trees Albert ARIBAUD
2014-04-08 8:19 ` Marek Vasut
2014-04-08 8:34 ` Lukasz Majewski [this message]
2014-04-08 8:54 ` Piotr Wilczek
2014-04-08 9:01 ` Pantelis Antoniou
2014-04-08 11:03 ` Przemyslaw Marczak
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=20140408103409.14669e93@amdc2363 \
--to=l.majewski@samsung.com \
--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