Skip to contentSkip to conversation

staging/olpc_dcon: fix kconfig to fix build errors

PATCH In review Randy Dunlap 2 participants 4 messages Oct 13, 2013 – Oct 15, 2013 1 message not in the archive Staging

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 524a3b76.oejnG6gfqBFdWbl/%[email protected]

#1 lore raw

PATCH v2 1/1 staging/olpc_dcon: fix kconfig to fix build errors

From: Randy Dunlap <[email protected]>

Fix build errors when GPIO_CS5535=m and FB_OLPC_DCON=y by preventing that kconfig combination.

These build errors are caused by having a kconfig bool symbol (FB_OLPC_DCON_1) that depend on a tristate symbol (GPIO_CS5535), but when the tristate symbol is =m, the bool symbol is =y.

drivers/built-in.o: In function `dcon_read_status_xo_1':
olpc_dcon_xo_1.c:(.text+0x359531): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x35959f): undefined reference to cs5535_gpio_set' olpc_dcon_xo_1.c:(.text+0x359610): undefined reference to cs5535_gpio_clear' drivers/built-in.o:olpc_dcon_xo_1.c:(.text+0x3596a1): more undefined references to cs5535_gpio_clear' follow drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x359708): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_init_xo_1':
olpc_dcon_xo_1.c:(.text+0x35989b): undefined reference to cs5535_gpio_clear' olpc_dcon_xo_1.c:(.text+0x3598b5): undefined reference to cs5535_gpio_isset' olpc_dcon_xo_1.c:(.text+0x359963): undefined reference to cs5535_gpio_setup_event' olpc_dcon_xo_1.c:(.text+0x359980): undefined reference to cs5535_gpio_set_irq' olpc_dcon_xo_1.c:(.text+0x359a36): undefined reference to `cs5535_gpio_set'

However, adding GPIO_CS5535 to the Kconfig dependencies also creates a kconfig recursive dependency error on powerpc:
drivers/i2c/Kconfig:5:error: recursive dependency detected!
drivers/i2c/Kconfig:5: symbol I2C is selected by FB_OLPC_DCON
drivers/staging/olpc_dcon/Kconfig:1: symbol FB_OLPC_DCON depends on GPIO_CS5535
drivers/gpio/Kconfig:577: symbol GPIO_CS5535 depends on GPIOLIB
drivers/gpio/Kconfig:38: symbol GPIOLIB is selected by ARCH_REQUIRE_GPIOLIB
drivers/gpio/Kconfig:23: symbol ARCH_REQUIRE_GPIOLIB is selected by MCU_MPC8349EMITX
arch/powerpc/platforms/Kconfig:351: symbol MCU_MPC8349EMITX depends on I2C

This is due to FB_OLPC_DCON selecting I2C instead of depending on it, so change the select to a dependency.

Cc Daniel Drake <[email protected]>
Cc Jens Frederich <[email protected]>
Cc Jon Nettleton <[email protected]>
---
 drivers/staging/olpc_dcon/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/olpc_dcon/Kconfig +2 -1
@@ -1,7 +1,8 @@
 config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
 	depends on OLPC && FB
-	select I2C
+	depends on I2C
+	depends on (GPIO_CS5535 || GPIO_CS5535=n)
 	select BACKLIGHT_CLASS_DEVICE
 	---help---
 	  In order to support very low power operation, the XO laptop uses a
#2 lore raw
Quoted 48 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build errors when GPIO_CS5535=m and FB_OLPC_DCON=y by preventing that kconfig combination.

These build errors are caused by having a kconfig bool symbol (FB_OLPC_DCON_1) that depend on a tristate symbol (GPIO_CS5535), but when the tristate symbol is =m, the bool symbol is =y.

drivers/built-in.o: In function `dcon_read_status_xo_1':
olpc_dcon_xo_1.c:(.text+0x359531): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x35959f): undefined reference to cs5535_gpio_set' olpc_dcon_xo_1.c:(.text+0x359610): undefined reference to cs5535_gpio_clear' drivers/built-in.o:olpc_dcon_xo_1.c:(.text+0x3596a1): more undefined references to cs5535_gpio_clear' follow drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x359708): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_init_xo_1':
olpc_dcon_xo_1.c:(.text+0x35989b): undefined reference to cs5535_gpio_clear' olpc_dcon_xo_1.c:(.text+0x3598b5): undefined reference to cs5535_gpio_isset' olpc_dcon_xo_1.c:(.text+0x359963): undefined reference to cs5535_gpio_setup_event' olpc_dcon_xo_1.c:(.text+0x359980): undefined reference to cs5535_gpio_set_irq' olpc_dcon_xo_1.c:(.text+0x359a36): undefined reference to `cs5535_gpio_set'

