Skip to contentSkip to conversation

kbuild and kconfig fixes for 2.6.37-rc5

GIT Michal Marek 5 participants 11 messages Dec 4, 2010 – Dec 6, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull these kbuild/kconfig fixes for the next -rc. The largest part are fixes for the annoying kconfig warnings, contributed by Arnaud Lacombe and Mauro Carvalho Chehab. The solution adds a new 'visible if' keyword to the Kconfig language, so it's not exactly something that one would expect in the rc phase, but the kconfig change is not huge (the large diff is due to generated files) and it is deployed only in those five Kconfig files that had the warnings and were hard to fix by other means. The second part is a forgotten patch by Hendrik Brueckner to usr/initramfs, that fixes build for Blackfin and h8300.

Michal

The following changes since commit e8a7e48bb248a1196484d3f8afa53bded2b24e71:

Linux 2.6.37-rc4 (2010-11-29 20:42:04 -0800)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes

Arnaud Lacombe (5):
kconfig: add an option to determine a menu's visibility
kconfig: regen parser
Revert "i2c: Fix Kconfig dependencies"
media/video: convert Kconfig to use the menu's visible' keyword i2c/algos: convert Kconfig to use the menu's visible' keyword

Hendrik Brueckner (1):
initramfs: Really fix build break on symbol-prefixed archs

Mauro Carvalho Chehab (1):
[media] Fix Kconfig errors due to two visible menus

Michal Marek (1):
Merge branch 'kconfig_fixes' of git://git.kernel.org/.../mchehab/linux-next into kbuild/rc-fixes

 drivers/i2c/Kconfig                  |    3 +-
 drivers/i2c/algos/Kconfig            |   14 +-
 drivers/media/common/tuners/Kconfig  |    8 +-
 drivers/media/dvb/frontends/Kconfig  |    5 +-
 drivers/media/video/Kconfig          |    2 +-
 scripts/kconfig/expr.h               |    1 +
 scripts/kconfig/lkc.h                |    1 +
 scripts/kconfig/menu.c               |   11 +
 scripts/kconfig/zconf.gperf          |    1 +
 scripts/kconfig/zconf.hash.c_shipped |  122 ++++----
 scripts/kconfig/zconf.tab.c_shipped  |  570 +++++++++++++++++----------------
 scripts/kconfig/zconf.y              |   21 +-
 usr/initramfs_data.S                 |    5 +-
 13 files changed, 401 insertions(+), 363 deletions(-)
#1 lore raw
Quoted 50 lines · Michal Marek

Hi Linus,

please pull these kbuild/kconfig fixes for the next -rc. The largest part are fixes for the annoying kconfig warnings, contributed by Arnaud Lacombe and Mauro Carvalho Chehab. The solution adds a new 'visible if' keyword to the Kconfig language, so it's not exactly something that one would expect in the rc phase, but the kconfig change is not huge (the large diff is due to generated files) and it is deployed only in those five Kconfig files that had the warnings and were hard to fix by other means.  The second part is a forgotten patch by Hendrik Brueckner to usr/initramfs, that fixes build for Blackfin and h8300.

Michal

The following changes since commit e8a7e48bb248a1196484d3f8afa53bded2b24e71:

 Linux 2.6.37-rc4 (2010-11-29 20:42:04 -0800)

are available in the git repository at:
 git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes

Arnaud Lacombe (5):
     kconfig: add an option to determine a menu's visibility
     kconfig: regen parser
     Revert "i2c: Fix Kconfig dependencies"
     media/video: convert Kconfig to use the menu's visible' keyword i2c/algos: convert Kconfig to use the menu's visible' keyword

Hendrik Brueckner (1):
     initramfs: Really fix build break on symbol-prefixed archs

Mauro Carvalho Chehab (1):
     [media] Fix Kconfig errors due to two visible menus

Michal Marek (1):
     Merge branch 'kconfig_fixes' of git://git.kernel.org/.../mchehab/linux-next into kbuild/rc-fixes

 drivers/i2c/Kconfig                  |    3 +- drivers/i2c/algos/Kconfig            |   14 +- drivers/media/common/tuners/Kconfig  |    8 +- drivers/media/dvb/frontends/Kconfig  |    5 +- drivers/media/video/Kconfig          |    2 +- scripts/kconfig/expr.h               |    1 + scripts/kconfig/lkc.h                |    1 + scripts/kconfig/menu.c               |   11 + scripts/kconfig/zconf.gperf          |    1 + scripts/kconfig/zconf.hash.c_shipped |  122 ++++---- scripts/kconfig/zconf.tab.c_shipped  |  570 +++++++++++++++++---------------- scripts/kconfig/zconf.y              |   21 +- usr/initramfs_data.S                 |    5 +-

