Skip to contentSkip to conversation

Blackfin fixes for 2009.08

PATCH New Mike Frysinger 2 participants 14 messages Jun 15, 2009 – Jul 10, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

cover Blackfin fixes for 2009.08

A few fixes and tweaks to use latest code in master.

Mike Frysinger (4):
Blackfin: bf548-ezkit: bump up monitor size
Blackfin: enable -O2 in lib_generic/ for ADI/Bluetechnix boards
Blackfin: fix SPI flash speed define name
Blackfin: move ALL += u-boot.ldr to blackfin_config.mk

Vivi Li (2):
Blackfin: bump up default JTAG console timeout
Blackfin: bf533-stamp/bf537-stamp: fix env settings for SPI flash

 Makefile                         |    4 +---
 blackfin_config.mk               |    6 ++++--
 board/bf518f-ezbrd/config.mk     |    3 +++
 board/bf526-ezbrd/config.mk      |    3 +++
 board/bf527-ezkit/config.mk      |    3 +++
 board/bf533-ezkit/config.mk      |    3 +++
 board/bf533-stamp/config.mk      |    3 +++
 board/bf537-stamp/config.mk      |    3 +++
 board/bf538f-ezkit/config.mk     |    3 +++
 board/bf548-ezkit/config.mk      |    3 +++
 board/bf561-ezkit/config.mk      |    3 +++
 board/cm-bf527/config.mk         |    3 +++
 board/cm-bf533/config.mk         |    3 +++
 board/cm-bf537e/config.mk        |    3 +++
 board/cm-bf548/config.mk         |    3 +++
 board/cm-bf561/config.mk         |    3 +++
 board/tcm-bf537/config.mk        |    3 +++
 cpu/blackfin/jtag-console.c      |    2 +-
 include/configs/bf518f-ezbrd.h   |    2 +-
 include/configs/bf526-ezbrd.h    |    2 +-
 include/configs/bf527-ezkit.h    |    2 +-
 include/configs/bf533-stamp.h    |    6 +++---
 include/configs/bf537-minotaur.h |    2 +-
 include/configs/bf537-pnav.h     |    2 +-
 include/configs/bf537-srv1.h     |    2 +-
 include/configs/bf537-stamp.h    |    6 +++---
 include/configs/bf538f-ezkit.h   |    2 +-
 include/configs/bf548-ezkit.h    |    4 ++--
 include/configs/blackstamp.h     |    2 +-
 29 files changed, 67 insertions(+), 22 deletions(-)
#1 lore raw

PATCH 1/6 Blackfin: bump up default JTAG console timeout

From: Vivi Li <[email protected]>

The debug tools that interface with the other side of the JTAG console got much slower when generalizing things, so bump up the default timeout value on the U-Boot side to cope. Hopefully at some point we can improve the debug tools to speed things back up.

---
 cpu/blackfin/jtag-console.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
cpu/blackfin/jtag-console.c +1 -1
index d58582f..c995d96 100644
@@ -11,7 +11,7 @@
 #include <asm/blackfin.h>
 
 #ifndef CONFIG_JTAG_CONSOLE_TIMEOUT
-# define CONFIG_JTAG_CONSOLE_TIMEOUT 100
+# define CONFIG_JTAG_CONSOLE_TIMEOUT 500
 #endif
 
 /* The Blackfin tends to be much much faster than the JTAG hardware. */
Signature · 1 line
1.6.3.1
#2 lore raw

PATCH 1/1 kallsyms: fix escaping of NUL char in strings

In reply to Mike Frysinger

The current kallsyms code is using \\0 to escape the backslash in the awk code, but the shell too needs escaping. This way we make sure gcc is passed the \0. Then gcc itself will consume this as an octal, so we have to use 000 so gcc will create the final NUL.

---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Makefile +1 -1
index d01cc48..8471828 100644
@@ -312,7 +312,7 @@ GEN_UBOOT = \
 $(obj)u-boot:		depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT)
 		$(GEN_UBOOT)
 ifeq ($(CONFIG_KALLSYMS),y)
-		smap=`$(call SYSTEM_MAP,u-boot) | awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\0"}'` ; \
+		smap=`$(call SYSTEM_MAP,u-boot) | awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
 		$(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" -c common/system_map.c -o $(obj)common/system_map.o
 		$(GEN_UBOOT) $(obj)common/system_map.o
 endif
Signature · 1 line
1.6.3.1
#4 lore raw

PATCH 1/1 kallsyms: fix escaping of NUL char in strings

Dear Mike Frysinger,

Quoted 2 lines · In message <[email protected]> you wrote:

erp, globbed too many files when sending out

What does that mean?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
He'd been wrong, there _was_ a light at the end of the tunnel, and it
was a flamethrower.                         - Terry Pratchett, _Mort_
#5 lore raw

PATCH 1/1 kallsyms: fix escaping of NUL char in strings

Quoted 6 lines · On Monday 15 June 2009 15:08:10 Wolfgang Denk wrote:

Dear Mike Frysinger,

Quoted 1 line · In message <[email protected]> you wrote:

erp, globbed too many files when sending out

What does that mean?

it means this patch isnt part of this small series
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090616/81a39f1e/attachment.pgp

#6 lore raw

PATCH 1/1 kallsyms: fix escaping of NUL char in strings

Dear Mike Frysinger,

Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 4 lines
Quoted 2 lines

erp, globbed too many files when sending out

What does that mean?

it means this patch isnt part of this small series

Ah, OK - but the patch as submitted is ok, right?

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Star Trek Lives!
#7 lore raw

PATCH 1/1 kallsyms: fix escaping of NUL char in strings

Quoted 8 lines · On Tuesday 16 June 2009 14:35:02 Wolfgang Denk wrote:
Quoted 5 lines · Mike Frysinger
Quoted 3 lines
Quoted 1 line

erp, globbed too many files when sending out

What does that mean?

it means this patch isnt part of this small series

Ah, OK - but the patch as submitted is ok, right?

yeah, the patch should be merged :)
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090616/f3d3957b/attachment.pgp

#8 lore raw

PATCH 1/1 kallsyms: fix escaping of NUL char in strings

In reply to Mike Frysinger

Dear Mike Frysinger,

Quoted 9 lines · In message <[email protected]> you wrote:

The current kallsyms code is using \\0 to escape the backslash in the awk code, but the shell too needs escaping. This way we make sure gcc is passed the \0. Then gcc itself will consume this as an octal, so we have to use 000 so gcc will create the final NUL.

---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Good morning. This is the telephone company. Due  to  repairs,  we're
giving  you  advance notice that your service will be cut off indefi-
nitely at ten o'clock. That's two minutes from now.
#9 lore raw

PATCH 2/6 Blackfin: bf533-stamp/bf537-stamp: fix env settings for SPI flash

In reply to Mike Frysinger

From: Vivi Li <[email protected]>

The SPI flash layer is much stricter about sector usage than the eeprom layer we used to use, so update the env settings to better match the sector alignment of the flashes we use.

---
 include/configs/bf533-stamp.h |    4 ++--
 include/configs/bf537-stamp.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/bf533-stamp.h +2 -2
index 579540e..9b22f2d 100644
@@ -102,9 +102,9 @@
  */
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_OFFSET	0x4000
+#define CONFIG_ENV_OFFSET	0x10000
 #define CONFIG_ENV_SIZE		0x2000
-#define CONFIG_ENV_SECT_SIZE	0x2000
+#define CONFIG_ENV_SECT_SIZE	0x10000
 #else
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OFFSET	0x4000
include/configs/bf537-stamp.h +2 -2
index e883f2e..8e06844 100644
@@ -100,9 +100,9 @@
  */
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_OFFSET	0x4000
+#define CONFIG_ENV_OFFSET	0x10000
 #define CONFIG_ENV_SIZE		0x2000
-#define CONFIG_ENV_SECT_SIZE	0x2000
+#define CONFIG_ENV_SECT_SIZE	0x10000
 #else
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OFFSET	0x4000
Signature · 1 line
1.6.3.1
#10 lore raw

PATCH 3/6 Blackfin: bf548-ezkit: bump up monitor size

In reply to Mike Frysinger

The latest version of U-Boot got a bit fatter in the BSS section which caused overflows in the RAM region, so increase the monitor size.

---
 include/configs/bf548-ezkit.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/bf548-ezkit.h +1 -1
index 4e2ee62..fa90f91 100644
@@ -61,7 +61,7 @@
 #define CONFIG_EBIU_FCTL_VAL	(BCLK_4)
 #define CONFIG_EBIU_MODE_VAL	(B0MODE_FLASH)
 
-#define CONFIG_SYS_MONITOR_LEN	(768 * 1024)
+#define CONFIG_SYS_MONITOR_LEN	(1024 * 1024)
 #define CONFIG_SYS_MALLOC_LEN	(768 * 1024)
 
 
Signature · 1 line
1.6.3.1
#11 lore raw

PATCH 4/6 Blackfin: enable -O2 in lib_generic/ for ADI/Bluetechnix boards

In reply to Mike Frysinger

Building the compression code in lib_generic/ with -O2 rather than -Os gives a nice speed boost without too much code size increase.

---
 board/bf518f-ezbrd/config.mk |    3 +++
 board/bf526-ezbrd/config.mk  |    3 +++
 board/bf527-ezkit/config.mk  |    3 +++
 board/bf533-ezkit/config.mk  |    3 +++
 board/bf533-stamp/config.mk  |    3 +++
 board/bf537-stamp/config.mk  |    3 +++
 board/bf538f-ezkit/config.mk |    3 +++
 board/bf548-ezkit/config.mk  |    3 +++
 board/bf561-ezkit/config.mk  |    3 +++
 board/cm-bf527/config.mk     |    3 +++
 board/cm-bf533/config.mk     |    3 +++
 board/cm-bf537e/config.mk    |    3 +++
 board/cm-bf548/config.mk     |    3 +++
 board/cm-bf561/config.mk     |    3 +++
 board/tcm-bf537/config.mk    |    3 +++
 15 files changed, 45 insertions(+), 0 deletions(-)
board/bf518f-ezbrd/config.mk +3 -0
index eaa09ff..f85bef5 100644
@@ -26,5 +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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf526-ezbrd/config.mk +3 -0
index eaa09ff..f85bef5 100644
@@ -26,5 +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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf527-ezkit/config.mk +3 -0
index eaa09ff..f85bef5 100644
@@ -26,5 +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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf533-ezkit/config.mk +3 -0
index 9847924..3c0b46f 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf533-stamp/config.mk +3 -0
index 9847924..3c0b46f 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf537-stamp/config.mk +3 -0
index d9e884e..bc14257 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
board/bf538f-ezkit/config.mk +3 -0
index 9847924..3c0b46f 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf548-ezkit/config.mk +3 -0
index 95ab6b3..42ff946 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
 LDR_FLAGS-BFIN_BOOT_FIFO       := --dma 1
board/bf561-ezkit/config.mk +3 -0
index 77c888b..cfad21a 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf527/config.mk +3 -0
index eaa09ff..f85bef5 100644
@@ -26,5 +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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf533/config.mk +3 -0
index 9847924..3c0b46f 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf537e/config.mk +3 -0
index 9847924..3c0b46f 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf548/config.mk +3 -0
index 396f20a..0c95b39 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
 LDR_FLAGS-BFIN_BOOT_FIFO       := --dma 1
board/cm-bf561/config.mk +3 -0
index 77c888b..cfad21a 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/tcm-bf537/config.mk +3 -0
index 9847924..3c0b46f 100644
@@ -26,6 +26,9 @@
 # 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
+
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
Signature · 1 line
1.6.3.1
#12 lore raw

PATCH 5/6 Blackfin: fix SPI flash speed define name

In reply to Mike Frysinger

The SPI flash define is named CONFIG_SF_DEFAULT_SPEED, not CONFIG_SF_DEFAULT_HZ, so fix the typos in the Blackfin boards.

---
 include/configs/bf518f-ezbrd.h   |    2 +-
 include/configs/bf526-ezbrd.h    |    2 +-
 include/configs/bf527-ezkit.h    |    2 +-
 include/configs/bf533-stamp.h    |    2 +-
 include/configs/bf537-minotaur.h |    2 +-
 include/configs/bf537-pnav.h     |    2 +-
 include/configs/bf537-srv1.h     |    2 +-
 include/configs/bf537-stamp.h    |    2 +-
 include/configs/bf538f-ezkit.h   |    2 +-
 include/configs/bf548-ezkit.h    |    2 +-
 include/configs/blackstamp.h     |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
include/configs/bf518f-ezbrd.h +1 -1
index bc7ac5d..3db8171 100644
@@ -88,7 +88,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SPI_FLASH_STMICRO
include/configs/bf526-ezbrd.h +1 -1
index db68a7b..97853af 100644
@@ -106,7 +106,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 
include/configs/bf527-ezkit.h +1 -1
index f481c79..0d02354 100644
@@ -105,7 +105,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
include/configs/bf533-stamp.h +1 -1
index 9b22f2d..c03561c 100644
@@ -89,7 +89,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_SPANSION
include/configs/bf537-minotaur.h +1 -1
index b01197b..23c2d33 100644
@@ -104,7 +104,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
include/configs/bf537-pnav.h +1 -1
index 284c7fc..0f908ef 100644
@@ -85,7 +85,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
include/configs/bf537-srv1.h +1 -1
index c1bff3e..727b7e7 100644
@@ -104,7 +104,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
include/configs/bf537-stamp.h +1 -1
index 8e06844..0a86e83 100644
@@ -87,7 +87,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_SPANSION
include/configs/bf538f-ezkit.h +1 -1
index 91622e3..535687f 100644
@@ -83,7 +83,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_SPANSION
include/configs/bf548-ezkit.h +1 -1
index fa90f91..dbcd2af 100644
@@ -93,7 +93,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
include/configs/blackstamp.h +1 -1
index 9cbc17a..1e4c716 100644
@@ -247,7 +247,7 @@
 #define CONFIG_BFIN_SPI
 /* For the M25P64 SCK Should be Kept < 20Mhz */
 #define CONFIG_ENV_SPI_MAX_HZ	20000000
-#define CONFIG_SF_DEFAULT_HZ	20000000
+#define CONFIG_SF_DEFAULT_SPEED	20000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
Signature · 1 line
1.6.3.1
#13 lore raw

PATCH 6/6 Blackfin: move ALL += u-boot.ldr to blackfin_config.mk

In reply to Mike Frysinger

The way the ALL variable is used allows for config.mk's to add more targets themselves without having to clutter up the top level Makefile.

---
 Makefile           |    4 +---
 blackfin_config.mk |    6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)
Makefile +1 -3
index acec1a0..bcc81c9 100644
@@ -306,10 +306,8 @@ __LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
 #########################################################################
 #########################################################################
 
+# Always append ALL so that arch config.mk's can add custom ones
 ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
-ifeq ($(ARCH),blackfin)
-ALL += $(obj)u-boot.ldr
-endif
 
 all:		$(ALL)
 
blackfin_config.mk +4 -2
index 989e976..821f082 100644
@@ -36,6 +36,10 @@ ifneq (,$(CONFIG_BFIN_CPU))
 PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
 endif
 
+ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
+ALL += $(obj)u-boot.ldr
+endif
+
 SYM_PREFIX = _
 
 LDR_FLAGS-y :=
@@ -43,14 +47,12 @@ LDR_FLAGS-$(CONFIG_BFIN_BOOTROM_USES_EVT1) += -J
 
 LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE))
 LDR_FLAGS += --use-vmas
-ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
 LDR_FLAGS += --initcode $(obj)cpu/$(CPU)/initcode.o
 ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART)
 ifneq ($(ENV_IS_EMBEDDED_CUSTOM),ENV_IS_EMBEDDED_CUSTOM)
 LDR_FLAGS += --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o
 endif
 endif
-endif
 ifneq (,$(findstring s,$(MAKEFLAGS)))
 LDR_FLAGS += --quiet
 endif
Signature · 1 line
1.6.3.1