[U-Boot] rockchip: fix rk3036 SPL build
diff mbox

Message ID 1469050916-5263-1-git-send-email-heiko@sntech.de
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Heiko Stuebner July 20, 2016, 9:41 p.m. UTC
Commit c7db6abf534d ("ARM64: rockchip: add support for rk3399 SoC based evb")
moved the SPL Kconfig selects into the individual soc-specific options.
But it only did it for the rk3288 and not for the rk3036 thus disabling
SPL builds for it. Add the necessary options for the rk3036 as well.

Fixes: c7db6abf534d ("ARM64: rockchip: add support for rk3399 SoC based evb")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/mach-rockchip/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

Comments

Kever Yang July 21, 2016, 1:47 a.m. UTC | #1
Hi Heiko,

     Simon apply my V4 patch which still have some problem, he said that 
he will rebase
with a new patch set either if I send a new version or send fixes, but 
he won't be available till next week.

     I have send out my V5 patch which including the code of this patch.

Thanks,
- Kever
On 07/21/2016 05:41 AM, Heiko Stuebner wrote:
> Commit c7db6abf534d ("ARM64: rockchip: add support for rk3399 SoC based evb")
> moved the SPL Kconfig selects into the individual soc-specific options.
> But it only did it for the rk3288 and not for the rk3036 thus disabling
> SPL builds for it. Add the necessary options for the rk3036 as well.
>
> Fixes: c7db6abf534d ("ARM64: rockchip: add support for rk3399 SoC based evb")
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>   arch/arm/mach-rockchip/Kconfig | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 2817c0f..c47e16c 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -8,6 +8,8 @@ config ROCKCHIP_RK3036
>   	  including NEON and GPU, Mali-400 graphics, several DDR3 options
>   	  and video codec support. Peripherals include Gigabit Ethernet,
>   	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
> +	select SUPPORT_SPL
> +	select SPL
>   
>   config ROCKCHIP_RK3188
>   	bool "Support Rockchip RK3188"
Simon Glass July 23, 2016, 2:31 a.m. UTC | #2
Hi Heiko,

On 20 July 2016 at 19:47, Kever Yang <kever.yang@rock-chips.com> wrote:
> Hi Heiko,
>
>     Simon apply my V4 patch which still have some problem, he said that he
> will rebase
> with a new patch set either if I send a new version or send fixes, but he
> won't be available till next week.
>
>     I have send out my V5 patch which including the code of this patch.
>

Please can you check u-boot-rockchip and see if this looks OK now?

Regards,
Simon


> Thanks,
> - Kever
>
> On 07/21/2016 05:41 AM, Heiko Stuebner wrote:
>>
>> Commit c7db6abf534d ("ARM64: rockchip: add support for rk3399 SoC based
>> evb")
>> moved the SPL Kconfig selects into the individual soc-specific options.
>> But it only did it for the rk3288 and not for the rk3036 thus disabling
>> SPL builds for it. Add the necessary options for the rk3036 as well.
>>
>> Fixes: c7db6abf534d ("ARM64: rockchip: add support for rk3399 SoC based
>> evb")
>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
>> ---
>>   arch/arm/mach-rockchip/Kconfig | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/arm/mach-rockchip/Kconfig
>> b/arch/arm/mach-rockchip/Kconfig
>> index 2817c0f..c47e16c 100644
>> --- a/arch/arm/mach-rockchip/Kconfig
>> +++ b/arch/arm/mach-rockchip/Kconfig
>> @@ -8,6 +8,8 @@ config ROCKCHIP_RK3036
>>           including NEON and GPU, Mali-400 graphics, several DDR3 options
>>           and video codec support. Peripherals include Gigabit Ethernet,
>>           USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
>> +       select SUPPORT_SPL
>> +       select SPL
>>     config ROCKCHIP_RK3188
>>         bool "Support Rockchip RK3188"
>
>
>
Heiko Stuebner July 23, 2016, 1:07 p.m. UTC | #3
Hi Simon,

Am Freitag, 22. Juli 2016, 20:31:36 schrieb Simon Glass:
> On 20 July 2016 at 19:47, Kever Yang <kever.yang@rock-chips.com> wrote:
> >     Simon apply my V4 patch which still have some problem, he said that he
> > 
> > will rebase
> > with a new patch set either if I send a new version or send fixes, but he
> > won't be available till next week.
> > 
> >     I have send out my V5 patch which including the code of this patch.
> 
> Please can you check u-boot-rockchip and see if this looks OK now?

yep, I've rebased on top of your master branch from just now, and everything 
still builds and runs just fine (rk3036, rk3188 and rk3288).

Heiko

Patch
diff mbox

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 2817c0f..c47e16c 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -8,6 +8,8 @@  config ROCKCHIP_RK3036
 	  including NEON and GPU, Mali-400 graphics, several DDR3 options
 	  and video codec support. Peripherals include Gigabit Ethernet,
 	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
+	select SUPPORT_SPL
+	select SPL
 
 config ROCKCHIP_RK3188
 	bool "Support Rockchip RK3188"