However, adding GPIO_CS5535 to the Kconfig dependencies also creates a kconfig recursive dependency error on powerpc:
drivers/i2c/Kconfig:5:error: recursive dependency detected!
drivers/i2c/Kconfig:5: symbol I2C is selected by FB_OLPC_DCON
drivers/staging/olpc_dcon/Kconfig:1: symbol FB_OLPC_DCON depends on GPIO_CS5535
drivers/gpio/Kconfig:577: symbol GPIO_CS5535 depends on GPIOLIB
drivers/gpio/Kconfig:38: symbol GPIOLIB is selected by ARCH_REQUIRE_GPIOLIB
drivers/gpio/Kconfig:23: symbol ARCH_REQUIRE_GPIOLIB is selected by MCU_MPC8349EMITX
arch/powerpc/platforms/Kconfig:351: symbol MCU_MPC8349EMITX depends on I2C

This is due to FB_OLPC_DCON selecting I2C instead of depending on it, so change the select to a dependency.

Cc Daniel Drake <[email protected]>
Cc Jens Frederich <[email protected]>
Cc Jon Nettleton <[email protected]>
---
 drivers/staging/olpc_dcon/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/staging/olpc_dcon/Kconfig line 5

Quoted 6 lines
drivers/staging/olpc_dcon/Kconfig +2 -1
@@ -1,7 +1,8 @@
 config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
 	depends on OLPC && FB
-	select I2C
+	depends on I2C
+	depends on (GPIO_CS5535 || GPIO_CS5535=n)

