From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/10] dm: Move OMAP GPIO driver to drivers/gpio/
Date: Fri, 31 Aug 2012 18:27:23 +0200 [thread overview]
Message-ID: <20120831182723.758ce47f@lilith> (raw)
In-Reply-To: <1342882947-9174-6-git-send-email-marex@denx.de>
Hi Marek,
On Sat, 21 Jul 2012 17:02:23 +0200, Marek Vasut <marex@denx.de> wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: U-Boot DM <u-boot-dm@lists.denx.de>
> Cc: Tom Rini <trini@ti.com>
> ---
> arch/arm/cpu/armv7/omap-common/Makefile
> | 3 ---
> drivers/gpio/Makefile
> | 1 + arch/arm/cpu/armv7/omap-common/gpio.c =>
> drivers/gpio/omap_gpio.c | 0
> include/configs/cm_t35.h
> | 1 +
> include/configs/devkit8000.h
> | 2 ++
> include/configs/dig297.h
> | 1 +
> include/configs/igep00x0.h
> | 1 +
> include/configs/mcx.h
> | 1 +
> include/configs/omap3_beagle.h
> | 1 +
> include/configs/omap3_evm_common.h
> | 1 +
> include/configs/omap3_logic.h
> | 1 +
> include/configs/omap3_mvblx.h
> | 1 +
> include/configs/omap3_overo.h
> | 1 +
> include/configs/omap3_pandora.h
> | 1 +
> include/configs/omap3_zoom2.h
> | 1 +
> include/configs/omap4_common.h
> | 1 +
> include/configs/omap5_evm.h
> | 1 +
> include/configs/tam3517-common.h
> | 1 + 18 files changed, 17 insertions(+), 3 deletions(-) rename
> arch/arm/cpu/armv7/omap-common/gpio.c => drivers/gpio/omap_gpio.c
> (100%)
>
> diff --git a/arch/arm/cpu/armv7/omap-common/Makefile
> b/arch/arm/cpu/armv7/omap-common/Makefile index 2a6625f..d37b22d
> 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile
> +++ b/arch/arm/cpu/armv7/omap-common/Makefile
> @@ -29,9 +29,6 @@ SOBJS := reset.o
>
> COBJS := timer.o
> COBJS += utils.o
> -ifdef CONFIG_OMAP
> -COBJS += gpio.o
> -endif
>
> ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
> COBJS += hwinit-common.o
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index 32a2474..8958bb4 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -40,6 +40,7 @@ COBJS-$(CONFIG_TEGRA_GPIO) += tegra_gpio.o
> COBJS-$(CONFIG_DA8XX_GPIO) += da8xx_gpio.o
> COBJS-$(CONFIG_ALTERA_PIO) += altera_pio.o
> COBJS-$(CONFIG_MPC83XX_GPIO) += mpc83xx_gpio.o
> +COBJS-$(CONFIG_OMAP_GPIO) += omap_gpio.o
>
> COBJS := $(COBJS-y)
> SRCS := $(COBJS:.o=.c)
> diff --git a/arch/arm/cpu/armv7/omap-common/gpio.c
> b/drivers/gpio/omap_gpio.c similarity index 100%
> rename from arch/arm/cpu/armv7/omap-common/gpio.c
> rename to drivers/gpio/omap_gpio.c
> diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
> index ee4bce5..6eeb2d3 100644
> --- a/include/configs/cm_t35.h
> +++ b/include/configs/cm_t35.h
> @@ -37,6 +37,7 @@
> */
> #define CONFIG_OMAP /* in a TI OMAP core */
> #define CONFIG_OMAP34XX /* which is a 34XX */
> +#define CONFIG_OMAP_GPIO
> #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */
>
> #define CONFIG_SYS_TEXT_BASE 0x80008000
> diff --git a/include/configs/devkit8000.h
> b/include/configs/devkit8000.h index 037a5bb..e529099 100644
> --- a/include/configs/devkit8000.h
> +++ b/include/configs/devkit8000.h
> @@ -36,6 +36,8 @@
> #define CONFIG_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3_DEVKIT8000 1 /* working with
> DevKit8000 */ #define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT8000
> +#define CONFIG_OMAP_GPIO
> +
> /*
> * 1MB into the SDRAM to allow for SPL's bss at the beginning of
> SDRAM
> * 64 bytes before this address should be set aside for u-boot.img's
> diff --git a/include/configs/dig297.h b/include/configs/dig297.h
> index 4845d51..f123675 100644
> --- a/include/configs/dig297.h
> +++ b/include/configs/dig297.h
> @@ -45,6 +45,7 @@
> */
> #define CONFIG_OMAP /* in a TI OMAP core */
> #define CONFIG_OMAP34XX /* which is a 34XX */
> +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SYS_TEXT_BASE 0x80008000
>
> diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
> index 88e2e3a..727b800 100644
> --- a/include/configs/igep00x0.h
> +++ b/include/configs/igep00x0.h
> @@ -30,6 +30,7 @@
> */
> #define CONFIG_OMAP 1 /* in a TI OMAP core */
> #define CONFIG_OMAP34XX 1 /* which is a 34XX */
> +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SDRC /* The chip has SDRC controller */
>
> diff --git a/include/configs/mcx.h b/include/configs/mcx.h
> index 970c882..0b75460 100644
> --- a/include/configs/mcx.h
> +++ b/include/configs/mcx.h
> @@ -27,6 +27,7 @@
> #define CONFIG_OMAP /* in a TI OMAP core */
> #define CONFIG_OMAP34XX /* which is a 34XX */
> #define CONFIG_OMAP3_MCX /* working with mcx */
> +#define CONFIG_OMAP_GPIO
>
> #define MACH_TYPE_MCX 3656
> #define CONFIG_MACH_TYPE MACH_TYPE_MCX
> diff --git a/include/configs/omap3_beagle.h
> b/include/configs/omap3_beagle.h index 657780e..382b791 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -34,6 +34,7 @@
> #define CONFIG_OMAP 1 /* in a TI OMAP core */
> #define CONFIG_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3_BEAGLE 1 /* working with BEAGLE */
> +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SDRC /* The chip has SDRC controller */
>
> diff --git a/include/configs/omap3_evm_common.h
> b/include/configs/omap3_evm_common.h index 20192a9..b12ce2e 100644
> --- a/include/configs/omap3_evm_common.h
> +++ b/include/configs/omap3_evm_common.h
> @@ -22,6 +22,7 @@
> */
> #define CONFIG_OMAP /* This is TI OMAP core */
> #define CONFIG_OMAP34XX /* belonging to 34XX
> family */ +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SDRC /* The chip has SDRC
> controller */
> diff --git a/include/configs/omap3_logic.h
> b/include/configs/omap3_logic.h index 2e1e6b9..6d4faed 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -33,6 +33,7 @@
> #define CONFIG_OMAP /* in a TI OMAP core */
> #define CONFIG_OMAP34XX /* which is a 34XX */
> #define CONFIG_OMAP3_LOGIC /* working with Logic OMAP
> boards */ +#define CONFIG_OMAP_GPIO
>
> #undef CONFIG_USE_IRQ /* no support for IRQs
> */
> diff --git a/include/configs/omap3_mvblx.h
> b/include/configs/omap3_mvblx.h index 6a13046..30ca312 100644
> --- a/include/configs/omap3_mvblx.h
> +++ b/include/configs/omap3_mvblx.h
> @@ -39,6 +39,7 @@
> #define CONFIG_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_MVBLX 1 /* working with
> mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX
> +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SDRC /* The chip has SDRC controller */
>
> diff --git a/include/configs/omap3_overo.h
> b/include/configs/omap3_overo.h index d29b326..f6afb7a 100644
> --- a/include/configs/omap3_overo.h
> +++ b/include/configs/omap3_overo.h
> @@ -25,6 +25,7 @@
> #define CONFIG_OMAP /* in a TI OMAP
> core */ #define CONFIG_OMAP34XX /*
> which is a 34XX */ #define
> CONFIG_OMAP3_OVERO /* working with overo */
> +#define CONFIG_OMAP_GPIO
> #define CONFIG_SDRC /* The chip has
> SDRC controller */
> diff --git a/include/configs/omap3_pandora.h
> b/include/configs/omap3_pandora.h index 604b53d..28f8a3e 100644
> --- a/include/configs/omap3_pandora.h
> +++ b/include/configs/omap3_pandora.h
> @@ -29,6 +29,7 @@
> #define CONFIG_OMAP 1 /* in a TI OMAP core */
> #define CONFIG_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3_PANDORA 1 /* working with pandora
> */ +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SDRC /* The chip has SDRC controller */
>
> diff --git a/include/configs/omap3_zoom2.h
> b/include/configs/omap3_zoom2.h index b60ece3..98b93f8 100644
> --- a/include/configs/omap3_zoom2.h
> +++ b/include/configs/omap3_zoom2.h
> @@ -36,6 +36,7 @@
> #define CONFIG_OMAP 1 /* in a TI OMAP core */
> #define CONFIG_OMAP34XX 1 /* which is a 34XX */
> #define CONFIG_OMAP3_ZOOM2 1 /* working with Zoom II */
> +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SDRC /* The chip has SDRC controller */
>
> diff --git a/include/configs/omap4_common.h
> b/include/configs/omap4_common.h index 2192c2b..bc73f21 100644
> --- a/include/configs/omap4_common.h
> +++ b/include/configs/omap4_common.h
> @@ -35,6 +35,7 @@
> #define CONFIG_OMAP 1 /* in a TI OMAP core */
> #define CONFIG_OMAP44XX 1 /* which is a 44XX */
> #define CONFIG_OMAP4430 1 /* which is in a
> 4430 */ +#define CONFIG_OMAP_GPIO
>
> /* Get CPU defs */
> #include <asm/arch/cpu.h>
> diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
> index c5874bb..0884280 100644
> --- a/include/configs/omap5_evm.h
> +++ b/include/configs/omap5_evm.h
> @@ -38,6 +38,7 @@
> #define CONFIG_OMAP54XX /* which is a 54XX */
> #define CONFIG_OMAP5430 /* which is in a 5430 */
> #define CONFIG_5430EVM /* working with EVM */
> +#define CONFIG_OMAP_GPIO
>
> /* Get CPU defs */
> #include <asm/arch/cpu.h>
> diff --git a/include/configs/tam3517-common.h
> b/include/configs/tam3517-common.h index 777f77c..94006e7 100644
> --- a/include/configs/tam3517-common.h
> +++ b/include/configs/tam3517-common.h
> @@ -27,6 +27,7 @@
> */
> #define CONFIG_OMAP /* in a TI OMAP core */
> #define CONFIG_OMAP34XX /* which is a 34XX */
> +#define CONFIG_OMAP_GPIO
>
> #define CONFIG_SYS_TEXT_BASE 0x80008000
>
When applied on top of u-boot-arm/master, this patch causes a raise
in build failures. With master:
--------------------- SUMMARY ----------------------------
Boards compiled: 315
Boards with warnings but no errors: 2 ( VCMA9 smdk2410 )
----------------------------------------------------------
With master + this patch:
--------------------- SUMMARY ----------------------------
Boards compiled: 315
Boards with errors: 23 ( mcx igep0030_nand omap3_evm_quick_nand
omap3_evm omap3_pandora omap3_overo omap5_evm omap4_panda mt_ventoux
igep0020_nand omap4_sdp4430 twister omap3_zoom2 igep0030 igep0020
omap3_evm_quick_mmc cm_t35 omap3_beagle am335x_evm dig297 omap3_logic
omap3_mvblx devkit8000 )
Boards with warnings but no errors: 2 ( VCMA9 smdk2410 )
----------------------------------------------------------
Typical diagnostics:
/home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:
In function
`gpio_set_value': /home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:146:
multiple definition of
`gpio_set_value' /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:/home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:146:
first defined
here /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:
In function
`gpio_get_value': /home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:161:
multiple definition of
`gpio_get_value' /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:/home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:161:
first defined
here /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:
In function
`gpio_direction_input': /home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:195:
multiple definition of
`gpio_direction_input' /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:/home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:195:
first defined
here /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:
In function
`gpio_direction_output': /home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:211:
multiple definition of
`gpio_direction_output' /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:/home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:211:
first defined
here /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:
In function
`gpio_request': /home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:230:
multiple definition of
`gpio_request' /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:/home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:230:
first defined
here /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:
In function
`gpio_free': /home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:243:
multiple definition of
`gpio_free' /home/albert/src/u-boot-arm/build/omap4_panda/drivers/gpio/omap_gpio.o:/home/albert/src/u-boot-arm/drivers/gpio/omap_gpio.c:243:
first defined here
Am I missing some dependency of this patch?
Amicalement,
--
Albert.
next prev parent reply other threads:[~2012-08-31 16:27 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 15:02 [U-Boot] [PATCH 01/10] dm: arm: Remove support for lpc2292 Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 02/10] dm: arm: Remove support for s3c4510 Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 03/10] dm: arm: Remove support for NETARM Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 04/10] dm: wdt: arm: Move tnetv107x into drivers/watchdog/ Marek Vasut
2012-10-18 4:53 ` Albert ARIBAUD
2012-07-21 15:02 ` [U-Boot] [PATCH 05/10] dm: Move s3c24xx USB driver to a proper place Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 06/10] dm: Move OMAP GPIO driver to drivers/gpio/ Marek Vasut
2012-07-23 20:31 ` Tom Rini
2012-08-31 16:27 ` Albert ARIBAUD [this message]
2012-08-31 16:33 ` Tom Rini
2012-08-31 17:28 ` Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 07/10] dm: wdt: Move s5p watchdog timer to drivers/watchdog/ Marek Vasut
2012-10-26 7:33 ` Minkyu Kang
2012-10-26 10:23 ` Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 08/10] dm: tegra: Staticize local functions in usb.c Marek Vasut
2012-07-24 6:20 ` Simon Glass
2012-07-24 6:24 ` Marek Vasut
2012-07-24 15:50 ` Tom Warren
2012-07-24 19:42 ` Marek Vasut
2012-07-24 21:35 ` Tom Warren
2012-07-24 6:22 ` Simon Glass
2012-07-21 15:02 ` [U-Boot] [PATCH 09/10] dm: net: Move IXP NPE to drivers/net/ Marek Vasut
2012-09-28 15:50 ` [U-Boot] [U-Boot-DM] " Joe Hershberger
2012-07-21 15:02 ` [U-Boot] [PATCH 10/10] dm: Select CONFIG_SPL_GPIO_SUPPORT on OMAP Marek Vasut
[not found] ` <CAP9ODKqfcWr7EcM+B5DD1Q8Rimg+1g7qpkgwa2rzf7WPm_a53A@mail.gmail.com>
2012-07-21 17:50 ` Marek Vasut
2012-07-21 17:53 ` Otavio Salvador
2012-07-21 17:58 ` Marek Vasut
2012-07-21 18:02 ` Otavio Salvador
2012-07-23 20:33 ` Tom Rini
2012-07-23 22:03 ` Marek Vasut
2012-08-03 16:10 ` [U-Boot] [U-Boot-DM] " Tom Rini
2012-08-03 18:56 ` Marek Vasut
2012-09-02 15:33 ` [U-Boot] [PATCH 01/10] dm: arm: Remove support for lpc2292 Wolfgang Denk
2012-09-02 16:15 ` Marek Vasut
2012-09-02 20:26 ` Wolfgang Denk
2012-09-02 20:58 ` Marek Vasut
2012-09-05 22:55 ` Tom Rini
2012-09-06 2:44 ` Marek Vasut
2012-09-06 15:56 ` Tom Rini
2012-09-06 23:14 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120831182723.758ce47f@lilith \
--to=albert.u.boot@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox