* [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06
@ 2011-05-24 3:30 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 1/7] Blackfin: use common LDSCRIPT logic Mike Frysinger
` (7 more replies)
0 siblings, 8 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
Mostly a few simple fixes noticed after the 2011.06 merge window, or due
to patches merged in that period.
Harald Krapfenbauer (3):
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
Mike Frysinger (4):
Blackfin: use common LDSCRIPT logic
Blackfin: use on-chip reset func with newer parts
Blackfin: bf548-ezkit/bf561-ezkit: update env location
Blackfin: boards: build zlib dir with -O2
arch/blackfin/config.mk | 4 -
arch/blackfin/cpu/reset.c | 70 ++++++++++----------
arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} | 0
board/bct-brettl2/config.mk | 1 +
board/bf518f-ezbrd/config.mk | 1 +
board/bf526-ezbrd/config.mk | 1 +
board/bf527-ad7160-eval/config.mk | 1 +
board/bf527-ezkit/config.mk | 1 +
board/bf527-sdp/config.mk | 1 +
board/bf533-ezkit/config.mk | 1 +
board/bf533-stamp/config.mk | 1 +
board/bf537-stamp/config.mk | 1 +
board/bf538f-ezkit/config.mk | 1 +
board/bf548-ezkit/config.mk | 1 +
board/bf561-acvilon/config.mk | 1 +
board/bf561-ezkit/config.mk | 1 +
board/cm-bf527/config.mk | 1 +
board/cm-bf533/config.mk | 1 +
board/cm-bf537e/cm-bf537e.c | 34 ++++++----
board/cm-bf537e/config.mk | 1 +
board/cm-bf537u/cm-bf537u.c | 39 ++++++-----
board/cm-bf537u/config.mk | 1 +
board/cm-bf548/config.mk | 1 +
board/cm-bf561/config.mk | 1 +
board/ip04/config.mk | 1 +
board/tcm-bf518/config.mk | 1 +
board/tcm-bf537/config.mk | 1 +
board/tcm-bf537/tcm-bf537.c | 34 ++++++----
include/configs/bf548-ezkit.h | 10 ++--
include/configs/bf561-ezkit.h | 23 +------
include/configs/cm-bf537e.h | 31 +++++++--
include/configs/cm-bf537u.h | 35 +++++++---
include/configs/tcm-bf537.h | 31 +++++++--
33 files changed, 200 insertions(+), 133 deletions(-)
rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%)
--
1.7.5.rc3
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 1/7] Blackfin: use common LDSCRIPT logic
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
@ 2011-05-24 3:30 ` Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 2/7] Blackfin: use on-chip reset func with newer parts Mike Frysinger
` (6 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
Now that common code is a bit smarter when it comes to default LDSCRIPT
values, rename the default Blackfin file and drop the Blackfin-specific
config.mk logic.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
arch/blackfin/config.mk | 4 ----
arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} | 0
2 files changed, 0 insertions(+), 4 deletions(-)
rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%)
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index f0909e9..71fd53f 100644
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -76,10 +76,6 @@ LDR_FLAGS += $(LDR_FLAGS-y)
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
-ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
-LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S
-endif
-
ifneq ($(CONFIG_SYS_TEXT_BASE),)
$(error do not set CONFIG_SYS_TEXT_BASE for Blackfin boards)
endif
diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/cpu/u-boot.lds
similarity index 100%
rename from arch/blackfin/lib/u-boot.lds.S
rename to arch/blackfin/cpu/u-boot.lds
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/7] Blackfin: use on-chip reset func with newer parts
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 1/7] Blackfin: use common LDSCRIPT logic Mike Frysinger
@ 2011-05-24 3:30 ` Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 3/7] Blackfin: bf548-ezkit/bf561-ezkit: update env location Mike Frysinger
` (5 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
Turns out the documentation is wrong and doing "RAISE 1" does not result
in a software reset, only a core reset. So when the on-chip rom has a
functioning reset helper, use it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
arch/blackfin/cpu/reset.c | 70 ++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/arch/blackfin/cpu/reset.c b/arch/blackfin/cpu/reset.c
index 9307e9f..e23dcc7 100644
--- a/arch/blackfin/cpu/reset.c
+++ b/arch/blackfin/cpu/reset.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <asm/blackfin.h>
+#include <asm/mach-common/bits/bootrom.h>
#include "cpu.h"
/* A system soft reset makes external memory unusable so force
@@ -29,46 +30,40 @@ static void bfin_reset(void)
*/
__builtin_bfin_ssync();
- /* The bootrom checks to see how it was reset and will
- * automatically perform a software reset for us when
- * it starts executing after the core reset.
- */
- if (ANOMALY_05000353 || ANOMALY_05000386) {
- /* Initiate System software reset. */
- bfin_write_SWRST(0x7);
+ /* Initiate System software reset. */
+ bfin_write_SWRST(0x7);
- /* Due to the way reset is handled in the hardware, we need
- * to delay for 10 SCLKS. The only reliable way to do this is
- * to calculate the CCLK/SCLK ratio and multiply 10. For now,
- * we'll assume worse case which is a 1:15 ratio.
- */
- asm(
- "LSETUP (1f, 1f) LC0 = %0\n"
- "1: nop;"
- :
- : "a" (15 * 10)
- : "LC0", "LB0", "LT0"
- );
+ /* Due to the way reset is handled in the hardware, we need
+ * to delay for 10 SCLKS. The only reliable way to do this is
+ * to calculate the CCLK/SCLK ratio and multiply 10. For now,
+ * we'll assume worse case which is a 1:15 ratio.
+ */
+ asm(
+ "LSETUP (1f, 1f) LC0 = %0\n"
+ "1: nop;"
+ :
+ : "a" (15 * 10)
+ : "LC0", "LB0", "LT0"
+ );
- /* Clear System software reset */
- bfin_write_SWRST(0);
+ /* Clear System software reset */
+ bfin_write_SWRST(0);
- /* The BF526 ROM will crash during reset */
+ /* The BF526 ROM will crash during reset */
#if defined(__ADSPBF522__) || defined(__ADSPBF524__) || defined(__ADSPBF526__)
- bfin_read_SWRST();
+ bfin_read_SWRST();
#endif
- /* Wait for the SWRST write to complete. Cannot rely on SSYNC
- * though as the System state is all reset now.
- */
- asm(
- "LSETUP (1f, 1f) LC1 = %0\n"
- "1: nop;"
- :
- : "a" (15 * 1)
- : "LC1", "LB1", "LT1"
- );
- }
+ /* Wait for the SWRST write to complete. Cannot rely on SSYNC
+ * though as the System state is all reset now.
+ */
+ asm(
+ "LSETUP (1f, 1f) LC1 = %0\n"
+ "1: nop;"
+ :
+ : "a" (15 * 1)
+ : "LC1", "LB1", "LT1"
+ );
while (1)
/* Issue core reset */
@@ -84,7 +79,10 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (board_reset)
board_reset();
- while (1)
- asm("jump (%0);" : : "a" (bfin_reset));
+ if (ANOMALY_05000353 || ANOMALY_05000386)
+ while (1)
+ asm("jump (%0);" : : "a" (bfin_reset));
+ else
+ bfrom_SoftReset((void *)(L1_SRAM_SCRATCH_END - 20));
return 0;
}
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 3/7] Blackfin: bf548-ezkit/bf561-ezkit: update env location
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 1/7] Blackfin: use common LDSCRIPT logic Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 2/7] Blackfin: use on-chip reset func with newer parts Mike Frysinger
@ 2011-05-24 3:30 ` Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 4/7] Blackfin: boards: build zlib dir with -O2 Mike Frysinger
` (4 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
Relocate the env to one of the small end sectors to avoid issues with
embedding it, such as support being broken (by recent commit ea882baf9c1),
and for taking a while to save updates.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/configs/bf548-ezkit.h | 10 +++++-----
include/configs/bf561-ezkit.h | 23 +++--------------------
2 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 4d7d877..3550fd3 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -113,12 +113,12 @@
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_SIZE 0x20000
#else
+/* The BF548-EZKIT uses a top boot flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_ADDR 0x20002000
-#define CONFIG_ENV_OFFSET 0x2000
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_SECT_SIZE (128 * 1024)
-#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET (0x1000000 - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE 0x8000
#endif
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 33c7e18..6cfc19b 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -80,27 +80,10 @@
#define CONFIG_SYS_MAX_FLASH_SECT 135
/* The BF561-EZKIT uses a top boot flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_OFFSET 0x4000
+#define CONFIG_ENV_OFFSET (0x800000 - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_SECT_SIZE 0x10000
-#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
-#define ENV_IS_EMBEDDED
-#else
-#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
-#endif
-#ifdef ENV_IS_EMBEDDED
-/* WARNING - the following is hand-optimized to fit within
- * the sector before the environment sector. If it throws
- * an error during compilation remove an object here to get
- * it linked after the configuration sector.
- */
-# define LDS_BOARD_TEXT \
- arch/blackfin/lib/libblackfin.o (.text*); \
- arch/blackfin/cpu/libblackfin.o (.text*); \
- . = DEFINED(env_offset) ? env_offset : .; \
- common/env_embedded.o (.text*);
-#endif
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE 0x2000
/*
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 4/7] Blackfin: boards: build zlib dir with -O2
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
` (2 preceding siblings ...)
2011-05-24 3:30 ` [U-Boot] [PATCH 3/7] Blackfin: bf548-ezkit/bf561-ezkit: update env location Mike Frysinger
@ 2011-05-24 3:30 ` Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 5/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings Mike Frysinger
` (3 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
Now that the zlib code has been relocated to a dedicated subdir, make
sure we still build it with -O2 for boards that want speed over size.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
board/bct-brettl2/config.mk | 1 +
board/bf518f-ezbrd/config.mk | 1 +
board/bf526-ezbrd/config.mk | 1 +
board/bf527-ad7160-eval/config.mk | 1 +
board/bf527-ezkit/config.mk | 1 +
board/bf527-sdp/config.mk | 1 +
board/bf533-ezkit/config.mk | 1 +
board/bf533-stamp/config.mk | 1 +
board/bf537-stamp/config.mk | 1 +
board/bf538f-ezkit/config.mk | 1 +
board/bf548-ezkit/config.mk | 1 +
board/bf561-acvilon/config.mk | 1 +
board/bf561-ezkit/config.mk | 1 +
board/cm-bf527/config.mk | 1 +
board/cm-bf533/config.mk | 1 +
board/cm-bf537e/config.mk | 1 +
board/cm-bf537u/config.mk | 1 +
board/cm-bf548/config.mk | 1 +
board/cm-bf561/config.mk | 1 +
board/ip04/config.mk | 1 +
board/tcm-bf518/config.mk | 1 +
board/tcm-bf537/config.mk | 1 +
22 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/board/bct-brettl2/config.mk b/board/bct-brettl2/config.mk
index 799a682..b3ed337 100644
--- a/board/bct-brettl2/config.mk
+++ b/board/bct-brettl2/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index 799a682..b3ed337 100644
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index 799a682..b3ed337 100644
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/bf527-ad7160-eval/config.mk b/board/bf527-ad7160-eval/config.mk
index 799a682..b3ed337 100644
--- a/board/bf527-ad7160-eval/config.mk
+++ b/board/bf527-ad7160-eval/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index 799a682..b3ed337 100644
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/bf527-sdp/config.mk b/board/bf527-sdp/config.mk
index 7271774..beb4651 100644
--- a/board/bf527-sdp/config.mk
+++ b/board/bf527-sdp/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index 7c023d1..0adae73 100644
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index 7f38b14..ab3ff14 100644
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --dma 6
diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk
index 4c811ba..4d6184e 100644
--- a/board/bf561-acvilon/config.mk
+++ b/board/bf561-acvilon/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index 4c811ba..4d6184e 100644
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index 799a682..b3ed337 100644
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index 5adb6fc..358e4c1 100644
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --dma 6
diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index 4c811ba..4d6184e 100644
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
diff --git a/board/ip04/config.mk b/board/ip04/config.mk
index 7c023d1..0adae73 100644
--- a/board/ip04/config.mk
+++ b/board/ip04/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk
index 799a682..b3ed337 100644
--- a/board/tcm-bf518/config.mk
+++ b/board/tcm-bf518/config.mk
@@ -25,3 +25,4 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index c0cb9ff..7d1fc44 100644
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -25,6 +25,7 @@
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
+CFLAGS_lib/zlib += -O2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 5/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
` (3 preceding siblings ...)
2011-05-24 3:30 ` [U-Boot] [PATCH 4/7] Blackfin: boards: build zlib dir with -O2 Mike Frysinger
@ 2011-05-24 3:30 ` Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 6/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support Mike Frysinger
` (2 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
From: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
These boards can have an addon card plugged onto them, so enable
support for it.
Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
board/cm-bf537e/cm-bf537e.c | 34 ++++++++++++++++++++++------------
board/cm-bf537u/cm-bf537u.c | 39 +++++++++++++++++++++------------------
board/tcm-bf537/tcm-bf537.c | 34 ++++++++++++++++++++++------------
include/configs/cm-bf537e.h | 3 +++
include/configs/cm-bf537u.h | 8 ++++----
include/configs/tcm-bf537.h | 4 +++-
6 files changed, 75 insertions(+), 47 deletions(-)
diff --git a/board/cm-bf537e/cm-bf537e.c b/board/cm-bf537e/cm-bf537e.c
index 1e350dc..38dbc6e 100644
--- a/board/cm-bf537e/cm-bf537e.c
+++ b/board/cm-bf537e/cm-bf537e.c
@@ -24,27 +24,37 @@ int checkboard(void)
return 0;
}
-#ifdef CONFIG_BFIN_MAC
-static void board_init_enetaddr(uchar *mac_addr)
+static void board_init_enetaddr(char *var)
{
- puts("Warning: Generating 'random' MAC address\n");
- bfin_gen_rand_mac(mac_addr);
- eth_setenv_enetaddr("ethaddr", mac_addr);
+#ifdef CONFIG_NET_MULTI
+ uchar enetaddr[6];
+
+ if (eth_getenv_enetaddr(var, enetaddr))
+ return;
+
+ printf("Warning: %s: generating 'random' MAC address\n", var);
+ bfin_gen_rand_mac(enetaddr);
+ eth_setenv_enetaddr(var, enetaddr);
+#endif
}
+#ifndef CONFIG_BFIN_MAC
+# define bfin_EMAC_initialize(x) 1
+#endif
+#ifndef CONFIG_SMC911X
+# define smc911x_initialize(n, x) 1
+#endif
int board_eth_init(bd_t *bis)
{
- return bfin_EMAC_initialize(bis);
+ /* return ok if at least 1 eth device works */
+ return bfin_EMAC_initialize(bis) &
+ smc911x_initialize(0, CONFIG_SMC911X_BASE);
}
-#endif
int misc_init_r(void)
{
-#ifdef CONFIG_BFIN_MAC
- uchar enetaddr[6];
- if (!eth_getenv_enetaddr("ethaddr", enetaddr))
- board_init_enetaddr(enetaddr);
-#endif
+ board_init_enetaddr("ethaddr");
+ board_init_enetaddr("eth1addr");
gpio_cfi_flash_init();
diff --git a/board/cm-bf537u/cm-bf537u.c b/board/cm-bf537u/cm-bf537u.c
index 4b7e864..a62ddd6 100644
--- a/board/cm-bf537u/cm-bf537u.c
+++ b/board/cm-bf537u/cm-bf537u.c
@@ -24,34 +24,37 @@ int checkboard(void)
return 0;
}
-#ifdef CONFIG_BFIN_MAC
-static void board_init_enetaddr(uchar *mac_addr)
+static void board_init_enetaddr(char *var)
{
- puts("Warning: Generating 'random' MAC address\n");
- bfin_gen_rand_mac(mac_addr);
- eth_setenv_enetaddr("ethaddr", mac_addr);
-}
+#ifdef CONFIG_NET_MULTI
+ uchar enetaddr[6];
-int board_eth_init(bd_t *bis)
-{
- return bfin_EMAC_initialize(bis);
-}
+ if (eth_getenv_enetaddr(var, enetaddr))
+ return;
+
+ printf("Warning: %s: generating 'random' MAC address\n", var);
+ bfin_gen_rand_mac(enetaddr);
+ eth_setenv_enetaddr(var, enetaddr);
#endif
+}
-#ifdef CONFIG_SMC911X
+#ifndef CONFIG_BFIN_MAC
+# define bfin_EMAC_initialize(x) 1
+#endif
+#ifndef CONFIG_SMC911X
+# define smc911x_initialize(n, x) 1
+#endif
int board_eth_init(bd_t *bis)
{
- return smc911x_initialize(0, CONFIG_SMC911X_BASE);
+ /* return ok if at least 1 eth device works */
+ return bfin_EMAC_initialize(bis) &
+ smc911x_initialize(0, CONFIG_SMC911X_BASE);
}
-#endif
int misc_init_r(void)
{
-#ifdef CONFIG_BFIN_MAC
- uchar enetaddr[6];
- if (!eth_getenv_enetaddr("ethaddr", enetaddr))
- board_init_enetaddr(enetaddr);
-#endif
+ board_init_enetaddr("ethaddr");
+ board_init_enetaddr("eth1addr");
gpio_cfi_flash_init();
diff --git a/board/tcm-bf537/tcm-bf537.c b/board/tcm-bf537/tcm-bf537.c
index 04d6bdb..004e0d9 100644
--- a/board/tcm-bf537/tcm-bf537.c
+++ b/board/tcm-bf537/tcm-bf537.c
@@ -24,27 +24,37 @@ int checkboard(void)
return 0;
}
-#ifdef CONFIG_BFIN_MAC
-static void board_init_enetaddr(uchar *mac_addr)
+static void board_init_enetaddr(char *var)
{
- puts("Warning: Generating 'random' MAC address\n");
- bfin_gen_rand_mac(mac_addr);
- eth_setenv_enetaddr("ethaddr", mac_addr);
+#ifdef CONFIG_NET_MULTI
+ uchar enetaddr[6];
+
+ if (eth_getenv_enetaddr(var, enetaddr))
+ return;
+
+ printf("Warning: %s: generating 'random' MAC address\n", var);
+ bfin_gen_rand_mac(enetaddr);
+ eth_setenv_enetaddr(var, enetaddr);
+#endif
}
+#ifndef CONFIG_BFIN_MAC
+# define bfin_EMAC_initialize(x) 1
+#endif
+#ifndef CONFIG_SMC911X
+# define smc911x_initialize(n, x) 1
+#endif
int board_eth_init(bd_t *bis)
{
- return bfin_EMAC_initialize(bis);
+ /* return ok if at least 1 eth device works */
+ return bfin_EMAC_initialize(bis) &
+ smc911x_initialize(0, CONFIG_SMC911X_BASE);
}
-#endif
int misc_init_r(void)
{
-#ifdef CONFIG_BFIN_MAC
- uchar enetaddr[6];
- if (!eth_getenv_enetaddr("ethaddr", enetaddr))
- board_init_enetaddr(enetaddr);
-#endif
+ board_init_enetaddr("ethaddr");
+ board_init_enetaddr("eth1addr");
gpio_cfi_flash_init();
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 934b74b..4eff9c9 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -65,6 +65,9 @@
#ifndef __ADSPBF534__
#define ADI_CMDS_NETWORK 1
#define CONFIG_BFIN_MAC
+#define CONFIG_SMC911X 1
+#define CONFIG_SMC911X_BASE 0x20308000
+#define CONFIG_SMC911X_16_BIT
#define CONFIG_NETCONSOLE 1
#define CONFIG_NET_MULTI 1
#endif
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index c274c20..ccb3b47 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -63,11 +63,11 @@
*/
#ifndef __ADSPBF534__
#define ADI_CMDS_NETWORK 1
-#define CONFIG_NET_MULTI
-/* The next 3 lines are for use with SMSC on EXT-BF5xx-USB-ETH2 */
-#define CONFIG_SMC911X 1
-#define CONFIG_SMC911X_BASE 0x24000000
+#define CONFIG_SMC911X 1
+#define CONFIG_SMC911X_BASE 0x20308000
#define CONFIG_SMC911X_16_BIT
+#define CONFIG_NETCONSOLE 1
+#define CONFIG_NET_MULTI 1
#endif
#define CONFIG_HOSTNAME cm-bf537u
/* Uncomment next line to use fixed MAC address */
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 8ded175..0807589 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -62,10 +62,12 @@
/*
* Network Settings
*/
-/* TCM-BF537E has no PHY on it, but EXT-BF5xx-USB/Ethernet board has */
#ifndef __ADSPBF534__
#define ADI_CMDS_NETWORK 1
#define CONFIG_BFIN_MAC
+#define CONFIG_SMC911X 1
+#define CONFIG_SMC911X_BASE 0x20308000
+#define CONFIG_SMC911X_16_BIT
#define CONFIG_NETCONSOLE 1
#define CONFIG_NET_MULTI 1
#endif
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 6/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
` (4 preceding siblings ...)
2011-05-24 3:30 ` [U-Boot] [PATCH 5/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings Mike Frysinger
@ 2011-05-24 3:30 ` Mike Frysinger
2011-05-24 3:31 ` [U-Boot] [PATCH 7/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings Mike Frysinger
2011-05-24 3:32 ` [U-Boot] Pull request u-boot-blackfin.git Mike Frysinger
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:30 UTC (permalink / raw)
To: u-boot
From: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
These boards have an mmc/sd slot on them connected over SPI, so
enable the driver.
Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/configs/cm-bf537e.h | 17 ++++++++++++++++-
include/configs/cm-bf537u.h | 16 +++++++++++++++-
include/configs/tcm-bf537.h | 16 +++++++++++++++-
3 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 4eff9c9..7040567 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -55,7 +55,7 @@
#define CONFIG_EBIU_AMBCTL0_VAL (B1WAT_7 | B1RAT_11 | B1HT_2 | B1ST_3 | B0WAT_7 | B0RAT_11 | B0HT_2 | B0ST_3)
#define CONFIG_EBIU_AMBCTL1_VAL (B3WAT_7 | B3RAT_11 | B3HT_2 | B3ST_3 | B2WAT_7 | B2RAT_11 | B2HT_2 | B2ST_3)
-#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
@@ -89,6 +89,13 @@
/*
+ * SPI Settings
+ */
+#define CONFIG_BFIN_SPI
+#define CONFIG_ENV_SPI_MAX_HZ 30000000
+
+
+/*
* Env Storage Settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
@@ -122,6 +129,14 @@
/*
+ * SPI_MMC Settings
+ */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SPI
+
+
+/*
* Misc Settings
*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index ccb3b47..5dca810 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -54,7 +54,7 @@
#define CONFIG_EBIU_AMBCTL0_VAL (B1WAT_7 | B1RAT_11 | B1HT_2 | B1ST_3 | B0WAT_7 | B0RAT_11 | B0HT_2 | B0ST_3)
#define CONFIG_EBIU_AMBCTL1_VAL (B3WAT_7 | B3RAT_11 | B3HT_2 | B3ST_3 | B2WAT_7 | B2RAT_11 | B2HT_2 | B2ST_3)
-#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
@@ -87,6 +87,13 @@
/*
+ * SPI Settings
+ */
+#define CONFIG_BFIN_SPI
+#define CONFIG_ENV_SPI_MAX_HZ 30000000
+
+
+/*
* Env Storage Settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
@@ -120,6 +127,13 @@
/*
+ * SPI_MMC Settings
+ */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SPI
+
+/*
* Misc Settings
*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 0807589..dc16f2e 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -55,7 +55,7 @@
#define CONFIG_EBIU_AMBCTL0_VAL (B1WAT_7 | B1RAT_11 | B1HT_2 | B1ST_3 | B0WAT_7 | B0RAT_11 | B0HT_2 | B0ST_3)
#define CONFIG_EBIU_AMBCTL1_VAL (B3WAT_7 | B3RAT_11 | B3HT_2 | B3ST_3 | B2WAT_7 | B2RAT_11 | B2HT_2 | B2ST_3)
-#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
@@ -89,6 +89,13 @@
/*
+ * SPI Settings
+ */
+#define CONFIG_BFIN_SPI
+#define CONFIG_ENV_SPI_MAX_HZ 30000000
+
+
+/*
* Env Storage Settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
@@ -122,6 +129,13 @@
/*
+ * SPI_MMC Settings
+ */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SPI
+
+/*
* Misc Settings
*/
#define CONFIG_BAUDRATE 115200
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 7/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
` (5 preceding siblings ...)
2011-05-24 3:30 ` [U-Boot] [PATCH 6/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support Mike Frysinger
@ 2011-05-24 3:31 ` Mike Frysinger
2011-05-24 3:32 ` [U-Boot] Pull request u-boot-blackfin.git Mike Frysinger
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:31 UTC (permalink / raw)
To: u-boot
From: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
The recent commit ea882baf9c1 broke embedding environments in the middle
of a sector, so relocate it to the start of the 2nd sector.
Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/configs/cm-bf537e.h | 11 +++++------
include/configs/cm-bf537u.h | 11 +++++------
include/configs/tcm-bf537.h | 11 +++++------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 7040567..9649e18 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -99,13 +99,12 @@
* Env Storage Settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_OFFSET 0x4000
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_SECT_SIZE 0x20000
+#define CONFIG_ENV_OFFSET 0x8000
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE 0x8000
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED
-#else
-#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif
#ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within
@@ -145,7 +144,7 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS \
- "flashboot=flread 20040000 1000000 300000;" \
+ "flashboot=flread 20040000 1000000 3c0000;" \
"bootm 0x1000000\0"
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 5dca810..84846ef 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -97,13 +97,12 @@
* Env Storage Settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_OFFSET 0x4000
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_SECT_SIZE 0x20000
+#define CONFIG_ENV_OFFSET 0x8000
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE 0x8000
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED
-#else
-#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif
#ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within
@@ -142,7 +141,7 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS \
- "flashboot=flread 20040000 1000000 280000;" \
+ "flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index dc16f2e..2375fc5 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -99,13 +99,12 @@
* Env Storage Settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_OFFSET 0x4000
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_SECT_SIZE 0x20000
+#define CONFIG_ENV_OFFSET 0x8000
+#define CONFIG_ENV_SIZE 0x8000
+#define CONFIG_ENV_SECT_SIZE 0x8000
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED
-#else
-#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif
#ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within
@@ -144,7 +143,7 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS \
- "flashboot=flread 20040000 1000000 280000;" \
+ "flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] Pull request u-boot-blackfin.git
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
` (6 preceding siblings ...)
2011-05-24 3:31 ` [U-Boot] [PATCH 7/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings Mike Frysinger
@ 2011-05-24 3:32 ` Mike Frysinger
2011-06-01 19:58 ` Wolfgang Denk
2011-06-03 17:28 ` [U-Boot] Pull request u-boot-blackfin.git (v2) Mike Frysinger
7 siblings, 2 replies; 14+ messages in thread
From: Mike Frysinger @ 2011-05-24 3:32 UTC (permalink / raw)
To: u-boot
The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:
.gitignore: update list of u-boot.* files and add *.bin (2011-05-22 23:46:26 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-blackfin.git master
Harald Krapfenbauer (3):
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
Mike Frysinger (4):
Blackfin: use common LDSCRIPT logic
Blackfin: use on-chip reset func with newer parts
Blackfin: bf548-ezkit/bf561-ezkit: update env location
Blackfin: boards: build zlib dir with -O2
arch/blackfin/config.mk | 4 -
arch/blackfin/cpu/reset.c | 70 ++++++++++----------
arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} | 0
board/bct-brettl2/config.mk | 1 +
board/bf518f-ezbrd/config.mk | 1 +
board/bf526-ezbrd/config.mk | 1 +
board/bf527-ad7160-eval/config.mk | 1 +
board/bf527-ezkit/config.mk | 1 +
board/bf527-sdp/config.mk | 1 +
board/bf533-ezkit/config.mk | 1 +
board/bf533-stamp/config.mk | 1 +
board/bf537-stamp/config.mk | 1 +
board/bf538f-ezkit/config.mk | 1 +
board/bf548-ezkit/config.mk | 1 +
board/bf561-acvilon/config.mk | 1 +
board/bf561-ezkit/config.mk | 1 +
board/cm-bf527/config.mk | 1 +
board/cm-bf533/config.mk | 1 +
board/cm-bf537e/cm-bf537e.c | 34 ++++++----
board/cm-bf537e/config.mk | 1 +
board/cm-bf537u/cm-bf537u.c | 39 ++++++-----
board/cm-bf537u/config.mk | 1 +
board/cm-bf548/config.mk | 1 +
board/cm-bf561/config.mk | 1 +
board/ip04/config.mk | 1 +
board/tcm-bf518/config.mk | 1 +
board/tcm-bf537/config.mk | 1 +
board/tcm-bf537/tcm-bf537.c | 34 ++++++----
include/configs/bf548-ezkit.h | 10 ++--
include/configs/bf561-ezkit.h | 23 +------
include/configs/cm-bf537e.h | 31 +++++++--
include/configs/cm-bf537u.h | 35 +++++++---
include/configs/tcm-bf537.h | 31 +++++++--
33 files changed, 200 insertions(+), 133 deletions(-)
rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] Pull request u-boot-blackfin.git
2011-05-24 3:32 ` [U-Boot] Pull request u-boot-blackfin.git Mike Frysinger
@ 2011-06-01 19:58 ` Wolfgang Denk
2011-06-02 15:02 ` Mike Frysinger
2011-06-03 17:28 ` [U-Boot] Pull request u-boot-blackfin.git (v2) Mike Frysinger
1 sibling, 1 reply; 14+ messages in thread
From: Wolfgang Denk @ 2011-06-01 19:58 UTC (permalink / raw)
To: u-boot
Dear Mike Frysinger,
In message <1306207946-5626-1-git-send-email-vapier@gentoo.org> you wrote:
> The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:
>
> .gitignore: update list of u-boot.* files and add *.bin (2011-05-22 23:46:26 +0200)
>
> are available in the git repository at:
> git://www.denx.de/git/u-boot-blackfin.git master
>
> Harald Krapfenbauer (3):
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
>
> Mike Frysinger (4):
> Blackfin: use common LDSCRIPT logic
> Blackfin: use on-chip reset func with newer parts
> Blackfin: bf548-ezkit/bf561-ezkit: update env location
> Blackfin: boards: build zlib dir with -O2
It appears this is mostly new stuff, right?
If there are any real bug fixes in this, then please separate these
from the rest, which will then go into "next".
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
When all is said and done, more is said than done.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] Pull request u-boot-blackfin.git
2011-06-01 19:58 ` Wolfgang Denk
@ 2011-06-02 15:02 ` Mike Frysinger
2011-06-02 20:46 ` Wolfgang Denk
0 siblings, 1 reply; 14+ messages in thread
From: Mike Frysinger @ 2011-06-02 15:02 UTC (permalink / raw)
To: u-boot
On Wednesday, June 01, 2011 15:58:50 Wolfgang Denk wrote:
> It appears this is mostly new stuff, right?
not really
these are absolutely fixes:
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
Blackfin: use on-chip reset func with newer parts
Blackfin: bf548-ezkit/bf561-ezkit: update env location
Blackfin: boards: build zlib dir with -O2
this was waiting on a patch that you didnt merge until later and so i couldnt
push with my earlier set:
Blackfin: use common LDSCRIPT logic
this is partially new stuff, and partially fixing existing behavior to match
the hardware:
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
this is new stuff, but i was lazy and didnt want to figure out the patch
relationship with the other changes to these files, and it's safe:
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
-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/20110602/0d84c936/attachment.pgp
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] Pull request u-boot-blackfin.git
2011-06-02 15:02 ` Mike Frysinger
@ 2011-06-02 20:46 ` Wolfgang Denk
0 siblings, 0 replies; 14+ messages in thread
From: Wolfgang Denk @ 2011-06-02 20:46 UTC (permalink / raw)
To: u-boot
Dear Mike Frysinger,
In message <201106021102.08032.vapier@gentoo.org> you wrote:
>
> these are absolutely fixes:
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
> Blackfin: use on-chip reset func with newer parts
> Blackfin: bf548-ezkit/bf561-ezkit: update env location
> Blackfin: boards: build zlib dir with -O2
>
> this was waiting on a patch that you didnt merge until later and so i couldnt
> push with my earlier set:
> Blackfin: use common LDSCRIPT logic
OK.
> this is partially new stuff, and partially fixing existing behavior to match
> the hardware:
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
So this should be split into two separate commits, or has to wait.
> this is new stuff, but i was lazy and didnt want to figure out the patch
> relationship with the other changes to these files, and it's safe:
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
It will go into next, then.
Please prepare an updated pull request.
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
An Ada exception is when a routine gets in trouble and says
'Beam me up, Scotty'.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] Pull request u-boot-blackfin.git (v2)
2011-05-24 3:32 ` [U-Boot] Pull request u-boot-blackfin.git Mike Frysinger
2011-06-01 19:58 ` Wolfgang Denk
@ 2011-06-03 17:28 ` Mike Frysinger
2011-06-08 21:28 ` Wolfgang Denk
1 sibling, 1 reply; 14+ messages in thread
From: Mike Frysinger @ 2011-06-03 17:28 UTC (permalink / raw)
To: u-boot
The following changes since commit 6f4dd40cddbd69c56fec1285fee02cbd5a3833d8:
Prepare v2011.06-rc2 (2011-06-02 23:19:27 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-blackfin.git master
Harald Krapfenbauer (1):
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
Mike Frysinger (4):
Blackfin: use common LDSCRIPT logic
Blackfin: use on-chip reset func with newer parts
Blackfin: bf548-ezkit/bf561-ezkit: update env location
Blackfin: boards: build zlib dir with -O2
arch/blackfin/config.mk | 4 -
arch/blackfin/cpu/reset.c | 70 ++++++++++----------
arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} | 0
board/bct-brettl2/config.mk | 1 +
board/bf518f-ezbrd/config.mk | 1 +
board/bf526-ezbrd/config.mk | 1 +
board/bf527-ad7160-eval/config.mk | 1 +
board/bf527-ezkit/config.mk | 1 +
board/bf527-sdp/config.mk | 1 +
board/bf533-ezkit/config.mk | 1 +
board/bf533-stamp/config.mk | 1 +
board/bf537-stamp/config.mk | 1 +
board/bf538f-ezkit/config.mk | 1 +
board/bf548-ezkit/config.mk | 1 +
board/bf561-acvilon/config.mk | 1 +
board/bf561-ezkit/config.mk | 1 +
board/cm-bf527/config.mk | 1 +
board/cm-bf533/config.mk | 1 +
board/cm-bf537e/config.mk | 1 +
board/cm-bf537u/config.mk | 1 +
board/cm-bf548/config.mk | 1 +
board/cm-bf561/config.mk | 1 +
board/ip04/config.mk | 1 +
board/tcm-bf518/config.mk | 1 +
board/tcm-bf537/config.mk | 1 +
include/configs/bf548-ezkit.h | 10 ++--
include/configs/bf561-ezkit.h | 23 +------
include/configs/cm-bf537e.h | 11 ++--
include/configs/cm-bf537u.h | 11 ++--
include/configs/tcm-bf537.h | 11 ++--
30 files changed, 79 insertions(+), 83 deletions(-)
rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] Pull request u-boot-blackfin.git (v2)
2011-06-03 17:28 ` [U-Boot] Pull request u-boot-blackfin.git (v2) Mike Frysinger
@ 2011-06-08 21:28 ` Wolfgang Denk
0 siblings, 0 replies; 14+ messages in thread
From: Wolfgang Denk @ 2011-06-08 21:28 UTC (permalink / raw)
To: u-boot
Dear Mike Frysinger,
In message <1307122089-6470-1-git-send-email-vapier@gentoo.org> you wrote:
> The following changes since commit 6f4dd40cddbd69c56fec1285fee02cbd5a3833d8:
>
> Prepare v2011.06-rc2 (2011-06-02 23:19:27 +0200)
>
> are available in the git repository at:
> git://www.denx.de/git/u-boot-blackfin.git master
>
> Harald Krapfenbauer (1):
> Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
>
> Mike Frysinger (4):
> Blackfin: use common LDSCRIPT logic
> Blackfin: use on-chip reset func with newer parts
> Blackfin: bf548-ezkit/bf561-ezkit: update env location
> Blackfin: boards: build zlib dir with -O2
>
> arch/blackfin/config.mk | 4 -
> arch/blackfin/cpu/reset.c | 70 ++++++++++----------
> arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} | 0
> board/bct-brettl2/config.mk | 1 +
> board/bf518f-ezbrd/config.mk | 1 +
> board/bf526-ezbrd/config.mk | 1 +
> board/bf527-ad7160-eval/config.mk | 1 +
> board/bf527-ezkit/config.mk | 1 +
> board/bf527-sdp/config.mk | 1 +
> board/bf533-ezkit/config.mk | 1 +
> board/bf533-stamp/config.mk | 1 +
> board/bf537-stamp/config.mk | 1 +
> board/bf538f-ezkit/config.mk | 1 +
> board/bf548-ezkit/config.mk | 1 +
> board/bf561-acvilon/config.mk | 1 +
> board/bf561-ezkit/config.mk | 1 +
> board/cm-bf527/config.mk | 1 +
> board/cm-bf533/config.mk | 1 +
> board/cm-bf537e/config.mk | 1 +
> board/cm-bf537u/config.mk | 1 +
> board/cm-bf548/config.mk | 1 +
> board/cm-bf561/config.mk | 1 +
> board/ip04/config.mk | 1 +
> board/tcm-bf518/config.mk | 1 +
> board/tcm-bf537/config.mk | 1 +
> include/configs/bf548-ezkit.h | 10 ++--
> include/configs/bf561-ezkit.h | 23 +------
> include/configs/cm-bf537e.h | 11 ++--
> include/configs/cm-bf537u.h | 11 ++--
> include/configs/tcm-bf537.h | 11 ++--
> 30 files changed, 79 insertions(+), 83 deletions(-)
> rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%)
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
"If you want to eat hippopatomus, you've got to pay the freight." -
attributed to an IBM guy, about why IBM software uses so much memory
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-06-08 21:28 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 1/7] Blackfin: use common LDSCRIPT logic Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 2/7] Blackfin: use on-chip reset func with newer parts Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 3/7] Blackfin: bf548-ezkit/bf561-ezkit: update env location Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 4/7] Blackfin: boards: build zlib dir with -O2 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 5/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 6/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support Mike Frysinger
2011-05-24 3:31 ` [U-Boot] [PATCH 7/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings Mike Frysinger
2011-05-24 3:32 ` [U-Boot] Pull request u-boot-blackfin.git Mike Frysinger
2011-06-01 19:58 ` Wolfgang Denk
2011-06-02 15:02 ` Mike Frysinger
2011-06-02 20:46 ` Wolfgang Denk
2011-06-03 17:28 ` [U-Boot] Pull request u-boot-blackfin.git (v2) Mike Frysinger
2011-06-08 21:28 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.