powerpc/mpc85xx: Fix compiling error for common/cmd_gpio.c

PATCH New Oleksandr G Zhadan 2 participants 2 messages Apr 28, 2015 – May 5, 2015 PowerPC

Share & tools

Oleksandr G Zhadan

author

2015-04-28 17:59 UTC #0 lore raw

PATCH 1/1 powerpc/mpc85xx: Fix compiling error for common/cmd_gpio.c

To replicate:
1. add to include/configs/p1_p2_rdb_pc.h "#define CONFIG_CMD_GPIO"
2. run make P1020RDB-PC_defconfig
3. run CROSS_COMPILE=powerpc-linux- make

and you will get:
common/built-in.o: In function `do_gpio':
u-boot/common/cmd_gpio.c:186: undefined reference to gpio_request' u-boot/common/cmd_gpio.c:194: undefined reference to gpio_direction_input' u-boot/common/cmd_gpio.c:195: undefined reference to gpio_get_value' u-boot/common/cmd_gpio.c:200: undefined reference to gpio_get_value' u-boot/common/cmd_gpio.c:203: undefined reference to gpio_direction_output' u-boot/common/cmd_gpio.c:209: undefined reference to gpio_free

Signed-off-by Michael Durrant <[email protected]>

Signed-off-by Oleksandr G Zhadan <[email protected]>

---

 arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 ++
 arch/powerpc/include/asm/mpc85xx_gpio.h      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

arch/powerpc/include/asm/arch-mpc85xx/gpio.h +2 -0

index 8beed30..71794a8 100644
@@ -12,4 +12,6 @@
 #ifndef __ASM_ARCH_MX85XX_GPIO_H
 #define __ASM_ARCH_MX85XX_GPIO_H
 
+#include <asm/mpc85xx_gpio.h>
+
 #endif

arch/powerpc/include/asm/mpc85xx_gpio.h +4 -2

index 87bb4a0..1d0dad4 100644
@@ -72,9 +72,10 @@ static inline int gpio_request(unsigned gpio, const char *label)
 	return 0;
 }
 
-static inline void gpio_free(unsigned gpio)
+static inline int gpio_free(unsigned gpio)
 {
 	/* Compatibility shim */
+	return 0;
 }
 
 static inline int gpio_direction_input(unsigned gpio)

@@ -97,12 +98,13 @@ static inline int gpio_get_value(unsigned gpio)
 	return !!mpc85xx_gpio_get(1U << gpio);
 }
 
-static inline void gpio_set_value(unsigned gpio, int value)
+static inline int gpio_set_value(unsigned gpio, int value)
 {
 	if (value)
 		mpc85xx_gpio_set_high(1U << gpio);
 	else
 		mpc85xx_gpio_set_low(1U << gpio);
+	return 0;
 }
 
 static inline int gpio_is_valid(int gpio)

Signature · 1 line

2.1.4

York Sun

2015-05-05 16:41 UTC #1 lore raw

PATCH 1/1 powerpc/mpc85xx: Fix compiling error for common/cmd_gpio.c

Quoted 14 lines · Oleksandr G Zhadan

To replicate:
1. add to include/configs/p1_p2_rdb_pc.h "#define CONFIG_CMD_GPIO"
2. run make P1020RDB-PC_defconfig
3. run CROSS_COMPILE=powerpc-linux- make
and you will get:
common/built-in.o: In function `do_gpio':
u-boot/common/cmd_gpio.c:186: undefined reference to gpio_request' u-boot/common/cmd_gpio.c:194: undefined reference to gpio_direction_input' u-boot/common/cmd_gpio.c:195: undefined reference to gpio_get_value' u-boot/common/cmd_gpio.c:200: undefined reference to gpio_get_value' u-boot/common/cmd_gpio.c:203: undefined reference to gpio_direction_output' u-boot/common/cmd_gpio.c:209: undefined reference to gpio_free

Quoted 8 lines

Signed-off-by Michael Durrant <[email protected]>
Signed-off-by Oleksandr G Zhadan <[email protected]>
---
 arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 ++
 arch/powerpc/include/asm/mpc85xx_gpio.h      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

Applied to u-boot-mpc85xx master. Awaiting upstream.

York