diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-26 08:24:25 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-26 08:56:12 +0200 |
commit | 89d6164660f922e4d90aa02a73f068b2f9aed558 (patch) | |
tree | 8fadef9ffb4661209004525f43cebe393d3bf5db | |
parent | 5696a16f1044b2a6f4ed67a5efa95b9bf67a5fda (diff) | |
download | barebox-89d6164660f922e4d90aa02a73f068b2f9aed558.tar.gz barebox-89d6164660f922e4d90aa02a73f068b2f9aed558.tar.xz |
ARM omap: pbl fixes
Omap3 pbl build may need omap3_clock.c. Also, do not use add_generic_device
in pbl
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-omap/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap/omap3_generic.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile index f752bc7986..3a6d50cd81 100644 --- a/arch/arm/mach-omap/Makefile +++ b/arch/arm/mach-omap/Makefile @@ -23,6 +23,7 @@ pbl-$(CONFIG_ARCH_OMAP3) += omap3_core.o omap3_generic.o auxcr.o obj-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o pbl-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o obj-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o +pbl-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o obj-$(CONFIG_OMAP_GPMC) += gpmc.o devices-gpmc-nand.o obj-$(CONFIG_SHELL_NONE) += xload.o obj-$(CONFIG_I2C_TWL6030) += omap4_twl6030_mmc.o diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 10eeacdc80..1e1308ec6a 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -512,6 +512,7 @@ const struct gpmc_config omap3_nand_cfg = { .size = GPMC_SIZE_16M, }; +#ifndef __PBL__ static int omap3_gpio_init(void) { add_generic_device("omap-gpio", 0, NULL, 0x48310000, @@ -530,3 +531,4 @@ static int omap3_gpio_init(void) return 0; } coredevice_initcall(omap3_gpio_init); +#endif |