diff mbox series

ARM: make ARCH_S3C24XX select USE_OF and clean-up boot/dts/Makefile

Message ID 1511749163-11057-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit ea04d6b456b2b7a7163680fd1bd19567203faf7a
Headers show
Series ARM: make ARCH_S3C24XX select USE_OF and clean-up boot/dts/Makefile | expand

Commit Message

Masahiro Yamada Nov. 27, 2017, 2:19 a.m. UTC 
ARCH_S3C24XX is a very exceptional platform that some DT files in
arch/arm/boot/dts/, but does not select USE_OF.

All the other platforms with DT files correctly select USE_OF
directly or indirectly (Most of them are either ARCH_MULTIPLATFORM
or ARM_SINGLE_ARMV7M).

With ARCH_S3C24XX fixed, "ifeq ($(CONFIG_OF),y)" in DT Makefile
can be deleted.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 arch/arm/Kconfig           | 1 +
 arch/arm/boot/dts/Makefile | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Arnd Bergmann Dec. 21, 2017, 3:11 p.m. UTC | #1 
On Mon, Nov 27, 2017 at 3:19 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> ARCH_S3C24XX is a very exceptional platform that some DT files in

> arch/arm/boot/dts/, but does not select USE_OF.

>

> All the other platforms with DT files correctly select USE_OF

> directly or indirectly (Most of them are either ARCH_MULTIPLATFORM

> or ARM_SINGLE_ARMV7M).

>

> With ARCH_S3C24XX fixed, "ifeq ($(CONFIG_OF),y)" in DT Makefile

> can be deleted.

>

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>


Applied to next/dt, thanks!

        Arnd
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Masahiro Yamada Dec. 24, 2017, 5:19 p.m. UTC | #2 
2017-12-22 21:41 GMT+09:00 Krzysztof Kozlowski <krzk@kernel.org>:
> On Mon, Nov 27, 2017 at 3:19 AM, Masahiro Yamada

> <yamada.masahiro@socionext.com> wrote:

>> ARCH_S3C24XX is a very exceptional platform that some DT files in

>> arch/arm/boot/dts/, but does not select USE_OF.

>

> Not entirely. The platform does select USE_OF - when MACH_S3C2416_DT

> is chosen. For other boards USE_OF is not necessary because they do

> not use DT. Why you need to select it for entire arch?

>

> Best regards,

> Krzysztof

>



The reason is simple - to avoid compile error.


If I simply drop ifeq ($(CONFIG_OF),y)
but do not select ARCH_S3C24XX,
s3c2410_defconfig failed to build.


$ make -s ARCH=arm mrproper
$ make -s ARCH=arm s3c2410_defconfig
$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf-  dtbs
    ...

  DTC     arch/arm/boot/dts/s3c2416-smdk2416.dtb
/bin/sh: 1: ./scripts/dtc/dtc: not found
scripts/Makefile.lib:310: recipe for target
'arch/arm/boot/dts/s3c2416-smdk2416.dtb' failed
make[1]: *** [arch/arm/boot/dts/s3c2416-smdk2416.dtb] Error 127
arch/arm/Makefile:349: recipe for target 'dtbs' failed
make: *** [dtbs] Error 2


Another solution would be to enable dtb by CONFIG_MACH_S3C2416_DT.


diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d0381e9..950b5dd 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -800,7 +798,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3288-veyron-pinky.dtb \
        rk3288-veyron-speedy.dtb \
        rk3288-vyasa.dtb
-dtb-$(CONFIG_ARCH_S3C24XX) += \
+dtb-$(CONFIG_MACH_S3C2416_DT) += \
        s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_S3C64XX) += \
        s3c6410-mini6410.dtb \



If you migrate S3C24XX platform to DT,
per-board CONFIG option will go away.

So, I think dtb-$(CONFIG_ARCH_S3C24XX) is OK.



>> All the other platforms with DT files correctly select USE_OF

>> directly or indirectly (Most of them are either ARCH_MULTIPLATFORM

>> or ARM_SINGLE_ARMV7M).

>>

>> With ARCH_S3C24XX fixed, "ifeq ($(CONFIG_OF),y)" in DT Makefile

>> can be deleted.

>>

>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

>> ---

>>

>>  arch/arm/Kconfig           | 1 +

>>  arch/arm/boot/dts/Makefile | 3 ---

>>  2 files changed, 1 insertion(+), 3 deletions(-)

>>

>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig

>> index 51c8df5..5604497 100644

>> --- a/arch/arm/Kconfig

>> +++ b/arch/arm/Kconfig