Quoted 7 lines
 13 files changed, 401 insertions(+), 363 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB || MFD_88PM860X && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_ASIC3 && MFD_SUPPORT && GENERIC_HARDIRQS && GPIOLIB && ARM || MFD_SH_MOBILE_SDHI && MFD_SUPPORT && (SUPERH || ARCH_SHMOBILE) || MFD_DAVINCI_VOICECODEC && MFD_SUPPORT || HTC_PASIC3 && MFD_SUPPORT || TPS6507X && MFD_SUPPORT && I2C || TWL4030_CODEC && MFD_SUPPORT && TWL4030_CORE || MFD_STMPE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS

|| MFD_TC35892 && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS ||
MFD_T7L66XB && MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6387XB &&
MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6393XB && MFD_SUPPORT &&
GPIOLIB && ARM || MFD_MAX8925 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_MAX8998 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_WM8400 && MFD_SUPPORT && I2C || MFD_WM831X_I2C
&& MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_WM831X_SPI &&
MFD_SUPPORT && SPI_MASTER && GENERIC_HARDIRQS || MFD_WM8994 &&
MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_MC13XXX && MFD_SUPPORT
&& SPI_MASTER || AB3100_CORE && MFD_SUPPORT && I2C=y && ABX500_CORE ||

AB8500_CORE && MFD_SUPPORT && GENERIC_HARDIRQS && ABX500_CORE && SPI_MASTER && ARCH_U8500 || AB3550_CORE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS && ABX500_CORE || MFD_TIMBERDALE && MFD_SUPPORT && PCI && GPIOLIB || LPC_SCH && MFD_SUPPORT && PCI || MFD_RDC321X && MFD_SUPPORT && PCI || MFD_JANZ_CMODIO && MFD_SUPPORT && PCI || MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

Were these warnings supposed to be fixed by this patch set as well? Or is it something in my config (attached)?

Signature · 2 lines
Thanks,
Tomasz
#2 lore raw
Quoted 26 lines · On Sun, 5 Dec 2010 15:42:46 +0000 trapDoor wrote:

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB || MFD_88PM860X && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_ASIC3 && MFD_SUPPORT && GENERIC_HARDIRQS && GPIOLIB && ARM || MFD_SH_MOBILE_SDHI && MFD_SUPPORT && (SUPERH || ARCH_SHMOBILE) || MFD_DAVINCI_VOICECODEC && MFD_SUPPORT || HTC_PASIC3 && MFD_SUPPORT || TPS6507X && MFD_SUPPORT && I2C || TWL4030_CODEC && MFD_SUPPORT && TWL4030_CORE || MFD_STMPE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS

|| MFD_TC35892 && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS ||
MFD_T7L66XB && MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6387XB &&
MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6393XB && MFD_SUPPORT &&
GPIOLIB && ARM || MFD_MAX8925 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_MAX8998 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_WM8400 && MFD_SUPPORT && I2C || MFD_WM831X_I2C
&& MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_WM831X_SPI &&
MFD_SUPPORT && SPI_MASTER && GENERIC_HARDIRQS || MFD_WM8994 &&
MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_MC13XXX && MFD_SUPPORT
&& SPI_MASTER || AB3100_CORE && MFD_SUPPORT && I2C=y && ABX500_CORE ||
Quoted 10 lines

AB8500_CORE && MFD_SUPPORT && GENERIC_HARDIRQS && ABX500_CORE && SPI_MASTER && ARCH_U8500 || AB3550_CORE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS && ABX500_CORE || MFD_TIMBERDALE && MFD_SUPPORT && PCI && GPIOLIB || LPC_SCH && MFD_SUPPORT && PCI || MFD_RDC321X && MFD_SUPPORT && PCI || MFD_JANZ_CMODIO && MFD_SUPPORT && PCI || MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

That's 2 warnings. I have sent a patch for the first one. Looks like I need to resend it.

Quoted 3 lines

