diff mbox

[U-Boot,1/5] mmc: sh_sdhi: Fix Kconfig entry

Message ID 20170513135118.8134-1-marek.vasut+renesas@gmail.com
State Accepted
Commit 0f53118511c540a136f63cfc003ef6bd0df2404d
Delegated to: Jaehoon Chung
Headers show

Commit Message

Marek Vasut May 13, 2017, 1:51 p.m. UTC
The Kconfig entry depends on RMOBILE, but this was renamed
to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nobuhiro Iwamatsu May 13, 2017, 9:44 p.m. UTC | #1
Hi!

2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> The Kconfig entry depends on RMOBILE, but this was renamed
> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>

Reviewed-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

> ---
>  drivers/mmc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 6ac26dd137..b2d70a37bd 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>
>  config SH_SDHI
>         bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
> -       depends on RMOBILE
> +       depends on ARCH_RMOBILE
>         help
>           Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
>
> --
> 2.11.0
>
Jaehoon Chung May 25, 2017, 1:39 p.m. UTC | #2
On 05/13/2017 10:51 PM, Marek Vasut wrote:
> The Kconfig entry depends on RMOBILE, but this was renamed
> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
> 
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

> ---
>  drivers/mmc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 6ac26dd137..b2d70a37bd 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>  
>  config SH_SDHI
>  	bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
> -	depends on RMOBILE
> +	depends on ARCH_RMOBILE
>  	help
>  	  Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
>  
>
Nobuhiro Iwamatsu May 30, 2017, 10:59 p.m. UTC | #3
Hi, Jaehoon.

Could you pickup this patch series to your mmc repository, and PR to u-boot?

Best regards,
  Nobuhiro


2017-05-25 22:39 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
> On 05/13/2017 10:51 PM, Marek Vasut wrote:
>> The Kconfig entry depends on RMOBILE, but this was renamed
>> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
>> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>>
>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
>> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
>> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> Cc: Jaehoon Chung <jh80.chung@samsung.com>
>
> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
>
>> ---
>>  drivers/mmc/Kconfig | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
>> index 6ac26dd137..b2d70a37bd 100644
>> --- a/drivers/mmc/Kconfig
>> +++ b/drivers/mmc/Kconfig
>> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>>
>>  config SH_SDHI
>>       bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
>> -     depends on RMOBILE
>> +     depends on ARCH_RMOBILE
>>       help
>>         Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
>>
>>
>
Jaehoon Chung May 31, 2017, 2:06 a.m. UTC | #4
On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
> Hi, Jaehoon.
> 
> Could you pickup this patch series to your mmc repository, and PR to u-boot?

Sure, I will pick this patch series. After that, i will do PR..
But i have sent the PR about a few days ago..but it doesn't accept yet..
After accepting it, i will resend PR.

Thanks!

Best Regards,
Jaehoon Chung

> 
> Best regards,
>   Nobuhiro
> 
> 
> 2017-05-25 22:39 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>> On 05/13/2017 10:51 PM, Marek Vasut wrote:
>>> The Kconfig entry depends on RMOBILE, but this was renamed
>>> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
>>> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>>>
>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
>>> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
>>> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>>> Cc: Jaehoon Chung <jh80.chung@samsung.com>
>>
>> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
>>
>>> ---
>>>  drivers/mmc/Kconfig | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
>>> index 6ac26dd137..b2d70a37bd 100644
>>> --- a/drivers/mmc/Kconfig
>>> +++ b/drivers/mmc/Kconfig
>>> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>>>
>>>  config SH_SDHI
>>>       bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
>>> -     depends on RMOBILE
>>> +     depends on ARCH_RMOBILE
>>>       help
>>>         Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
>>>
>>>
>>
> 
> 
>
Nobuhiro Iwamatsu May 31, 2017, 5:07 a.m. UTC | #5
Hi!

2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>> Hi, Jaehoon.
>>
>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>
> Sure, I will pick this patch series. After that, i will do PR..
> But i have sent the PR about a few days ago..but it doesn't accept yet..
> After accepting it, i will resend PR.

