summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-22 22:36:42 +0200
committerWolfgang Denk <wd@denx.de>2010-09-22 22:36:42 +0200
commite6e1fb3050351ae96153b1ba6a5bd0a2d745794b (patch)
tree86ce127f1a1d6fef7e548815f0e232d76b78c259
parentd1475d8aab7a6ab7ea7534a98bd20e59f150c2e3 (diff)
parent55fed6fd0b292b37df2a17aeca732194d99440a5 (diff)
downloadu-boot-imx-e6e1fb3050351ae96153b1ba6a5bd0a2d745794b.zip
u-boot-imx-e6e1fb3050351ae96153b1ba6a5bd0a2d745794b.tar.gz
u-boot-imx-e6e1fb3050351ae96153b1ba6a5bd0a2d745794b.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
-rw-r--r--arch/blackfin/include/asm/config-pre.h3
-rw-r--r--board/bf527-ad7160-eval/config.mk4
-rw-r--r--board/ip04/config.mk4
-rw-r--r--drivers/spi/bfin_spi.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/arch/blackfin/include/asm/config-pre.h b/arch/blackfin/include/asm/config-pre.h
index 4531519..4ce67d4 100644
--- a/arch/blackfin/include/asm/config-pre.h
+++ b/arch/blackfin/include/asm/config-pre.h
@@ -71,6 +71,9 @@ static inline const char *get_bfin_boot_mode(int bfin_boot)
# define BFIN_BOOT_SPI_SSEL 1
#endif
+/* Define to get a GPIO CS with the Blackfin SPI controller */
+#define MAX_CTRL_CS 8
+
/* There is no Blackfin/NetBSD port */
#undef CONFIG_BOOTM_NETBSD
diff --git a/board/bf527-ad7160-eval/config.mk b/board/bf527-ad7160-eval/config.mk
index f85bef5..3f9d41f 100644
--- a/board/bf527-ad7160-eval/config.mk
+++ b/board/bf527-ad7160-eval/config.mk
@@ -26,8 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/ip04/config.mk b/board/ip04/config.mk
index bc14257..5766829 100644
--- a/board/ip04/config.mk
+++ b/board/ip04/config.mk
@@ -26,8 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index e0ad029..556b97a 100644
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -35,8 +35,6 @@ MAKE_SPI_FUNC(SPI_BAUD, 0x14)
#define to_bfin_spi_slave(s) container_of(s, struct bfin_spi_slave, slave)
-#define MAX_CTRL_CS 7
-
#define gpio_cs(cs) ((cs) - MAX_CTRL_CS)
#ifdef CONFIG_BFIN_SPI_GPIO_CS
# define is_gpio_cs(cs) ((cs) > MAX_CTRL_CS)