On Thu, Jan 24, 2008 at 11:01:30AM -0600, Kim Phillips wrote:
On Thu, 24 Jan 2008 10:50:09 -0600 "Andy Fleming" afleming@gmail.com wrote:
On Jan 24, 2008 10:33 AM, Peter Pearse peter.pearse@arm.com wrote:
+#if defined(CONFIG_MPC834X) || \
defined(CONFIG_MPC8313) || \defined(CONFIG_MPC8315) || \defined(CONFIG_MPC837X)#include <asm/mpc8xxx_spi.h> +#endif
#ifdef CONFIG_HARD_SPI
does Vlad's post not work for you?:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/35888
Ping? Above bug is still present in current git. And while there what about fixing it this way? (controling mpc8xxx_spi compilation with CONFIG_HARD_SPI is a bit misleading, but lets fix it with separate patch. Any CONFIG_* name proposals?)
Signed-off-by: Ladislav Michl ladis@linux-mips.org
* Convert drivers/spi/Makefile to use CONFIG_ fixes "<asm/mpc8xxx_spi.h> is only available for ppc board" bug
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 0b7a2df..6403a1c 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libspi.a
-COBJS-y += mpc8xxx_spi.o +COBJS-$(CONFIG_HARD_SPI) += mpc8xxx_spi.o
COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index a3d1c95..5635047 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -25,8 +25,6 @@ #include <spi.h> #include <asm/mpc8xxx_spi.h>
-#ifdef CONFIG_HARD_SPI - #define SPI_EV_NE (0x80000000 >> 22) /* Receiver Not Empty */ #define SPI_EV_NF (0x80000000 >> 23) /* Transmitter Not Full */
@@ -140,4 +138,3 @@ int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
return 0; } -#endif /* CONFIG_HARD_SPI */