Were these warnings supposed to be fixed by this patch set as well? Or is it something in my config (attached)?

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#3 lore raw
Quoted 39 lines · Randy Dunlap
Quoted 26 lines · On Sun, 5 Dec 2010 15:42:46 +0000 trapDoor wrote:

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when  running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB || MFD_88PM860X && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_ASIC3 && MFD_SUPPORT && GENERIC_HARDIRQS && GPIOLIB && ARM || MFD_SH_MOBILE_SDHI && MFD_SUPPORT && (SUPERH || ARCH_SHMOBILE) || MFD_DAVINCI_VOICECODEC && MFD_SUPPORT || HTC_PASIC3 && MFD_SUPPORT || TPS6507X && MFD_SUPPORT && I2C || TWL4030_CODEC && MFD_SUPPORT && TWL4030_CORE || MFD_STMPE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS

|| MFD_TC35892 && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS ||
MFD_T7L66XB && MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6387XB &&
MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6393XB && MFD_SUPPORT &&
GPIOLIB && ARM || MFD_MAX8925 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_MAX8998 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_WM8400 && MFD_SUPPORT && I2C || MFD_WM831X_I2C
&& MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_WM831X_SPI &&
MFD_SUPPORT && SPI_MASTER && GENERIC_HARDIRQS || MFD_WM8994 &&
MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_MC13XXX && MFD_SUPPORT
&& SPI_MASTER || AB3100_CORE && MFD_SUPPORT && I2C=y && ABX500_CORE ||
Quoted 10 lines

AB8500_CORE && MFD_SUPPORT && GENERIC_HARDIRQS && ABX500_CORE && SPI_MASTER && ARCH_U8500 || AB3550_CORE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS && ABX500_CORE || MFD_TIMBERDALE && MFD_SUPPORT && PCI && GPIOLIB || LPC_SCH && MFD_SUPPORT && PCI || MFD_RDC321X && MFD_SUPPORT && PCI || MFD_JANZ_CMODIO && MFD_SUPPORT && PCI || MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

Quoted 3 lines

That's 2 warnings.  I have sent a patch for the first one. Looks like I need to resend it.

I was actually impressed by the amount of lines produced by those two warnings :) I'd call it 'a lot'.

Signature · 2 lines
Thanks,
Tomasz
#4 lore raw
Quoted 13 lines · trapDoor
Quoted 12 lines · Randy Dunlap
Quoted 10 lines · On Sun, 5 Dec 2010 15:42:46 +0000 trapDoor wrote:

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when  running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB ||

[...]

Quoted 10 lines
Quoted 7 lines
Quoted 4 lines

MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

That's 2 warnings.  I have sent a patch for the first one. Looks like I need to resend it.

I was actually impressed by the amount of lines produced by those two warnings :) I'd call it 'a lot'.

This could be simplified to only show the first option of every '&&' expression, something like below:

warning: I2C_ISCH selects MFD_CORE...
warning: GPIO_SCH selects MFD_CORE...

But I couldn't figure out whether the expression reduction code in kbuild reorders the options or not.

Signature · 1 line
Catalin
#5 lore raw
Quoted 26 lines · Catalin Marinas
Quoted 13 lines · trapDoor
Quoted 12 lines · Randy Dunlap
Quoted 10 lines · On Sun, 5 Dec 2010 15:42:46 +0000 trapDoor wrote:

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB ||

[...]

Quoted 10 lines
Quoted 7 lines
Quoted 4 lines

MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

That's 2 warnings. I have sent a patch for the first one. Looks like I need to resend it.

I was actually impressed by the amount of lines produced by those two warnings :) I'd call it 'a lot'.

Quoted 8 lines

This could be simplified to only show the first option of every '&&' expression, something like below:

warning: I2C_ISCH selects MFD_CORE...
warning: GPIO_SCH selects MFD_CORE...

But I couldn't figure out whether the expression reduction code in kbuild reorders the options or not.

I'm pretty sure that I have seen cases where the faulty kconfig is not the first one listed, so all of them need to be available.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
#6 lore raw

Hi,

Quoted 11 lines · Randy Dunlap

On 12/06/10 10:01, Catalin Marinas wrote:
[...]

Quoted 8 lines

This could be simplified to only show the first option of every '&&' expression, something like below:

warning: I2C_ISCH selects MFD_CORE...
warning: GPIO_SCH selects MFD_CORE...