I see. Thanks for your great work!

>
> Thanks!
>
> Best Regards,
> Jaehoon Chung

Best regards,
  Nobuhiro

>
>>
>> Best regards,
>>   Nobuhiro
>>
>>
>> 2017-05-25 22:39 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>>> On 05/13/2017 10:51 PM, Marek Vasut wrote:
>>>> The Kconfig entry depends on RMOBILE, but this was renamed
>>>> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
>>>> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>>>>
>>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
>>>> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
>>>> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>>>> Cc: Jaehoon Chung <jh80.chung@samsung.com>
>>>
>>> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
>>>
>>>> ---
>>>>  drivers/mmc/Kconfig | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
>>>> index 6ac26dd137..b2d70a37bd 100644
>>>> --- a/drivers/mmc/Kconfig
>>>> +++ b/drivers/mmc/Kconfig
>>>> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>>>>
>>>>  config SH_SDHI
>>>>       bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
>>>> -     depends on RMOBILE
>>>> +     depends on ARCH_RMOBILE
>>>>       help
>>>>         Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
>>>>
>>>>
>>>
>>
>>
>>
>
Marek Vasut June 5, 2017, 11:57 a.m. UTC | #6
On 05/31/2017 07:07 AM, Nobuhiro Iwamatsu wrote:
> Hi!
> 
> 2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>>> Hi, Jaehoon.
>>>
>>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>>
>> Sure, I will pick this patch series. After that, i will do PR..
>> But i have sent the PR about a few days ago..but it doesn't accept yet..
>> After accepting it, i will resend PR.
> 
> I see. Thanks for your great work!

Hi, any news ? RC1 is out and I don't see this in RC1 .
Jaehoon Chung June 5, 2017, 1:11 p.m. UTC | #7
Hi,

On 2017년 06월 05일 20:57, Marek Vasut wrote:
> On 05/31/2017 07:07 AM, Nobuhiro Iwamatsu wrote:
>> Hi!
>>
>> 2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>>> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>>>> Hi, Jaehoon.
>>>>
>>>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>>>
>>> Sure, I will pick this patch series. After that, i will do PR..
>>> But i have sent the PR about a few days ago..but it doesn't accept yet..
>>> After accepting it, i will resend PR.
>>
>> I see. Thanks for your great work!
> 
> Hi, any news ? RC1 is out and I don't see this in RC1 .

When i had tested the buildman, there are build error with [PATCH 3/5]


  aarch64:  +   r8a7795_salvator-x
+board/renesas/salvator-x/salvator-x.c: In function 'board_mmc_init':
+board/renesas/salvator-x/salvator-x.c:196:7: error: 'SH_SDHI_QUIRK_64BIT_BUF' undeclared (first use in this function)
+       SH_SDHI_QUIRK_64BIT_BUF);
+       ^~~~~~~~~~~~~~~~~~~~~~~
+board/renesas/salvator-x/salvator-x.c:196:7: note: each undeclared identifier is reported only once for each function it appears in
+make[2]: *** [board/renesas/salvator-x/salvator-x.o] Error 1
+make[1]: *** [board/renesas/salvator-x] Error 2
+make[1]: *** wait: No child processes.  Stop.
+make: *** [sub-make] Error 2

So i had sent the email about fixing it..i didn't check with latest u-boot.
but at that time, i could not apply it with building error.

Best Regards,
Jaehoon Chung

>
Marek Vasut June 5, 2017, 1:32 p.m. UTC | #8
On 06/05/2017 03:11 PM, Jaehoon Chung wrote:
> Hi,

Hi,