This fails to apply to my staging-next branch of staging.git due to a previous patch from you to try to fix this same issue (or maybe a different one, I don't know...)

sorry,

greg k-h

#3 lore raw
Quoted 46 lines · Greg Kroah-Hartman
Quoted 45 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build errors when GPIO_CS5535=m and FB_OLPC_DCON=y by preventing that kconfig combination.

These build errors are caused by having a kconfig bool symbol (FB_OLPC_DCON_1) that depend on a tristate symbol (GPIO_CS5535), but when the tristate symbol is =m, the bool symbol is =y.

drivers/built-in.o: In function `dcon_read_status_xo_1':
olpc_dcon_xo_1.c:(.text+0x359531): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x35959f): undefined reference to cs5535_gpio_set' olpc_dcon_xo_1.c:(.text+0x359610): undefined reference to cs5535_gpio_clear' drivers/built-in.o:olpc_dcon_xo_1.c:(.text+0x3596a1): more undefined references to cs5535_gpio_clear' follow drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x359708): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_init_xo_1':
olpc_dcon_xo_1.c:(.text+0x35989b): undefined reference to cs5535_gpio_clear' olpc_dcon_xo_1.c:(.text+0x3598b5): undefined reference to cs5535_gpio_isset' olpc_dcon_xo_1.c:(.text+0x359963): undefined reference to cs5535_gpio_setup_event' olpc_dcon_xo_1.c:(.text+0x359980): undefined reference to cs5535_gpio_set_irq' olpc_dcon_xo_1.c:(.text+0x359a36): undefined reference to `cs5535_gpio_set'

However, adding GPIO_CS5535 to the Kconfig dependencies also creates a kconfig recursive dependency error on powerpc:
drivers/i2c/Kconfig:5:error: recursive dependency detected!
drivers/i2c/Kconfig:5: symbol I2C is selected by FB_OLPC_DCON
drivers/staging/olpc_dcon/Kconfig:1: symbol FB_OLPC_DCON depends on GPIO_CS5535
drivers/gpio/Kconfig:577: symbol GPIO_CS5535 depends on GPIOLIB
drivers/gpio/Kconfig:38: symbol GPIOLIB is selected by ARCH_REQUIRE_GPIOLIB
drivers/gpio/Kconfig:23: symbol ARCH_REQUIRE_GPIOLIB is selected by MCU_MPC8349EMITX
arch/powerpc/platforms/Kconfig:351: symbol MCU_MPC8349EMITX depends on I2C

This is due to FB_OLPC_DCON selecting I2C instead of depending on it, so change the select to a dependency.

Cc Daniel Drake <[email protected]>
Cc Jens Frederich <[email protected]>
Cc Jon Nettleton <[email protected]>
---
 drivers/staging/olpc_dcon/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 14 lines

drivers/staging/olpc_dcon/Kconfig line 5

Quoted 9 lines
drivers/staging/olpc_dcon/Kconfig +2 -1
@@ -1,7 +1,8 @@
 config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
 	depends on OLPC && FB
-	select I2C
+	depends on I2C
+	depends on (GPIO_CS5535 || GPIO_CS5535=n)

This fails to apply to my staging-next branch of staging.git due to a previous patch from you to try to fix this same issue (or maybe a different one, I don't know...)

You had asked if the previous patch should be reverted and I replied (very belatedly) Yes. However, I'll be glad to make a new patch against linux-next instead of mainline.

Signature · 1 line
~Randy
#4 lore raw
Quoted 63 lines · Randy Dunlap
Quoted 46 lines · Greg Kroah-Hartman
Quoted 45 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build errors when GPIO_CS5535=m and FB_OLPC_DCON=y by preventing that kconfig combination.

These build errors are caused by having a kconfig bool symbol (FB_OLPC_DCON_1) that depend on a tristate symbol (GPIO_CS5535), but when the tristate symbol is =m, the bool symbol is =y.

drivers/built-in.o: In function `dcon_read_status_xo_1':
olpc_dcon_xo_1.c:(.text+0x359531): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x35959f): undefined reference to cs5535_gpio_set' olpc_dcon_xo_1.c:(.text+0x359610): undefined reference to cs5535_gpio_clear' drivers/built-in.o:olpc_dcon_xo_1.c:(.text+0x3596a1): more undefined references to cs5535_gpio_clear' follow drivers/built-in.o: In function dcon_wiggle_xo_1':
olpc_dcon_xo_1.c:(.text+0x359708): undefined reference to cs5535_gpio_set' drivers/built-in.o: In function dcon_init_xo_1':
olpc_dcon_xo_1.c:(.text+0x35989b): undefined reference to cs5535_gpio_clear' olpc_dcon_xo_1.c:(.text+0x3598b5): undefined reference to cs5535_gpio_isset' olpc_dcon_xo_1.c:(.text+0x359963): undefined reference to cs5535_gpio_setup_event' olpc_dcon_xo_1.c:(.text+0x359980): undefined reference to cs5535_gpio_set_irq' olpc_dcon_xo_1.c:(.text+0x359a36): undefined reference to `cs5535_gpio_set'

However, adding GPIO_CS5535 to the Kconfig dependencies also creates a kconfig recursive dependency error on powerpc:
drivers/i2c/Kconfig:5:error: recursive dependency detected!
drivers/i2c/Kconfig:5: symbol I2C is selected by FB_OLPC_DCON
drivers/staging/olpc_dcon/Kconfig:1: symbol FB_OLPC_DCON depends on GPIO_CS5535
drivers/gpio/Kconfig:577: symbol GPIO_CS5535 depends on GPIOLIB
drivers/gpio/Kconfig:38: symbol GPIOLIB is selected by ARCH_REQUIRE_GPIOLIB
drivers/gpio/Kconfig:23: symbol ARCH_REQUIRE_GPIOLIB is selected by MCU_MPC8349EMITX
arch/powerpc/platforms/Kconfig:351: symbol MCU_MPC8349EMITX depends on I2C

This is due to FB_OLPC_DCON selecting I2C instead of depending on it, so change the select to a dependency.

Cc Daniel Drake <[email protected]>
Cc Jens Frederich <[email protected]>
Cc Jon Nettleton <[email protected]>
---
 drivers/staging/olpc_dcon/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 14 lines

drivers/staging/olpc_dcon/Kconfig line 5

Quoted 9 lines
drivers/staging/olpc_dcon/Kconfig +2 -1
@@ -1,7 +1,8 @@
 config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
 	depends on OLPC && FB
-	select I2C
+	depends on I2C
+	depends on (GPIO_CS5535 || GPIO_CS5535=n)

This fails to apply to my staging-next branch of staging.git due to a previous patch from you to try to fix this same issue (or maybe a different one, I don't know...)

Quoted 3 lines

You had asked if the previous patch should be reverted and I replied (very belatedly) Yes. However, I'll be glad to make a new patch against linux-next instead of mainline.

Ah, missed that, I've now reverted it and will apply this one instead.

thanks,

greg k-h