| Message ID | 20170302174357.6246-1-pbrobinson@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 02, 2017 at 05:43:57PM +0000, Peter Robinson wrote: > Tighten the depends on the various AllWinn SoCs so we don't > inadvertantly get clock drivers when we're not wanting them > like 32 bit SoC clocks for 64 bit configs. Ensure there's > still test coverage though. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Applied, thanks! Maxime
On Fri, Mar 3, 2017 at 3:12 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Thu, Mar 02, 2017 at 05:43:57PM +0000, Peter Robinson wrote: >> Tighten the depends on the various AllWinn SoCs so we don't >> inadvertantly get clock drivers when we're not wanting them >> like 32 bit SoC clocks for 64 bit configs. Ensure there's >> still test coverage though. >> >> Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > > Applied, thanks! > Maxime Just built your for-next branch: $ make -j8 zImage dtbs modules scripts/kconfig/conf --silentoldconfig Kconfig drivers/clk/sunxi-ng/Kconfig:67: syntax error drivers/clk/sunxi-ng/Kconfig:66: invalid option drivers/clk/sunxi-ng/Kconfig:79: syntax error drivers/clk/sunxi-ng/Kconfig:78: invalid option drivers/clk/sunxi-ng/Kconfig:91: syntax error drivers/clk/sunxi-ng/Kconfig:90: invalid option drivers/clk/sunxi-ng/Kconfig:104: syntax error drivers/clk/sunxi-ng/Kconfig:103: invalid option drivers/clk/sunxi-ng/Kconfig:117: syntax error drivers/clk/sunxi-ng/Kconfig:116: invalid option drivers/clk/sunxi-ng/Kconfig:129: syntax error drivers/clk/sunxi-ng/Kconfig:128: invalid option drivers/clk/sunxi-ng/Kconfig:141: syntax error drivers/clk/sunxi-ng/Kconfig:140: invalid option drivers/clk/sunxi-ng/Kconfig:152: syntax error drivers/clk/sunxi-ng/Kconfig:151: invalid option scripts/kconfig/Makefile:37: recipe for target 'silentoldconfig' failed make[2]: *** [silentoldconfig] Error 1 Makefile:548: recipe for target 'silentoldconfig' failed make[1]: *** [silentoldconfig] Error 2 make: *** No rule to make target 'include/config/auto.conf', needed by 'include/config/kernel.release'. Stop. make: *** Waiting for unfinished jobs.... This patch is the culprit. The proper syntax is "depends on", not "depends". Regards ChenYu
Hi, On Thu, Mar 02, 2017 at 05:43:57PM +0000, Peter Robinson wrote: > Tighten the depends on the various AllWinn SoCs so we don't > inadvertantly get clock drivers when we're not wanting them > like 32 bit SoC clocks for 64 bit configs. Ensure there's > still test coverage though. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> It turns out that this was making Kconfig crash, because the keyword is depends on and not depends. I fixed it, but please make sure the syntax is correct next time. Maxime
diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 695bbf9..8ab378e 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -63,6 +63,7 @@ config SUN50I_A64_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default ARM64 && ARCH_SUNXI + depends (ARM64 && ARCH_SUNXI) || COMPILE_TEST config SUN5I_CCU bool "Support for the Allwinner sun5i family CCM" @@ -74,6 +75,7 @@ config SUN5I_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN5I + depends MACH_SUN5I || COMPILE_TEST config SUN6I_A31_CCU bool "Support for the Allwinner A31/A31s CCU" @@ -84,6 +86,7 @@ config SUN6I_A31_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN6I + depends MACH_SUN6I || COMPILE_TEST config SUN8I_A23_CCU bool "Support for the Allwinner A23 CCU" @@ -96,6 +99,7 @@ config SUN8I_A23_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN8I + depends MACH_SUN8I || COMPILE_TEST config SUN8I_A33_CCU bool "Support for the Allwinner A33 CCU" @@ -108,6 +112,7 @@ config SUN8I_A33_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN8I + depends MACH_SUN8I || COMPILE_TEST config SUN8I_H3_CCU bool "Support for the Allwinner H3 CCU" @@ -119,6 +124,7 @@ config SUN8I_H3_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN8I + depends MACH_SUN8I || COMPILE_TEST config SUN8I_V3S_CCU bool "Support for the Allwinner V3s CCU" @@ -130,6 +136,7 @@ config SUN8I_V3S_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN8I + depends MACH_SUN8I || COMPILE_TEST config SUN9I_A80_CCU bool "Support for the Allwinner A80 CCU" @@ -140,5 +147,6 @@ config SUN9I_A80_CCU select SUNXI_CCU_MP select SUNXI_CCU_PHASE default MACH_SUN9I + depends MACH_SUN9I || COMPILE_TEST endif
Tighten the depends on the various AllWinn SoCs so we don't inadvertantly get clock drivers when we're not wanting them like 32 bit SoC clocks for 64 bit configs. Ensure there's still test coverage though. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- drivers/clk/sunxi-ng/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+)