ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options
Subsystems (3)
PATCH 1/1 ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options
EXYNOS is now Device Tree (DT) only platform so it makes no sense to have config options responsible for enabling platform specific DT support.
Moreover the kernel image won't even link if neither CONFIG_MACH_EXYNOS4_DT nor CONFIG_MACH_EXYNOS5_DT config option is enabled (linker fails with "no machine record defined" error).
Remove CONFIG_MACH_EXYNOS[4,5]_DT config options and just use the standard CONFIG_ARCH_EXYNOS[4,5] ones instead.
--- arch/arm/configs/exynos_defconfig | 1 - arch/arm/mach-exynos/Kconfig | 38 +++++++++----------------------------- arch/arm/mach-exynos/Makefile | 4 ++-- 3 files changed, 11 insertions(+), 32 deletions(-)
arch/arm/configs/exynos_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=3 CONFIG_S3C24XX_PWM=y CONFIG_ARCH_EXYNOS5=y -CONFIG_MACH_EXYNOS4_DT=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y
arch/arm/mach-exynos/Kconfig +9 -29
@@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y + select ARM_AMBA + select CLKSRC_OF + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 + select CPU_EXYNOS4210 select GIC_NON_BANKED + select KEYBOARD_SAMSUNG if INPUT_KEYBOARD select HAVE_ARM_SCU if SMP select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select PINCTRL + select S5P_DEV_MFC help Samsung EXYNOS4 SoCs based systems config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" + select ARM_AMBA + select CLKSRC_OF select HAVE_ARM_SCU if SMP select HAVE_SMP select PINCTRL + select USB_ARCH_HAS_XHCI help Samsung EXYNOS5 (Cortex-A15) SoC based systems
@@ -110,35 +119,6 @@ config SOC_EXYNOS5440 help Enable EXYNOS5440 SoC support -comment "Flattened Device Tree based board for EXYNOS SoCs" - -config MACH_EXYNOS4_DT - bool "Samsung Exynos4 Machine using device tree" - default y - depends on ARCH_EXYNOS4 - select ARM_AMBA - select CLKSRC_OF - select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 - select CPU_EXYNOS4210 - select KEYBOARD_SAMSUNG if INPUT_KEYBOARD - select S5P_DEV_MFC - help - Machine support for Samsung Exynos4 machine with device tree enabled. - Select this if a fdt blob is available for the Exynos4 SoC based board. - Note: This is under development and not all peripherals can be supported - with this machine file. - -config MACH_EXYNOS5_DT - bool "SAMSUNG EXYNOS5 Machine using device tree" - default y - depends on ARCH_EXYNOS5 - select ARM_AMBA - select CLKSRC_OF - select USB_ARCH_HAS_XHCI - help - Machine support for Samsung EXYNOS5 machine with device tree enabled. - Select this if a fdt blob is available for the EXYNOS5 SoC based board. - endmenu endif
arch/arm/mach-exynos/Makefile +2 -2
@@ -32,5 +32,5 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) # machine support -obj-$(CONFIG_MACH_EXYNOS4_DT) += mach-exynos4-dt.o -obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o +obj-$(CONFIG_ARCH_EXYNOS4) += mach-exynos4-dt.o +obj-$(CONFIG_ARCH_EXYNOS5) += mach-exynos5-dt.o
Signature · 1 line
1.8.2.3
PATCH 1/1 ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4,5]_DT config options
Hi Bart,
Quoted 10 lines · On Friday 13 of September 2013 11:28:31 Bartlomiej Zolnierkiewicz wrote:
EXYNOS is now Device Tree (DT) only platform so it makes no sense to have config options responsible for enabling platform specific DT support.
Moreover the kernel image won't even link if neither
CONFIG_MACH_EXYNOS4_DTnorCONFIG_MACH_EXYNOS5_DTconfig option is enabled (linker fails with "no machine record defined" error).Remove CONFIG_MACH_EXYNOS[4,5]_DT config options and just use the standard CONFIG_ARCH_EXYNOS[4,5] ones instead.
Quoted 8 lines
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/configs/exynos_defconfig | 1 - arch/arm/mach-exynos/Kconfig | 38 +++++++++----------------------------- arch/arm/mach-exynos/Makefile | 4 ++-- 3 files changed, 11 insertions(+), 32 deletions(-)
Generally I see this as a nice cleanup, but I'd go even further than this. See below.
Quoted 17 lines
(quoted diff) +0
-0b/arch/arm/configs/exynos_defconfig index ad7dfbb..5181d0d 100644
arch/arm/configs/exynos_defconfig +0
-1@@ -11,7 +11,6 @@ CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=3 CONFIG_S3C24XX_PWM=y CONFIG_ARCH_EXYNOS5=y -CONFIG_MACH_EXYNOS4_DT=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=yarch/arm/mach-exynos/Kconfig +0
-0
arch/arm/mach-exynos/Kconfig menu "SAMSUNG EXYNOS SoCs Support" · line 20
Quoted 7 lines
arch/arm/mach-exynos/Kconfig +4
-0@@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y + select ARM_AMBA + select CLKSRC_OF + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 + select CPU_EXYNOS4210
The line above shows the brokenness of current layout of Exynos Kconfig options. You need to select some SoC in SAMSUNG EXYNOS4, because otherwise the build will fail if user doesn't select at least one of Exynos4 SoCs.
Instead, I would hide the ARCH_EXYNOS4 and ARCH_EXYNOS4 options and select them from entries of particular SoCs, i.e. ARCH_EXYNOS4 would be selected by CPU_EXYNOS4210, SOC_EXYNOS4212 and SOC_EXYNOS4412, ARCH_EXYNOS5 by SOC_EXYNOS5250 and SOC_EXYNOS5420 and so on.
Best regards,
Tomasz
PATCH 1/1 ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4,5]_DT config options
Hi Tomek,
Quoted 54 lines · Tomasz Figa
Hi Bart,
Quoted 10 lines · On Friday 13 of September 2013 11:28:31 Bartlomiej Zolnierkiewicz wrote:
EXYNOS is now Device Tree (DT) only platform so it makes no sense to have config options responsible for enabling platform specific DT support.
Moreover the kernel image won't even link if neither
CONFIG_MACH_EXYNOS4_DTnorCONFIG_MACH_EXYNOS5_DTconfig option is enabled (linker fails with "no machine record defined" error).Remove CONFIG_MACH_EXYNOS[4,5]_DT config options and just use the standard CONFIG_ARCH_EXYNOS[4,5] ones instead.
Quoted 8 lines
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/configs/exynos_defconfig | 1 - arch/arm/mach-exynos/Kconfig | 38 +++++++++----------------------------- arch/arm/mach-exynos/Makefile | 4 ++-- 3 files changed, 11 insertions(+), 32 deletions(-)Generally I see this as a nice cleanup, but I'd go even further than this. See below.
Quoted 17 lines
(quoted diff) +0
-0b/arch/arm/configs/exynos_defconfig index ad7dfbb..5181d0d 100644
arch/arm/configs/exynos_defconfig +0
-1@@ -11,7 +11,6 @@ CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=3 CONFIG_S3C24XX_PWM=y CONFIG_ARCH_EXYNOS5=y -CONFIG_MACH_EXYNOS4_DT=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=yarch/arm/mach-exynos/Kconfig +0
-0arch/arm/mach-exynos/Kconfig menu "SAMSUNG EXYNOS SoCs Support" · line 20
Quoted 7 lines
arch/arm/mach-exynos/Kconfig +4
-0@@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y + select ARM_AMBA + select CLKSRC_OF + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 + select CPU_EXYNOS4210The line above shows the brokenness of current layout of Exynos
Kconfigoptions. You need to select some SoC in SAMSUNG EXYNOS4, because otherwise the build will fail if user doesn't select at least one of Exynos4 SoCs.
Quoted 4 lines
Instead, I would hide the
ARCH_EXYNOS4andARCH_EXYNOS4options and select them from entries of particular SoCs, i.e.ARCH_EXYNOS4would be selected byCPU_EXYNOS4210,SOC_EXYNOS4212andSOC_EXYNOS4412,ARCH_EXYNOS5bySOC_EXYNOS5250andSOC_EXYNOS5420and so on.
This is a good idea but I think that it is better to address it later in an incremental patch (which I will also do unless someone beats me to it).
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
PATCH 1/1 ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4,5]_DT config options
Quoted 4 lines · On Monday 23 of September 2013 12:23:51 Bartlomiej Zolnierkiewicz wrote:
Hi Tomek,
Quoted 1 line · Tomasz Figa
Hi Bart,
[snip]
Quoted 10 lines
Quoted 10 lines
arch/arm/mach-exynos/Kconfig menu "SAMSUNG EXYNOS SoCs Support" · line 20
Quoted 4 lines
arch/arm/mach-exynos/Kconfig +4
-0+ select ARM_AMBA + select CLKSRC_OF + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 + select CPU_EXYNOS4210The line above shows the brokenness of current layout of Exynos
Kconfigoptions. You need to select some SoC in SAMSUNG EXYNOS4, because otherwise the build will fail if user doesn't select at least one of Exynos4 SoCs.
Quoted 8 lines
Quoted 4 lines
Instead, I would hide the
ARCH_EXYNOS4andARCH_EXYNOS4options and select them from entries of particular SoCs, i.e.ARCH_EXYNOS4would be selected byCPU_EXYNOS4210,SOC_EXYNOS4212andSOC_EXYNOS4412,ARCH_EXYNOS5bySOC_EXYNOS5250andSOC_EXYNOS5420and so on.This is a good idea but I think that it is better to address it later in an incremental patch (which I will also do unless someone beats me to it).
OK, sounds good. I take your word for it. ;)
Best regards,
Tomasz
PATCH 1/1 ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4,5]_DT config options
In reply to Bartlomiej ZolnierkiewiczQuoted 9 lines · Bartlomiej Zolnierkiewicz
EXYNOS is now Device Tree (DT) only platform so it makes no sense to have config options responsible for enabling platform specific DT support.
Moreover the kernel image won't even link if neither
CONFIG_MACH_EXYNOS4_DT
norCONFIG_MACH_EXYNOS5_DTconfig option is enabled (linker fails with "no machine record defined" error).
Quoted 8 lines
Remove CONFIG_MACH_EXYNOS[4,5]_DT config options and just use the standard CONFIG_ARCH_EXYNOS[4,5] ones instead.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/configs/exynos_defconfig | 1 - arch/arm/mach-exynos/Kconfig | 38
+++++++++--------------------------
Quoted 105 lines
--- arch/arm/mach-exynos/Makefile | 4 ++-- 3 files changed, 11 insertions(+), 32 deletions(-)arch/arm/configs/exynos_defconfig +0
-1@@ -11,7 +11,6 @@ CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=3 CONFIG_S3C24XX_PWM=y CONFIG_ARCH_EXYNOS5=y -CONFIG_MACH_EXYNOS4_DT=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=yarch/arm/mach-exynos/Kconfig +9
-14@@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y + select ARM_AMBA + select CLKSRC_OF + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 + select CPU_EXYNOS4210 select GIC_NON_BANKED + select KEYBOARD_SAMSUNG if INPUT_KEYBOARD select HAVE_ARM_SCU if SMP select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select PINCTRL + select S5P_DEV_MFC help Samsung EXYNOS4 SoCs based systems config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" + select ARM_AMBA + select CLKSRC_OF select HAVE_ARM_SCU if SMP select HAVE_SMP select PINCTRL + select USB_ARCH_HAS_XHCI help Samsung EXYNOS5 (Cortex-A15) SoC based systems@@ -110,35 +119,6 @@ config SOC_EXYNOS5440 help Enable EXYNOS5440 SoC support -comment "Flattened Device Tree based board for EXYNOS SoCs" - -config MACH_EXYNOS4_DT - bool "Samsung Exynos4 Machine using device tree" - default y - depends on ARCH_EXYNOS4 - select ARM_AMBA - select CLKSRC_OF - select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 - select CPU_EXYNOS4210 - select KEYBOARD_SAMSUNG if INPUT_KEYBOARD - select S5P_DEV_MFC - help - Machine support for Samsung Exynos4 machine with device treeenabled.
arch/arm/mach-exynos/Kconfig +0
-1- Select this if a fdt blob is available for the Exynos4 SoC basedboard.
arch/arm/mach-exynos/Kconfig +0
-1- Note: This is under development and not all peripherals can besupported
arch/arm/mach-exynos/Kconfig +0
-11- with this machine file. - -config MACH_EXYNOS5_DT - bool "SAMSUNG EXYNOS5 Machine using device tree" - default y - depends on ARCH_EXYNOS5 - select ARM_AMBA - select CLKSRC_OF - select USB_ARCH_HAS_XHCI - help - Machine support for Samsung EXYNOS5 machine with device treeenabled.
arch/arm/mach-exynos/Kconfig +0
-1- Select this if a fdt blob is available for the EXYNOS5 SoC basedboard.
arch/arm/mach-exynos/Kconfig +0
-1- endmenu endifarch/arm/mach-exynos/Makefile +2
-3@@ -32,5 +32,5 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7- a$(plus_sec) # machine support -obj-$(CONFIG_MACH_EXYNOS4_DT) += mach-exynos4-dt.o -obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o +obj-$(CONFIG_ARCH_EXYNOS4) += mach-exynos4-dt.o +obj-$(CONFIG_ARCH_EXYNOS5) += mach-exynos5-dt.o --
Quoted 1 line
1.8.2.3
OK, this cleanup looks good to me but updating defconfig is not required in this patch because it should be updated separately according to updating other stuff...
Will apply except updating defconfig.
Thanks,
Kukjin