> On 2017년 06월 05일 20:57, Marek Vasut wrote:
>> On 05/31/2017 07:07 AM, Nobuhiro Iwamatsu wrote:
>>> Hi!
>>>
>>> 2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>>>> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>>>>> Hi, Jaehoon.
>>>>>
>>>>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>>>>
>>>> Sure, I will pick this patch series. After that, i will do PR..
>>>> But i have sent the PR about a few days ago..but it doesn't accept yet..
>>>> After accepting it, i will resend PR.
>>>
>>> I see. Thanks for your great work!
>>
>> Hi, any news ? RC1 is out and I don't see this in RC1 .
> 
> When i had tested the buildman, there are build error with [PATCH 3/5]
> 
> 
>   aarch64:  +   r8a7795_salvator-x
> +board/renesas/salvator-x/salvator-x.c: In function 'board_mmc_init':
> +board/renesas/salvator-x/salvator-x.c:196:7: error: 'SH_SDHI_QUIRK_64BIT_BUF' undeclared (first use in this function)
> +       SH_SDHI_QUIRK_64BIT_BUF);
> +       ^~~~~~~~~~~~~~~~~~~~~~~
> +board/renesas/salvator-x/salvator-x.c:196:7: note: each undeclared identifier is reported only once for each function it appears in
> +make[2]: *** [board/renesas/salvator-x/salvator-x.o] Error 1
> +make[1]: *** [board/renesas/salvator-x] Error 2
> +make[1]: *** wait: No child processes.  Stop.
> +make: *** [sub-make] Error 2
> 
> So i had sent the email about fixing it.

I didn't receive that email.

> i didn't check with latest u-boot.
> but at that time, i could not apply it with building error.

Builds fine for me after applying all the patches on u-boot/master ,
commit dd31be21bf .

I guess what you see is that if you apply only 1/5 , the build will
choke on issue which is already present. The fix is simple really,
apply the patches in the order 2,3,4,5,1 and you won't trigger the
issue and your build will pass. In fact, patch 3 adds the missing macro
and thus fixes the issue which patch 1 triggers. I don't think this
requires me to resubmit the patches with no changes in them. Then you
can send PR.
Jaehoon Chung June 7, 2017, 3:29 a.m. UTC | #9
Hi Marek,

On 06/05/2017 10:32 PM, Marek Vasut wrote:
> On 06/05/2017 03:11 PM, Jaehoon Chung wrote:
>> Hi,
> 
> Hi,
> 
>> On 2017년 06월 05일 20:57, Marek Vasut wrote:
>>> On 05/31/2017 07:07 AM, Nobuhiro Iwamatsu wrote:
>>>> Hi!
>>>>
>>>> 2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>>>>> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>>>>>> Hi, Jaehoon.
>>>>>>
>>>>>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>>>>>
>>>>> Sure, I will pick this patch series. After that, i will do PR..
>>>>> But i have sent the PR about a few days ago..but it doesn't accept yet..
>>>>> After accepting it, i will resend PR.
>>>>
>>>> I see. Thanks for your great work!
>>>
>>> Hi, any news ? RC1 is out and I don't see this in RC1 .
>>
>> When i had tested the buildman, there are build error with [PATCH 3/5]
>>
>>
>>   aarch64:  +   r8a7795_salvator-x
>> +board/renesas/salvator-x/salvator-x.c: In function 'board_mmc_init':
>> +board/renesas/salvator-x/salvator-x.c:196:7: error: 'SH_SDHI_QUIRK_64BIT_BUF' undeclared (first use in this function)
>> +       SH_SDHI_QUIRK_64BIT_BUF);
>> +       ^~~~~~~~~~~~~~~~~~~~~~~
>> +board/renesas/salvator-x/salvator-x.c:196:7: note: each undeclared identifier is reported only once for each function it appears in
>> +make[2]: *** [board/renesas/salvator-x/salvator-x.o] Error 1
>> +make[1]: *** [board/renesas/salvator-x] Error 2
>> +make[1]: *** wait: No child processes.  Stop.
>> +make: *** [sub-make] Error 2
>>
>> So i had sent the email about fixing it.
> 
> I didn't receive that email.
> 
>> i didn't check with latest u-boot.
>> but at that time, i could not apply it with building error.
> 
> Builds fine for me after applying all the patches on u-boot/master ,
> commit dd31be21bf .
> 
> I guess what you see is that if you apply only 1/5 , the build will
> choke on issue which is already present. The fix is simple really,
> apply the patches in the order 2,3,4,5,1 and you won't trigger the
> issue and your build will pass. In fact, patch 3 adds the missing macro
> and thus fixes the issue which patch 1 triggers. I don't think this
> requires me to resubmit the patches with no changes in them. Then you
> can send PR.