>> @@ -595,6 +595,7 @@ config ARCH_S3C24XX

>>         select MULTI_IRQ_HANDLER

>>         select NEED_MACH_IO_H

>>         select SAMSUNG_ATAGS

>> +       select USE_OF

>>         help

>>           Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443

>>           and S3C2450 SoCs based systems, such as the Simtec Electronics BAST

>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile

>> index d0381e9..6f7f25d 100644

>> --- a/arch/arm/boot/dts/Makefile

>> +++ b/arch/arm/boot/dts/Makefile

>> @@ -1,6 +1,4 @@

>>  # SPDX-License-Identifier: GPL-2.0

>> -ifeq ($(CONFIG_OF),y)

>> -

>>  dtb-$(CONFIG_ARCH_ALPINE) += \

>>         alpine-db.dtb

>>  dtb-$(CONFIG_MACH_ARTPEC6) += \

>> @@ -1104,4 +1102,3 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

>>  dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \

>>         aspeed-bmc-opp-romulus.dtb \

>>         aspeed-ast2500-evb.dtb

>> -endif

>> --

>> 2.7.4

>>

>> --

>> To unsubscribe from this list: send the line "unsubscribe devicetree" in

>> the body of a message to majordomo@vger.kernel.org

>> More majordomo info at  http://vger.kernel.org/majordomo-info.html




-- 
Best Regards
Masahiro Yamada
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski Dec. 25, 2017, 5:39 p.m. UTC | #3 
On Sun, Dec 24, 2017 at 6:19 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 2017-12-22 21:41 GMT+09:00 Krzysztof Kozlowski <krzk@kernel.org>:

>> On Mon, Nov 27, 2017 at 3:19 AM, Masahiro Yamada

>> <yamada.masahiro@socionext.com> wrote:

>>> ARCH_S3C24XX is a very exceptional platform that some DT files in

>>> arch/arm/boot/dts/, but does not select USE_OF.

>>

>> Not entirely. The platform does select USE_OF - when MACH_S3C2416_DT

>> is chosen. For other boards USE_OF is not necessary because they do

>> not use DT. Why you need to select it for entire arch?

>>

>> Best regards,

>> Krzysztof

>>

>

>

> The reason is simple - to avoid compile error.

>

>

> If I simply drop ifeq ($(CONFIG_OF),y)

> but do not select ARCH_S3C24XX,

> s3c2410_defconfig failed to build.

>

>

> $ make -s ARCH=arm mrproper

> $ make -s ARCH=arm s3c2410_defconfig

> $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf-  dtbs

>     ...

>

>   DTC     arch/arm/boot/dts/s3c2416-smdk2416.dtb

> /bin/sh: 1: ./scripts/dtc/dtc: not found

> scripts/Makefile.lib:310: recipe for target

> 'arch/arm/boot/dts/s3c2416-smdk2416.dtb' failed

> make[1]: *** [arch/arm/boot/dts/s3c2416-smdk2416.dtb] Error 127

> arch/arm/Makefile:349: recipe for target 'dtbs' failed

> make: *** [dtbs] Error 2

>

>

> Another solution would be to enable dtb by CONFIG_MACH_S3C2416_DT.

>

>

> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile

> index d0381e9..950b5dd 100644

> --- a/arch/arm/boot/dts/Makefile

> +++ b/arch/arm/boot/dts/Makefile

> @@ -800,7 +798,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \

>         rk3288-veyron-pinky.dtb \

>         rk3288-veyron-speedy.dtb \

>         rk3288-vyasa.dtb

> -dtb-$(CONFIG_ARCH_S3C24XX) += \

> +dtb-$(CONFIG_MACH_S3C2416_DT) += \

>         s3c2416-smdk2416.dtb

>  dtb-$(CONFIG_ARCH_S3C64XX) += \

>         s3c6410-mini6410.dtb \

>

>

>

> If you migrate S3C24XX platform to DT,

> per-board CONFIG option will go away.

>

> So, I think dtb-$(CONFIG_ARCH_S3C24XX) is OK.


I think this second solution - using CONFIG_MACH_S3C2416_DT - makes
more sense because:
1, S3C24xx will not be converted to DT. This is a legacy platform.
2. DT version supports only part of boards and peripherals so most of
existing platforms will use non-DT boardfiles. Enabling OF on all of
them is not useful for them.
3. The same error and solution probably applies to MACH_S3C64XX.

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Masahiro Yamada Dec. 27, 2017, 2 a.m. UTC | #4 
2017-12-26 2:39 GMT+09:00 Krzysztof Kozlowski <krzk@kernel.org>:
> On Sun, Dec 24, 2017 at 6:19 PM, Masahiro Yamada

> <yamada.masahiro@socionext.com> wrote:

>> 2017-12-22 21:41 GMT+09:00 Krzysztof Kozlowski <krzk@kernel.org>:

>>> On Mon, Nov 27, 2017 at 3:19 AM, Masahiro Yamada

>>> <yamada.masahiro@socionext.com> wrote:

>>>> ARCH_S3C24XX is a very exceptional platform that some DT files in

>>>> arch/arm/boot/dts/, but does not select USE_OF.

>>>

>>> Not entirely. The platform does select USE_OF - when MACH_S3C2416_DT

>>> is chosen. For other boards USE_OF is not necessary because they do

>>> not use DT. Why you need to select it for entire arch?

>>>

>>> Best regards,

>>> Krzysztof

>>>

>>

>>

>> The reason is simple - to avoid compile error.

>>

>>

>> If I simply drop ifeq ($(CONFIG_OF),y)

>> but do not select ARCH_S3C24XX,

>> s3c2410_defconfig failed to build.

>>

>>

>> $ make -s ARCH=arm mrproper

>> $ make -s ARCH=arm s3c2410_defconfig

>> $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf-  dtbs

>>     ...

>>

>>   DTC     arch/arm/boot/dts/s3c2416-smdk2416.dtb

>> /bin/sh: 1: ./scripts/dtc/dtc: not found

>> scripts/Makefile.lib:310: recipe for target

>> 'arch/arm/boot/dts/s3c2416-smdk2416.dtb' failed

>> make[1]: *** [arch/arm/boot/dts/s3c2416-smdk2416.dtb] Error 127

>> arch/arm/Makefile:349: recipe for target 'dtbs' failed

>> make: *** [dtbs] Error 2

>>

>>

>> Another solution would be to enable dtb by CONFIG_MACH_S3C2416_DT.

>>

>>

>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile

>> index d0381e9..950b5dd 100644

>> --- a/arch/arm/boot/dts/Makefile

>> +++ b/arch/arm/boot/dts/Makefile

>> @@ -800,7 +798,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \

>>         rk3288-veyron-pinky.dtb \

>>         rk3288-veyron-speedy.dtb \

>>         rk3288-vyasa.dtb

>> -dtb-$(CONFIG_ARCH_S3C24XX) += \

>> +dtb-$(CONFIG_MACH_S3C2416_DT) += \

>>         s3c2416-smdk2416.dtb

>>  dtb-$(CONFIG_ARCH_S3C64XX) += \

>>         s3c6410-mini6410.dtb \

>>

>>

>>

>> If you migrate S3C24XX platform to DT,

>> per-board CONFIG option will go away.

>>

>> So, I think dtb-$(CONFIG_ARCH_S3C24XX) is OK.

>

> I think this second solution - using CONFIG_MACH_S3C2416_DT - makes

> more sense because:

> 1, S3C24xx will not be converted to DT. This is a legacy platform.

> 2. DT version supports only part of boards and peripherals so most of

> existing platforms will use non-DT boardfiles. Enabling OF on all of

> them is not useful for them.


I do not care this much.
I leave this up to you (and ARM-SOC maintainers).


> 3. The same error and solution probably applies to MACH_S3C64XX.


Maybe no.

Looking at arch/arm/mach-s3c64xx/Kconfig,
ARCH_S3C64XX depends on ARCH_MULTI_V6.

Multiplatform selects USE_OF.




>

> Best regards,

> Krzysztof

> --

> To unsubscribe from this list: send the line "unsubscribe devicetree" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html




-- 
Best Regards
Masahiro Yamada
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox series

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 51c8df5..5604497 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -595,6 +595,7 @@  config ARCH_S3C24XX
 	select MULTI_IRQ_HANDLER
 	select NEED_MACH_IO_H
 	select SAMSUNG_ATAGS
+	select USE_OF
 	help
 	  Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
 	  and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d0381e9..6f7f25d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1,6 +1,4 @@ 
 # SPDX-License-Identifier: GPL-2.0
-ifeq ($(CONFIG_OF),y)
-
 dtb-$(CONFIG_ARCH_ALPINE) += \
 	alpine-db.dtb
 dtb-$(CONFIG_MACH_ARTPEC6) += \
@@ -1104,4 +1102,3 @@  dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
 dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
 	aspeed-bmc-opp-romulus.dtb \
 	aspeed-ast2500-evb.dtb
-endif