But I couldn't figure out whether the expression reduction code in kbuild reorders the options or not.

This was the purpose of a patch I send a month or two ago, though, you defeated it with cases the code was not taking into account. I updated it since, but did not post it. I'll post it on linux-kbuild@ and continue the discussion there.

Quoted 3 lines

I'm pretty sure that I have seen cases where the faulty kconfig is not the first one listed, so all of them need to be available.

do you have an example ?

Thanks,
- Arnaud

#7 lore raw
Quoted 19 lines · Arnaud Lacombe

Hi,

Quoted 11 lines · Randy Dunlap

On 12/06/10 10:01, Catalin Marinas wrote:
[...]

Quoted 8 lines

This could be simplified to only show the first option of every '&&' expression, something like below:

warning: I2C_ISCH selects MFD_CORE...
warning: GPIO_SCH selects MFD_CORE...

But I couldn't figure out whether the expression reduction code in kbuild reorders the options or not.

This was the purpose of a patch I send a month or two ago, though, you defeated it with cases the code was not taking into account. I updated it since, but did not post it. I'll post it on linux-kbuild@ and continue the discussion there.

Quoted 4 lines
Quoted 3 lines

I'm pretty sure that I have seen cases where the faulty kconfig is not the first one listed, so all of them need to be available.

do you have an example ?

Not at hand, but I'll be on the lookout for one.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
#8 lore raw
In reply to trapDoor

Hi,

Quoted 85 lines · trapDoor
Quoted 50 lines · Michal Marek

Hi Linus,

please pull these kbuild/kconfig fixes for the next -rc. The largest part are fixes for the annoying kconfig warnings, contributed by Arnaud Lacombe and Mauro Carvalho Chehab. The solution adds a new 'visible if' keyword to the Kconfig language, so it's not exactly something that one would expect in the rc phase, but the kconfig change is not huge (the large diff is due to generated files) and it is deployed only in those five Kconfig files that had the warnings and were hard to fix by other means.  The second part is a forgotten patch by Hendrik Brueckner to usr/initramfs, that fixes build for Blackfin and h8300.

Michal

The following changes since commit e8a7e48bb248a1196484d3f8afa53bded2b24e71:

 Linux 2.6.37-rc4 (2010-11-29 20:42:04 -0800)

are available in the git repository at:
 git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes

Arnaud Lacombe (5):
     kconfig: add an option to determine a menu's visibility
     kconfig: regen parser
     Revert "i2c: Fix Kconfig dependencies"
     media/video: convert Kconfig to use the menu's visible' keyword i2c/algos: convert Kconfig to use the menu's visible' keyword

Hendrik Brueckner (1):
     initramfs: Really fix build break on symbol-prefixed archs

Mauro Carvalho Chehab (1):
     [media] Fix Kconfig errors due to two visible menus

Michal Marek (1):
     Merge branch 'kconfig_fixes' of git://git.kernel.org/.../mchehab/linux-next into kbuild/rc-fixes

 drivers/i2c/Kconfig                  |    3 +- drivers/i2c/algos/Kconfig            |   14 +- drivers/media/common/tuners/Kconfig  |    8 +- drivers/media/dvb/frontends/Kconfig  |    5 +- drivers/media/video/Kconfig          |    2 +- scripts/kconfig/expr.h               |    1 + scripts/kconfig/lkc.h                |    1 + scripts/kconfig/menu.c               |   11 + scripts/kconfig/zconf.gperf          |    1 + scripts/kconfig/zconf.hash.c_shipped |  122 ++++---- scripts/kconfig/zconf.tab.c_shipped  |  570 +++++++++++++++++---------------- scripts/kconfig/zconf.y              |   21 +- usr/initramfs_data.S                 |    5 +-

Quoted 7 lines
 13 files changed, 401 insertions(+), 363 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when  running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB || MFD_88PM860X && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_ASIC3 && MFD_SUPPORT && GENERIC_HARDIRQS && GPIOLIB && ARM || MFD_SH_MOBILE_SDHI && MFD_SUPPORT && (SUPERH || ARCH_SHMOBILE) || MFD_DAVINCI_VOICECODEC && MFD_SUPPORT || HTC_PASIC3 && MFD_SUPPORT || TPS6507X && MFD_SUPPORT && I2C || TWL4030_CODEC && MFD_SUPPORT && TWL4030_CORE || MFD_STMPE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS

|| MFD_TC35892 && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS ||
MFD_T7L66XB && MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6387XB &&
MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6393XB && MFD_SUPPORT &&
GPIOLIB && ARM || MFD_MAX8925 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_MAX8998 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_WM8400 && MFD_SUPPORT && I2C || MFD_WM831X_I2C
&& MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_WM831X_SPI &&
MFD_SUPPORT && SPI_MASTER && GENERIC_HARDIRQS || MFD_WM8994 &&
MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_MC13XXX && MFD_SUPPORT
&& SPI_MASTER || AB3100_CORE && MFD_SUPPORT && I2C=y && ABX500_CORE ||
Quoted 10 lines

AB8500_CORE && MFD_SUPPORT && GENERIC_HARDIRQS && ABX500_CORE && SPI_MASTER && ARCH_U8500 || AB3550_CORE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS && ABX500_CORE || MFD_TIMBERDALE && MFD_SUPPORT && PCI && GPIOLIB || LPC_SCH && MFD_SUPPORT && PCI || MFD_RDC321X && MFD_SUPPORT && PCI || MFD_JANZ_CMODIO && MFD_SUPPORT && PCI || MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

Technically, this is two warning, though really verbose :)

Quoted 4 lines

Were these warnings supposed to be fixed by this patch set as well? Or is it something in my config (attached)?

No. The kconfig language update is meant to be a solution for the +150 warnings triggered by the media and i2c tree, without making it impossible to maintain. The notion of "dependency" was too strong for the expected usage.

- Arnaud

Quoted 4 lines

--
Thanks,
Tomasz

#9 lore raw
Quoted 98 lines · Arnaud Lacombe

Hi,

Quoted 85 lines · trapDoor
Quoted 50 lines · Michal Marek

Hi Linus,

please pull these kbuild/kconfig fixes for the next -rc. The largest part are fixes for the annoying kconfig warnings, contributed by Arnaud Lacombe and Mauro Carvalho Chehab. The solution adds a new 'visible if' keyword to the Kconfig language, so it's not exactly something that one would expect in the rc phase, but the kconfig change is not huge (the large diff is due to generated files) and it is deployed only in those five Kconfig files that had the warnings and were hard to fix by other means.  The second part is a forgotten patch by Hendrik Brueckner to usr/initramfs, that fixes build for Blackfin and h8300.

Michal

The following changes since commit e8a7e48bb248a1196484d3f8afa53bded2b24e71:

 Linux 2.6.37-rc4 (2010-11-29 20:42:04 -0800)

are available in the git repository at:
 git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes

Arnaud Lacombe (5):
     kconfig: add an option to determine a menu's visibility
     kconfig: regen parser
     Revert "i2c: Fix Kconfig dependencies"
     media/video: convert Kconfig to use the menu's visible' keyword i2c/algos: convert Kconfig to use the menu's visible' keyword

Hendrik Brueckner (1):
     initramfs: Really fix build break on symbol-prefixed archs

Mauro Carvalho Chehab (1):
     [media] Fix Kconfig errors due to two visible menus

Michal Marek (1):
     Merge branch 'kconfig_fixes' of git://git.kernel.org/.../mchehab/linux-next into kbuild/rc-fixes

 drivers/i2c/Kconfig                  |    3 +- drivers/i2c/algos/Kconfig            |   14 +- drivers/media/common/tuners/Kconfig  |    8 +- drivers/media/dvb/frontends/Kconfig  |    5 +- drivers/media/video/Kconfig          |    2 +- scripts/kconfig/expr.h               |    1 + scripts/kconfig/lkc.h                |    1 + scripts/kconfig/menu.c               |   11 + scripts/kconfig/zconf.gperf          |    1 + scripts/kconfig/zconf.hash.c_shipped |  122 ++++---- scripts/kconfig/zconf.tab.c_shipped  |  570 +++++++++++++++++---------------- scripts/kconfig/zconf.y              |   21 +- usr/initramfs_data.S                 |    5 +-

Quoted 7 lines
 13 files changed, 401 insertions(+), 363 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when  running oldconfig on the patched kernel I still get lots of warnings:

warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI)
warning: (I2C_ISCH && I2C && PCI || GPIO_SCH && GPIOLIB && PCI || GPIO_VX855 && GPIOLIB || GPIO_RDC321X && PCI && GPIOLIB || MFD_88PM860X && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_ASIC3 && MFD_SUPPORT && GENERIC_HARDIRQS && GPIOLIB && ARM || MFD_SH_MOBILE_SDHI && MFD_SUPPORT && (SUPERH || ARCH_SHMOBILE) || MFD_DAVINCI_VOICECODEC && MFD_SUPPORT || HTC_PASIC3 && MFD_SUPPORT || TPS6507X && MFD_SUPPORT && I2C || TWL4030_CODEC && MFD_SUPPORT && TWL4030_CORE || MFD_STMPE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS

|| MFD_TC35892 && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS ||
MFD_T7L66XB && MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6387XB &&
MFD_SUPPORT && ARM && HAVE_CLK || MFD_TC6393XB && MFD_SUPPORT &&
GPIOLIB && ARM || MFD_MAX8925 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_MAX8998 && MFD_SUPPORT && I2C=y &&
GENERIC_HARDIRQS || MFD_WM8400 && MFD_SUPPORT && I2C || MFD_WM831X_I2C
&& MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_WM831X_SPI &&
MFD_SUPPORT && SPI_MASTER && GENERIC_HARDIRQS || MFD_WM8994 &&
MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS || MFD_MC13XXX && MFD_SUPPORT
&& SPI_MASTER || AB3100_CORE && MFD_SUPPORT && I2C=y && ABX500_CORE ||
Quoted 10 lines

AB8500_CORE && MFD_SUPPORT && GENERIC_HARDIRQS && ABX500_CORE && SPI_MASTER && ARCH_U8500 || AB3550_CORE && MFD_SUPPORT && I2C=y && GENERIC_HARDIRQS && ABX500_CORE || MFD_TIMBERDALE && MFD_SUPPORT && PCI && GPIOLIB || LPC_SCH && MFD_SUPPORT && PCI || MFD_RDC321X && MFD_SUPPORT && PCI || MFD_JANZ_CMODIO && MFD_SUPPORT && PCI || MFD_JZ4740_ADC && MFD_SUPPORT && MACH_JZ4740 || MFD_TPS6586X && MFD_SUPPORT && I2C=y && GPIOLIB && GENERIC_HARDIRQS || MFD_VX855 && MFD_SUPPORT && PCI) selects MFD_CORE which has unmet direct dependencies (MFD_SUPPORT)

Quoted 2 lines

Technically, this is two warning, though really verbose :)

True.

Quoted 11 lines
Quoted 4 lines

Were these warnings supposed to be fixed by this patch set as well? Or is it something in my config (attached)?

No. The kconfig language update is meant to be a solution for the +150 warnings triggered by the media and i2c tree, without making it impossible to maintain. The notion of "dependency" was too strong for the expected usage.

 - Arnaud

OK. Thanks for clarifying.

Signature · 1 line
Tomasz
#10 lore raw
In reply to Arnaud Lacombe
Quoted 21 lines · Arnaud Lacombe

Hi,

Quoted 18 lines · trapDoor
Quoted 11 lines · Michal Marek

Hi Linus,

please pull these kbuild/kconfig fixes for the next -rc. The largest part are fixes for the annoying kconfig warnings, contributed by Arnaud Lacombe and Mauro Carvalho Chehab. The solution adds a new 'visible if' keyword to the Kconfig language, so it's not exactly something that one would expect in the rc phase, but the kconfig change is not huge (the large diff is due to generated files) and it is deployed only in those five Kconfig files that had the warnings and were hard to fix by other means. The second part is a forgotten patch by Hendrik Brueckner to usr/initramfs, that fixes build for Blackfin and h8300.

Hello,
I couldn't wait and I merged the changes into my copy of mainline tree. The merge was successful, no conflicts and the merge-diffstat was exactly the same as above. However, when running oldconfig on the patched kernel I still get lots of warnings:

<sip>

Quoted 11 lines
Quoted 1 line

Technically, this is two warning, though really verbose :)

Quoted 4 lines

Were these warnings supposed to be fixed by this patch set as well? Or is it something in my config (attached)?

No. The kconfig language update is meant to be a solution for the +150 warnings triggered by the media and i2c tree, without making it impossible to maintain. The notion of "dependency" was too strong for the expected usage.

Yes, sorry for giving false hopes in my mail :-).

Michal