[U-Boot] [PATCH v5 0/15] samsung: Use common config files with Samsung boards

[Simon Glass]

Hi Minkyu,

On 7 October 2014 19:09, Minkyu Kang <mk7.kang at samsung.com> wrote:
> On 08/10/14 00:14, Simon Glass wrote:
>> Hi Minkyu,
>>
>> On 7 October 2014 05:24, Minkyu Kang <mk7.kang at samsung.com> wrote:
>>> Dear Simon Glass,
>>>
>>> On 06/10/14 03:39, Simon Glass wrote:
>>>> Hi Minkyu,
>>>>
>>>> On 1 October 2014 21:44, Simon Glass <sjg at chromium.org> wrote:
>>>>> Hi Minkyu,
>>>>>
>>>>> On 1 October 2014 21:43, Simon Glass <sjg at chromium.org> wrote:
>>>>>> This series tries to unify the Samsung board configs into a few header
>>>>>> files for exynos5 and exynos4.
>>>>>>
>>>>>> The purpose is to make it easier to move to driver model. In that case
>>>>>> I would like things like the GPIO drivers and serial drivers to work in
>>>>>> a standard way, and not need to support device tree and platform data at
>>>>>> the same time. That would be quite painful.
>>>>>>
>>>>>> Another reason is that the Chrome OS EC drivers are currently included in
>>>>>> boards that don't have a Chrome OS EC. This concern was raised by the
>>>>>> Samsung maintainer (Minkyu) a while back.
>>>>>>
>>>>>> There are still a few boards that don't use CONFIG_OF_CONTROL so I have
>>>>>> updated these rudimentary of device tree files based on feedback.
>>>>>>
>>>>>> This series has the side-effect of getting the EC interface working
>>>>>> properly on Pit, so the keyboard works. It also provides access to the
>>>>>> TPS65090 PMIC, which means that the backlight is enabled.
>>>>>>
>>>>>> Changes in v5:
>>>>>> - Rebase on top of samsung/master
>>>>>
>>>>> Please check this and see if it works for what you need.
>>>>>
>>>>> I suppose the merge will be Albert's problem, but I will do a patch
>>>>> once I know the detla.
>>>>
>>>> Actually I see that Albert has pulled this in. So v4 should work for
>>>> you now. I just tried applying it on u-boot-arm/master and it worked
>>>> OK.
>>>>
>>>> Regards,
>>>> Simon
>>>>
>>>
>>> Hm, I tried to apply. but failed..
>>>
>>> Applying: Exynos: Use 900MHz ARM frequency in SPL for peach_pit
>>> Applying: exynos5: Enable data cache
>>> Applying: cros_ec: power: Add a tunnelled version of the tps65090 driver
>>> Applying: cros_ec: exynos: Use the correct tps65090 driver in each case
>>> Applying: dm: exynos: Split out the cros_ec drivers
>>> Applying: exynos: dts: Add device tree node for cros_ec keyboard
>>> Applying: exynos: Rename -dt config files to -common
>>> Applying: exynos: Move common exynos settings into a common file
>>> Applying: exynos: Move common smdk5420 things to common file
>>> Applying: exynos: config: Move cros_ec and tps65090 out of smdk boards
>>> Applying: config: Move arndale to use common exynos5250 file
>>> Applying: config: Move smdkv310 to use common exynos4 file
>>> Applying: samsung: Enable device tree for s5p_goni
>>> error: patch failed: arch/arm/Kconfig:547
>>> error: arch/arm/Kconfig: patch does not apply
>>> Patch failed at 0013 samsung: Enable device tree for s5p_goni
>>>
>>
>> It looks like you still haven't synced up with the ARM tree?
>>
>> In particular there are these patches there that are needed:
>>
>> f1ef2b6 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
>> 783e6a7 kconfig: move CONFIG_OF_* to Kconfig
>>
>> I put a bundle here:
>>
>> http://patchwork.ozlabs.org/bundle/sjg/pitv4/
>>
>> This should apply OK once you sync up with arm again. If you still
>> have problems then, please let me know.
>>
>
> No. I've sync with arm tree but it failed.
> and I tried to apply on arm tree directly, it also failed.
> Please test it.

Having a bit of a guess at what you are doing, since samsung/master
still is not synced with arm/master.

I tried this:

git checkout -b try-samsung samsung/master
git pull upstream-arm master

and then applied the patches on top of this without errors. Maybe git
is automatically fixing them up?

I'll send a v6 second with the resulting patches, If that doesn't
work, can I ask you please to push your branch to samsung/master so I
can be sure of what your base is?

Regards,
Simon