| Message ID | 1472057546-10360-33-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
2016-08-25 1:52 GMT+09:00 Simon Glass <sjg@chromium.org>: > Move this option to Kconfig and tidy up existing uses. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > configs/chromebook_jerry_defconfig | 1 + > configs/evb-rk3288_defconfig | 1 + > configs/fennec-rk3288_defconfig | 1 + > configs/firefly-rk3288_defconfig | 1 + > configs/miniarm-rk3288_defconfig | 1 + > configs/popmetal-rk3288_defconfig | 1 + > configs/rock2_defconfig | 1 + > include/configs/rk3288_common.h | 2 -- > 8 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig > index d7f9f47..7ca2009 100644 > --- a/configs/chromebook_jerry_defconfig > +++ b/configs/chromebook_jerry_defconfig > @@ -13,6 +13,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y > CONFIG_SPL_I2C_SUPPORT=y > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > +CONFIG_SPL_PINCTRL_SUPPORT=y > CONFIG_HUSH_PARSER=y > CONFIG_CMD_BOOTZ=y > # CONFIG_CMD_IMLS is not set Wait! I see only one define in rk3288_common.h, but I did not see any reference of it. $ git grep CONFIG_SPL_PINCTRL_SUPPORT include/configs/rk3288_common.h:#define CONFIG_SPL_PINCTRL_SUPPORT I was surprised at this because we already have the following in drivers/pinctrl/Kconfig: config SPL_PINCTRL bool "Support pin controlloers in SPL" depends on SPL && SPL_DM help This option is an SPL-variant of the PINCTRL option. See the help of PINCTRL for details. The right thing is to just remove the unreferenced CONFIG_SPL_PINCTRL_SUPPORT.
Hi Masahiro, On 24 August 2016 at 19:34, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > 2016-08-25 1:52 GMT+09:00 Simon Glass <sjg@chromium.org>: >> Move this option to Kconfig and tidy up existing uses. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> >> --- >> >> configs/chromebook_jerry_defconfig | 1 + >> configs/evb-rk3288_defconfig | 1 + >> configs/fennec-rk3288_defconfig | 1 + >> configs/firefly-rk3288_defconfig | 1 + >> configs/miniarm-rk3288_defconfig | 1 + >> configs/popmetal-rk3288_defconfig | 1 + >> configs/rock2_defconfig | 1 + >> include/configs/rk3288_common.h | 2 -- >> 8 files changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig >> index d7f9f47..7ca2009 100644 >> --- a/configs/chromebook_jerry_defconfig >> +++ b/configs/chromebook_jerry_defconfig >> @@ -13,6 +13,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y >> CONFIG_SPL_I2C_SUPPORT=y >> CONFIG_SPL_LIBCOMMON_SUPPORT=y >> CONFIG_SPL_LIBGENERIC_SUPPORT=y >> +CONFIG_SPL_PINCTRL_SUPPORT=y >> CONFIG_HUSH_PARSER=y >> CONFIG_CMD_BOOTZ=y >> # CONFIG_CMD_IMLS is not set > > > Wait! > > I see only one define in rk3288_common.h, > but I did not see any reference of it. > > $ git grep CONFIG_SPL_PINCTRL_SUPPORT > include/configs/rk3288_common.h:#define CONFIG_SPL_PINCTRL_SUPPORT > > > > > > I was surprised at this because we already have > the following in drivers/pinctrl/Kconfig: > > config SPL_PINCTRL > bool "Support pin controlloers in SPL" > depends on SPL && SPL_DM > help > This option is an SPL-variant of the PINCTRL option. > See the help of PINCTRL for details. > > > > > The right thing is to just remove > the unreferenced CONFIG_SPL_PINCTRL_SUPPORT. Yes indeed, will fix. This is one reason why I wanted to put every config change in a separate commit. Regards, Simon
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index d7f9f47..7ca2009 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 8e01973..3e64313 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index ea1a06c..5da0fff 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index bc0cbb2..afa16ac 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig index 0199e97..83700ff 100644 --- a/configs/miniarm-rk3288_defconfig +++ b/configs/miniarm-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 47a7464..7830ba3 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 8312cc8..d43ea41 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index a6f399b..39da5a0 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -65,8 +65,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_PINCTRL_SUPPORT - #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_NR_DRAM_BANKS 1 #define SDRAM_BANK_SIZE (2UL << 30)
Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/chromebook_jerry_defconfig | 1 + configs/evb-rk3288_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/miniarm-rk3288_defconfig | 1 + configs/popmetal-rk3288_defconfig | 1 + configs/rock2_defconfig | 1 + include/configs/rk3288_common.h | 2 -- 8 files changed, 7 insertions(+), 2 deletions(-)