| Message ID | 20220713123307.21314-3-post@lespocky.de |
|---|---|
| State | Superseded |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | fpga: Convert some options to Kconfig | expand |
On 7/13/22 14:33, Alexander Dahl wrote: > From: Alexander Dahl <ada@thorsis.com> WARNING: please write a paragraph that describes the config symbol fully We don't allow patches with empty commit message. > > Signed-off-by: Alexander Dahl <ada@thorsis.com> > --- > README | 4 ---- > configs/astro_mcf5373l_defconfig | 1 + > drivers/fpga/Kconfig | 6 ++++++ > include/configs/astro_mcf5373l.h | 1 - > scripts/config_whitelist.txt | 1 - Tom can confirm this but IIRC you don't need to remove this from this file. Tom is doing sync up time to time. It is enough to do conversion only. M
Hei hei, On Wed, Jul 13, 2022 at 02:50:14PM +0200, Michal Simek wrote: > > > On 7/13/22 14:33, Alexander Dahl wrote: > > From: Alexander Dahl <ada@thorsis.com> > > > WARNING: please write a paragraph that describes the config symbol fully > > We don't allow patches with empty commit message. In general I would agree. However several of Tom's patches addressing kconfig migration have a commit message like this: This converts the following to Kconfig: FOO_BAR This is redundant to the subject saying exactly the same. I can add this if you want, but I saw no sense in it. > > > > > > Signed-off-by: Alexander Dahl <ada@thorsis.com> > > --- > > README | 4 ---- > > configs/astro_mcf5373l_defconfig | 1 + > > drivers/fpga/Kconfig | 6 ++++++ > > include/configs/astro_mcf5373l.h | 1 - > > scripts/config_whitelist.txt | 1 - > > Tom can confirm this but IIRC you don't need to remove this from this file. > Tom is doing sync up time to time. It is enough to do conversion only. This was done by the script ./tools/moveconfig.py where I just hit enter with defaults presented. The other Kconfig patches change defconfig, but not whitelist. Seems a little inconsistent to me. But I can remove that part, sure. Greets Alex > > M
On Wed, Jul 13, 2022 at 03:11:09PM +0200, Alexander Dahl wrote: > Hei hei, > > On Wed, Jul 13, 2022 at 02:50:14PM +0200, Michal Simek wrote: > > > > > > On 7/13/22 14:33, Alexander Dahl wrote: > > > From: Alexander Dahl <ada@thorsis.com> > > > > > > WARNING: please write a paragraph that describes the config symbol fully > > > > We don't allow patches with empty commit message. > > In general I would agree. However several of Tom's patches addressing > kconfig migration have a commit message like this: > > This converts the following to Kconfig: FOO_BAR > > This is redundant to the subject saying exactly the same. I can add > this if you want, but I saw no sense in it. Yes, the moveconfig.py tool adds that and it's a little redundant sometimes, but is (a) a starting point for the times when the conversion required a little extra work or (b) lists all the symbols when you migrate more than one at a time. > > > Signed-off-by: Alexander Dahl <ada@thorsis.com> > > > --- > > > README | 4 ---- > > > configs/astro_mcf5373l_defconfig | 1 + > > > drivers/fpga/Kconfig | 6 ++++++ > > > include/configs/astro_mcf5373l.h | 1 - > > > scripts/config_whitelist.txt | 1 - > > > > Tom can confirm this but IIRC you don't need to remove this from this file. > > Tom is doing sync up time to time. It is enough to do conversion only. > > This was done by the script ./tools/moveconfig.py where I just hit > enter with defaults presented. The other Kconfig patches change > defconfig, but not whitelist. Seems a little inconsistent to me. But > I can remove that part, sure. So, I usually run "-yC" with moveconfig.py as that gives the commit message. It's not a problem, really, to touch scripts/config_whitelist.txt it just also can conflict easily. Omitting it makes it easier to "git am", fixing up / dropping that hunk if it conflicts later is also fine.
diff --git a/README b/README index 8c31e5c0e3..2c4bde0b32 100644 --- a/README +++ b/README @@ -1330,10 +1330,6 @@ The following options need to be configured: Enables support for FPGA family. (SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX) - CONFIG_SYS_FPGA_PROG_FEEDBACK - - Enable printing of hash marks during FPGA configuration. - CONFIG_SYS_FPGA_CHECK_BUSY Enable checks on FPGA configuration interface busy diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index 3a44c7e8ec..9f5cb8702c 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -33,6 +33,7 @@ CONFIG_FPGA_ALTERA=y CONFIG_FPGA_CYCLON2=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_SPARTAN3=y +CONFIG_SYS_FPGA_PROG_FEEDBACK=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_FSL=y CONFIG_SYS_FSL_I2C_OFFSET=0x58000 diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 53d91676e0..e152ea14dc 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -95,4 +95,10 @@ config SYS_FPGA_CHECK_CTRLC bool "Allow Control-C to interrupt FPGA configuration" depends on FPGA +config SYS_FPGA_PROG_FEEDBACK + bool "Progress output during FPGA configuration" + depends on FPGA + help + Enable printing of hash marks during FPGA configuration. + endmenu diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index a8265e961a..da4d49741d 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -131,7 +131,6 @@ * it needs non-blocking CFI routines. */ -#define CONFIG_SYS_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_WAIT 1000 /* End of user parameters to be customized */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index efc2f3bcf7..fc07c5d257 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -743,7 +743,6 @@ CONFIG_SYS_FPGA_FTIM0 CONFIG_SYS_FPGA_FTIM1 CONFIG_SYS_FPGA_FTIM2 CONFIG_SYS_FPGA_FTIM3 -CONFIG_SYS_FPGA_PROG_FEEDBACK CONFIG_SYS_FPGA_SIZE CONFIG_SYS_FPGA_WAIT CONFIG_SYS_FSL_BMAN_ADDR