Merge branch 'master' of git://git.denx.de/u-boot-blackfin
This commit is contained in:
commit
e6e1fb3050
@ -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
|
||||
|
||||
|
@ -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))
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user