Applied to u-boot-mmc after ordering 2,3,4,5,1.
Will send PR. At that time, i will add you.

Best Regards,
Jaehoon Chung

>
Marek Vasut June 7, 2017, 6:45 a.m. UTC | #10
On 06/07/2017 05:29 AM, Jaehoon Chung wrote:
> Hi Marek,
> 
> On 06/05/2017 10:32 PM, Marek Vasut wrote:
>> On 06/05/2017 03:11 PM, Jaehoon Chung wrote:
>>> Hi,
>>
>> Hi,
>>
>>> On 2017년 06월 05일 20:57, Marek Vasut wrote:
>>>> On 05/31/2017 07:07 AM, Nobuhiro Iwamatsu wrote:
>>>>> Hi!
>>>>>
>>>>> 2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.chung@samsung.com>:
>>>>>> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>>>>>>> Hi, Jaehoon.
>>>>>>>
>>>>>>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>>>>>>
>>>>>> Sure, I will pick this patch series. After that, i will do PR..
>>>>>> But i have sent the PR about a few days ago..but it doesn't accept yet..
>>>>>> After accepting it, i will resend PR.
>>>>>
>>>>> I see. Thanks for your great work!
>>>>
>>>> Hi, any news ? RC1 is out and I don't see this in RC1 .
>>>
>>> When i had tested the buildman, there are build error with [PATCH 3/5]
>>>
>>>
>>>   aarch64:  +   r8a7795_salvator-x
>>> +board/renesas/salvator-x/salvator-x.c: In function 'board_mmc_init':
>>> +board/renesas/salvator-x/salvator-x.c:196:7: error: 'SH_SDHI_QUIRK_64BIT_BUF' undeclared (first use in this function)
>>> +       SH_SDHI_QUIRK_64BIT_BUF);
>>> +       ^~~~~~~~~~~~~~~~~~~~~~~
>>> +board/renesas/salvator-x/salvator-x.c:196:7: note: each undeclared identifier is reported only once for each function it appears in
>>> +make[2]: *** [board/renesas/salvator-x/salvator-x.o] Error 1
>>> +make[1]: *** [board/renesas/salvator-x] Error 2
>>> +make[1]: *** wait: No child processes.  Stop.
>>> +make: *** [sub-make] Error 2
>>>
>>> So i had sent the email about fixing it.
>>
>> I didn't receive that email.
>>
>>> i didn't check with latest u-boot.
>>> but at that time, i could not apply it with building error.
>>
>> Builds fine for me after applying all the patches on u-boot/master ,
>> commit dd31be21bf .
>>
>> I guess what you see is that if you apply only 1/5 , the build will
>> choke on issue which is already present. The fix is simple really,
>> apply the patches in the order 2,3,4,5,1 and you won't trigger the
>> issue and your build will pass. In fact, patch 3 adds the missing macro
>> and thus fixes the issue which patch 1 triggers. I don't think this
>> requires me to resubmit the patches with no changes in them. Then you
>> can send PR.
> 
> Applied to u-boot-mmc after ordering 2,3,4,5,1.
> Will send PR. At that time, i will add you.

Excellent, thanks.
diff mbox

Patch

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 6ac26dd137..b2d70a37bd 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -159,7 +159,7 @@  config MMC_OMAP36XX_PINS
 
 config SH_SDHI
 	bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
-	depends on RMOBILE
+	depends on ARCH_RMOBILE
 	help
 	  Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform