[U-Boot] [PATCH 0/6] Blackfin fixes for 2009.08

[U-Boot] [PATCH 0/6] Blackfin fixes for 2009.08

[Mike Frysinger]

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(-)

[U-Boot] [PATCH 1/6] Blackfin: bump up default JTAG console timeout

[Mike Frysinger]

From: Vivi Li <vivi.li@analog.com>

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.

Signed-off-by: Vivi Li <vivi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 cpu/blackfin/jtag-console.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpu/blackfin/jtag-console.c b/cpu/blackfin/jtag-console.c
index d58582f..c995d96 100644
--- a/cpu/blackfin/jtag-console.c
+++ b/cpu/blackfin/jtag-console.c
@@ -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. */
-- 
1.6.3.1

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[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.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index d01cc48..8471828 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
1.6.3.1

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

[Mike Frysinger]

From: Vivi Li <vivi.li@analog.com>

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.

Signed-off-by: Vivi Li <vivi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/configs/bf533-stamp.h |    4 ++--
 include/configs/bf537-stamp.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 579540e..9b22f2d 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -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
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index e883f2e..8e06844 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -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
-- 
1.6.3.1

[U-Boot] [PATCH 3/6] Blackfin: bf548-ezkit: bump up monitor size

[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.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/configs/bf548-ezkit.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 4e2ee62..fa90f91 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -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)
 
 
-- 
1.6.3.1

[U-Boot] [PATCH 4/6] Blackfin: enable -O2 in lib_generic/ for ADI/Bluetechnix boards

[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.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 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(-)

diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index eaa09ff..f85bef5 100644
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -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))
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index eaa09ff..f85bef5 100644
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -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))
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index eaa09ff..f85bef5 100644
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -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))
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index 9847924..3c0b46f 100644
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -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))
diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index 9847924..3c0b46f 100644
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -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))
diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index d9e884e..bc14257 100644
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -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
diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index 9847924..3c0b46f 100644
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -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))
diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index 95ab6b3..42ff946 100644
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -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
diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index 77c888b..cfad21a 100644
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -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))
diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index eaa09ff..f85bef5 100644
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -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))
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index 9847924..3c0b46f 100644
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -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))
diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index 9847924..3c0b46f 100644
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -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))
diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index 396f20a..0c95b39 100644
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -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
diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index 77c888b..cfad21a 100644
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -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))
diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index 9847924..3c0b46f 100644
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -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))
-- 
1.6.3.1

[U-Boot] [PATCH 5/6] Blackfin: fix SPI flash speed define name

[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.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 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(-)

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index bc7ac5d..3db8171 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -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
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index db68a7b..97853af 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -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
 
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index f481c79..0d02354 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -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
 
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 9b22f2d..c03561c 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -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
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index b01197b..23c2d33 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -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
 
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 284c7fc..0f908ef 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -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
 
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index c1bff3e..727b7e7 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -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
 
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 8e06844..0a86e83 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -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
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 91622e3..535687f 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -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
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index fa90f91..dbcd2af 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -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
 
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 9cbc17a..1e4c716 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -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
 
-- 
1.6.3.1

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

[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.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile           |    4 +---
 blackfin_config.mk |    6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index acec1a0..bcc81c9 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
diff --git a/blackfin_config.mk b/blackfin_config.mk
index 989e976..821f082 100644
--- a/blackfin_config.mk
+++ b/blackfin_config.mk
@@ -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
-- 
1.6.3.1

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[Mike Frysinger]

erp, globbed too many files when sending out
-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/20090615/cdffdaf2/attachment.pgp 

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[Wolfgang Denk]

Dear Mike Frysinger,

In message <200906151443.41007.vapier@gentoo.org> you wrote:
>
> erp, globbed too many files when sending out

What does that mean?

Best regards,

Wolfgang Denk

-- 
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_

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[Mike Frysinger]

On Monday 15 June 2009 15:08:10 Wolfgang Denk wrote:
> Dear Mike Frysinger,
>
> In message <200906151443.41007.vapier@gentoo.org> 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 

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[Wolfgang Denk]

Dear Mike Frysinger,

In message <200906160057.28158.vapier@gentoo.org> you wrote:
>
> > > 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

-- 
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!

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[Mike Frysinger]

On Tuesday 16 June 2009 14:35:02 Wolfgang Denk wrote:
> Mike Frysinger wrote:
> > > > 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 

[U-Boot] [PATCH] kallsyms: fix escaping of NUL char in strings

[Wolfgang Denk]

Dear Mike Frysinger,

In message <1245087445-14960-3-git-send-email-vapier@gentoo.org> 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.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
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.