From: Minkyu Kang <mk7.kang@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 0/15] samsung: Use common config files with Samsung boards
Date: Thu, 02 Oct 2014 10:59:10 +0900 [thread overview]
Message-ID: <542CB16E.5030906@samsung.com> (raw)
In-Reply-To: <CAPnjgZ1tjwsRPWGiVZdDm=1Jr9CmQAzqd_U25cZ9tywboWRCgA@mail.gmail.com>
Hi,
On 01/10/14 11:12, Simon Glass wrote:
> Hi Minkyu,
>
> On 30 September 2014 07:47, Minkyu Kang <mk7.kang@samsung.com> wrote:
>> Dear Simon Glass,
>>
>>>
>>
>> patch failed at latest u-boot-samsung tree.
>>
>> error: patch failed: include/configs/smdk5250.h:9
>> error: include/configs/smdk5250.h: patch does not apply
>> error: patch failed: include/configs/snow.h:9
>> error: include/configs/snow.h: patch does not apply
>> Patch failed at 0007 exynos: Rename -dt config files to -common
>>
>> Please check.
>
> The problem is the Kconfig patches which moved the CONFIG_OF options
> to Kconfig from the board config/*.h files.
>
> If I rebase on samsung you are going to get conflicts when merging to mainline.
>
> So would it be better to sync up to mainline first?
The main rule of samsung tree is to sync with arm tree.
I tried to merge after sync with arm tree, but it also failed.
So please wait until sync with mainline and arm tree.
Thanks,
Minkyu Kang.
next prev parent reply other threads:[~2014-10-02 1:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 1:18 [U-Boot] [PATCH v4 0/15] samsung: Use common config files with Samsung boards Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 01/15] Exynos: Use 900MHz ARM frequency in SPL for peach_pit Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 02/15] exynos5: Enable data cache Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 03/15] cros_ec: power: Add a tunnelled version of the tps65090 driver Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 04/15] cros_ec: exynos: Use the correct tps65090 driver in each case Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 05/15] dm: exynos: Split out the cros_ec drivers Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 06/15] exynos: dts: Add device tree node for cros_ec keyboard Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 07/15] exynos: Rename -dt config files to -common Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 08/15] exynos: Move common exynos settings into a common file Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 09/15] exynos: Move common smdk5420 things to " Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 10/15] exynos: config: Move cros_ec and tps65090 out of smdk boards Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 11/15] config: Move arndale to use common exynos5250 file Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 12/15] config: Move smdkv310 to use common exynos4 file Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 13/15] samsung: Enable device tree for s5p_goni Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 14/15] samsung: Enable device tree for smdkc100 Simon Glass
2014-09-29 1:18 ` [U-Boot] [PATCH v4 15/15] exynos: Enable pre-relocation malloc() Simon Glass
2014-09-30 13:47 ` [U-Boot] [PATCH v4 0/15] samsung: Use common config files with Samsung boards Minkyu Kang
2014-10-01 2:12 ` Simon Glass
2014-10-02 1:59 ` Minkyu Kang [this message]
2014-10-02 2:01 ` Simon Glass
-- strict thread matches above, loose matches on Subject: below --
2014-09-29 1:17 Simon Glass
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=542CB16E.5030906@samsung.com \
--to=mk7.kang@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