Blackfin updates for 2009.05
cover Blackfin updates for 2009.05
Here's the first patch of updates. Should be mostly simple things before I move onto the new board ports and such in the next update.
Mike Frysinger (31):
Blackfin: update anomaly lists
Blackfin: fix SWRST/SYSCR register sizes
Blackfin: unify net-related init code
Blackfin: bf537-stamp: move CONFIG_POST handling to COBJS-$(...)
Blackfin: fix jtag console tstc
Blackfin: mark bfin_reset static
Blackfin: update lockbox api according to latest documentation
Blackfin: safely flush data caches when in writeback mode
Blackfin: print out Flash: before checking it
Blackfin: drop now-unused CONFIG_SYS_BFIN_CMD_XXX
Blackfin: unify duplicate CPU port definitions
Blackfin: drop SPORT_TX read helper macros
Blackfin: fix SIC_RVECT definition: it is 16bits, not 32bits
Blackfin: simplify symbol_lookup() a bit
Blackfin: kill off LDR jump block
Blackfin: handle reboot anomaly 432
Blackfin: setup a sane default EBIU_SDBCTL for SDRAM controllers
Blackfin: do not program voltage regulator on parts that do not have
one
Blackfin: put memory into self-refresh before/after programming
clocks
Blackfin: unify common ADI board settings
Blackfin: bf533-stamp: rewrite startup LED notifications
Blackfin: bf533-stamp: bump up default clocks
Blackfin: add clkin_hz= to default kernel command line for ADI boards
Blackfin: bf537-stamp: rewrite MAC-in-flash handling
Blackfin: bf537-stamp: bump default SCLK up to 125MHz
Blackfin: bf537-stamp: increase monitor size
Blackfin: add hack for crappy m25p80
Blackfin: add support for SST SPI flashes
Blackfin: overhaul SPI flash handling to speed things up
Blackfin: add support for S25FL128 parts
Blackfin: bf537-stamp: split post code out into dedicated post.c
Sonic Zhang (1):
Blackfin: spi: there is no PORTJ_FER MMR on BF537
blackfin_config.mk | 1 + board/bf533-ezkit/u-boot.lds.S | 5 +- board/bf533-stamp/bf533-stamp.c | 62 ++- board/bf533-stamp/u-boot.lds.S | 5 +- board/bf537-stamp/Makefile | 3 +- board/bf537-stamp/bf537-stamp.c | 313 +++----------- board/bf537-stamp/post-memory.c | 3 - board/bf537-stamp/post.c | 244 +++++++++++ board/bf537-stamp/spi_flash.c | 297 +++++++++++--- board/bf537-stamp/u-boot.lds.S | 5 +- board/bf561-ezkit/u-boot.lds.S | 5 +- cpu/blackfin/cpu.c | 8 +- cpu/blackfin/initcode.c | 255 +++++++++--- cpu/blackfin/jtag-console.c | 15 +- cpu/blackfin/reset.c | 2 +- cpu/blackfin/start.S | 83 +++-- cpu/blackfin/traps.c | 2 +- drivers/spi/bfin_spi.c | 8 +- include/asm-blackfin/blackfin-config-pre.h | 6 - .../mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 8 +- include/asm-blackfin/mach-bf527/anomaly.h | 6 +- include/asm-blackfin/mach-bf527/ports.h | 75 +--- include/asm-blackfin/mach-bf533/anomaly.h | 7 +- include/asm-blackfin/mach-bf533/ports.h | 18 +- .../mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 8 +- include/asm-blackfin/mach-bf537/anomaly.h | 7 +- include/asm-blackfin/mach-bf537/ports.h | 56 +--- .../mach-bf548/ADSP-EDN-BF542-extended_cdef.h | 3 - .../mach-bf548/ADSP-EDN-BF544-extended_cdef.h | 3 - .../mach-bf548/ADSP-EDN-BF547-extended_cdef.h | 4 - .../mach-bf548/ADSP-EDN-BF548-extended_cdef.h | 4 - .../mach-bf548/ADSP-EDN-BF549-extended_cdef.h | 4 - include/asm-blackfin/mach-bf548/anomaly.h | 23 +- include/asm-blackfin/mach-bf548/ports.h | 189 +-------- include/asm-blackfin/mach-bf561/BF561_cdef.h | 12 +- include/asm-blackfin/mach-bf561/anomaly.h | 7 +- include/asm-blackfin/mach-bf561/def_local.h | 2 + include/asm-blackfin/mach-bf561/ports.h | 44 ++ .../mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h | 2 - .../mach-common/ADSP-EDN-extended_cdef.h | 8 +- include/asm-blackfin/mach-common/bits/lockbox.h | 70 ++-- include/asm-blackfin/mach-common/bits/ports-a.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-b.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-c.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-d.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-e.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-f.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-g.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-h.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-i.h | 25 ++ include/asm-blackfin/mach-common/bits/ports-j.h | 25 ++ include/asm-blackfin/net.h | 28 ++ include/configs/bf533-ezkit.h | 286 +++++-------- include/configs/bf533-stamp.h | 450 +++++++------------- include/configs/bf537-stamp.h | 423 ++++++------------- include/configs/bf561-ezkit.h | 295 +++++-------- include/configs/bfin_adi_common.h | 199 +++++++++ lib_blackfin/board.c | 32 +- lib_blackfin/cache.c | 42 ++ 59 files changed, 2078 insertions(+), 1809 deletions(-) create mode 100644 board/bf537-stamp/post.c create mode 100644 include/asm-blackfin/mach-bf561/ports.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-a.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-b.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-c.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-d.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-e.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-f.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-g.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-h.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-i.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-j.h create mode 100644 include/asm-blackfin/net.h create mode 100644 include/configs/bfin_adi_common.h
PATCH 1/32 Blackfin: update anomaly lists
--- include/asm-blackfin/mach-bf527/anomaly.h | 6 +++++- include/asm-blackfin/mach-bf533/anomaly.h | 7 +++++-- include/asm-blackfin/mach-bf537/anomaly.h | 7 +++++-- include/asm-blackfin/mach-bf548/anomaly.h | 23 +++++++++++++++++++---- include/asm-blackfin/mach-bf561/anomaly.h | 7 +++++-- 5 files changed, 39 insertions(+), 11 deletions(-)
include/asm-blackfin/mach-bf527/anomaly.h +5 -1
@@ -2,7 +2,7 @@* File: include/asm-blackfin/mach-bf527/anomaly.h * Bugs: Enter bugs at http://blackfin.uclinux.org/ * -* Copyright (C) 2004-2008 Analog Devices Inc. +* Copyright (C) 2004-2009 Analog Devices Inc. * Licensed under the GPL-2 or later. */
@@ -167,12 +167,16 @@#define ANOMALY_05000263 (0)#define ANOMALY_05000266 (0)#define ANOMALY_05000273 (0) +#define ANOMALY_05000278 (0)#define ANOMALY_05000285 (0) +#define ANOMALY_05000305 (0)#define ANOMALY_05000307 (0)#define ANOMALY_05000311 (0)#define ANOMALY_05000312 (0)#define ANOMALY_05000323 (0)#define ANOMALY_05000363 (0)#define ANOMALY_05000412 (0) +#define ANOMALY_05000447 (0) +#define ANOMALY_05000448 (0)#endif
include/asm-blackfin/mach-bf533/anomaly.h +5 -2
@@ -2,7 +2,7 @@* File: include/asm-blackfin/mach-bf533/anomaly.h * Bugs: Enter bugs at http://blackfin.uclinux.org/ * -* Copyright (C) 2004-2008 Analog Devices Inc. +* Copyright (C) 2004-2009 Analog Devices Inc. * Licensed under the GPL-2 or later. */
@@ -160,7 +160,7 @@#define ANOMALY_05000301 (__SILICON_REVISION__ < 6)/* SSYNCs After Writes To DMA MMR Registers May Not Be Handled Correctly */ #define ANOMALY_05000302 (__SILICON_REVISION__ < 5) -/* New Feature: Additional Hysteresis on SPORT Input Pins (Not Available On Older Silicon) */ +/* SPORT_HYS Bit in PLL_CTL Register Is Not Functional */ #define ANOMALY_05000305 (__SILICON_REVISION__ < 5)/* New Feature: Additional PPI Frame Sync Sampling Options (Not Available On Older Silicon) */ #define ANOMALY_05000306 (__SILICON_REVISION__ < 5)
@@ -278,9 +278,12 @@#define ANOMALY_05000266 (0)#define ANOMALY_05000323 (0)#define ANOMALY_05000353 (1) +#define ANOMALY_05000380 (0)#define ANOMALY_05000386 (1)#define ANOMALY_05000412 (0)#define ANOMALY_05000432 (0)#define ANOMALY_05000435 (0) +#define ANOMALY_05000447 (0) +#define ANOMALY_05000448 (0)#endif
include/asm-blackfin/mach-bf537/anomaly.h +5 -2
@@ -2,7 +2,7 @@* File: include/asm-blackfin/mach-bf537/anomaly.h * Bugs: Enter bugs at http://blackfin.uclinux.org/ * -* Copyright (C) 2004-2008 Analog Devices Inc. +* Copyright (C) 2004-2009 Analog Devices Inc. * Licensed under the GPL-2 or later. */
@@ -110,7 +110,7 @@#define ANOMALY_05000301 (1)/* SSYNCs After Writes To CAN/DMA MMR Registers Are Not Always Handled Correctly */ #define ANOMALY_05000304 (__SILICON_REVISION__ < 3) -/* New Feature: Additional Hysteresis on SPORT Input Pins (Not Available On Older Silicon) */ +/* SPORT_HYS Bit in PLL_CTL Register Is Not Functional */ #define ANOMALY_05000305 (__SILICON_REVISION__ < 3)/* SCKELOW Bit Does Not Maintain State Through Hibernate */ #define ANOMALY_05000307 (__SILICON_REVISION__ < 3)
@@ -168,9 +168,12 @@#define ANOMALY_05000323 (0)#define ANOMALY_05000353 (1)#define ANOMALY_05000363 (0) +#define ANOMALY_05000380 (0)#define ANOMALY_05000386 (1)#define ANOMALY_05000412 (0)#define ANOMALY_05000432 (0)#define ANOMALY_05000435 (0) +#define ANOMALY_05000447 (0) +#define ANOMALY_05000448 (0)#endif
include/asm-blackfin/mach-bf548/anomaly.h +19 -4
@@ -2,12 +2,12 @@* File: include/asm-blackfin/mach-bf548/anomaly.h * Bugs: Enter bugs@http://blackfin.uclinux.org/ * -* Copyright (C) 2004-2008 Analog Devices Inc. +* Copyright (C) 2004-2009 Analog Devices Inc. * Licensed under the GPL-2 or later. */ /* This file shoule be up to date with: -* - Revision G, 08/07/2008; ADSP-BF542/BF544/BF547/BF548/BF549 Blackfin Processor Anomaly List +* - Revision H, 01/16/2009; ADSP-BF542/BF544/BF547/BF548/BF549 Blackfin Processor Anomaly List */ #ifndef _MACH_ANOMALY_H_
@@ -91,8 +91,6 @@#define ANOMALY_05000371 (__SILICON_REVISION__ < 2)/* USB DP/DM Data Pins May Lose State When Entering Hibernate */ #define ANOMALY_05000372 (__SILICON_REVISION__ < 1) -/* Mobile DDR Operation Not Functional */ -#define ANOMALY_05000377 (1)/* Security/Authentication Speedpath Causes Authentication To Fail To Initiate */ #define ANOMALY_05000378 (__SILICON_REVISION__ < 2)/* 16-Bit NAND FLASH Boot Mode Is Not Functional */
@@ -157,8 +155,22 @@#define ANOMALY_05000429 (__SILICON_REVISION__ < 2)/* Software System Reset Corrupts PLL_LOCKCNT Register */ #define ANOMALY_05000430 (__SILICON_REVISION__ >= 2) +/* Incorrect Use of Stack in Lockbox Firmware During Authentication */ +#define ANOMALY_05000431 (__SILICON_REVISION__ < 3) +/* OTP Write Accesses Not Supported */ +#define ANOMALY_05000442 (__SILICON_REVISION__ < 1)/* IFLUSH Instruction at End of Hardware Loop Causes Infinite Stall */ #define ANOMALY_05000443 (1) +/* CDMAPRIO and L2DMAPRIO Bits in the SYSCR Register Are Not Functional */ +#define ANOMALY_05000446 (1) +/* UART IrDA Receiver Fails on Extended Bit Pulses */ +#define ANOMALY_05000447 (1) +/* DDR Clock Duty Cycle Spec Violation (tCH, tCL) */ +#define ANOMALY_05000448 (__SILICON_REVISION__ == 1) +/* Reduced Timing Margins on DDR Output Setup and Hold (tDS and tDH) */ +#define ANOMALY_05000449 (__SILICON_REVISION__ == 1) +/* USB DMA Mode 1 Short Packet Data Corruption */ +#define ANOMALY_05000450 (1/* Anomalies that don't exist on this proc */ #define ANOMALY_05000125 (0)
@@ -171,10 +183,13 @@#define ANOMALY_05000263 (0)#define ANOMALY_05000266 (0)#define ANOMALY_05000273 (0) +#define ANOMALY_05000278 (0) +#define ANOMALY_05000305 (0)#define ANOMALY_05000307 (0)#define ANOMALY_05000311 (0)#define ANOMALY_05000323 (0)#define ANOMALY_05000363 (0) +#define ANOMALY_05000380 (0)#define ANOMALY_05000412 (0)#define ANOMALY_05000432 (0)#define ANOMALY_05000435 (0)
include/asm-blackfin/mach-bf561/anomaly.h +5 -2
@@ -2,7 +2,7 @@* File: include/asm-blackfin/mach-bf561/anomaly.h * Bugs: Enter bugs@http://blackfin.uclinux.org/ * -* Copyright (C) 2004-2008 Analog Devices Inc. +* Copyright (C) 2004-2009 Analog Devices Inc. * Licensed under the GPL-2 or later. */
@@ -224,7 +224,7 @@#define ANOMALY_05000301 (1)/* SSYNCs After Writes To DMA MMR Registers May Not Be Handled Correctly */ #define ANOMALY_05000302 (1) -/* New Feature: Additional Hysteresis on SPORT Input Pins (Not Available On Older Silicon) */ +/* SPORT_HYS Bit in PLL_CTL Register Is Not Functional */ #define ANOMALY_05000305 (__SILICON_REVISION__ < 5)/* SCKELOW Bit Does Not Maintain State Through Hibernate */ #define ANOMALY_05000307 (__SILICON_REVISION__ < 5)
@@ -283,8 +283,11 @@#define ANOMALY_05000273 (0)#define ANOMALY_05000311 (0)#define ANOMALY_05000353 (1) +#define ANOMALY_05000380 (0)#define ANOMALY_05000386 (1)#define ANOMALY_05000432 (0)#define ANOMALY_05000435 (0) +#define ANOMALY_05000447 (0) +#define ANOMALY_05000448 (0)#endif
Signature · 1 line
1.6.2
PATCH 2/32 Blackfin: fix SWRST/SYSCR register sizes
In reply to Mike Frysinger--- include/asm-blackfin/mach-bf561/BF561_cdef.h | 12 ++++++------ .../mach-common/ADSP-EDN-extended_cdef.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-)
include/asm-blackfin/mach-bf561/BF561_cdef.h +6 -6
@@ -244,9 +244,9 @@#define pSICA_SWRST ((uint16_t volatile *)SICA_SWRST)#define bfin_read_SICA_SWRST () bfin_read16(SICA_SWRST)#define bfin_write_SICA_SWRST (val) bfin_write16(SICA_SWRST, val) -#define pSICA_SYSCR ((uint32_t volatile *)SICA_SYSCR) -#define bfin_read_SICA_SYSCR () bfin_read32(SICA_SYSCR) -#define bfin_write_SICA_SYSCR (val) bfin_write32(SICA_SYSCR, val) +#define pSICA_SYSCR ((uint16_t volatile *)SICA_SYSCR) +#define bfin_read_SICA_SYSCR () bfin_read16(SICA_SYSCR) +#define bfin_write_SICA_SYSCR (val) bfin_write16(SICA_SYSCR, val)#define pSICA_RVECT ((uint16_t volatile *)SICA_RVECT)#define bfin_read_SICA_RVECT () bfin_read16(SICA_RVECT)#define bfin_write_SICA_RVECT (val) bfin_write16(SICA_RVECT, val)
@@ -295,9 +295,9 @@#define pSICB_SWRST ((uint16_t volatile *)SICB_SWRST)#define bfin_read_SICB_SWRST () bfin_read16(SICB_SWRST)#define bfin_write_SICB_SWRST (val) bfin_write16(SICB_SWRST, val) -#define pSICB_SYSCR ((uint32_t volatile *)SICB_SYSCR) -#define bfin_read_SICB_SYSCR () bfin_read32(SICB_SYSCR) -#define bfin_write_SICB_SYSCR (val) bfin_write32(SICB_SYSCR, val) +#define pSICB_SYSCR ((uint16_t volatile *)SICB_SYSCR) +#define bfin_read_SICB_SYSCR () bfin_read16(SICB_SYSCR) +#define bfin_write_SICB_SYSCR (val) bfin_write16(SICB_SYSCR, val)#define pSICB_RVECT ((uint16_t volatile *)SICB_RVECT)#define bfin_read_SICB_RVECT () bfin_read16(SICB_RVECT)#define bfin_write_SICB_RVECT (val) bfin_write16(SICB_RVECT, val)
include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h +3 -3
@@ -900,9 +900,9 @@#define pSWRST ((uint16_t volatile *)SWRST)/* Software Reset Register (16-bit) */ #define bfin_read_SWRST () bfin_read16(SWRST)#define bfin_write_SWRST (val) bfin_write16(SWRST, val) -#define pSYSCR ((uint32_t volatile *)SYSCR)/* System Configuration register */ -#define bfin_read_SYSCR () bfin_read32(SYSCR) -#define bfin_write_SYSCR (val) bfin_write32(SYSCR, val) +#define pSYSCR ((uint16_t volatile *)SYSCR)/* System Configuration register */ +#define bfin_read_SYSCR () bfin_read16(SYSCR) +#define bfin_write_SYSCR (val) bfin_write16(SYSCR, val)#define pEVT_OVERRIDE ((uint32_t volatile *)EVT_OVERRIDE)#define bfin_read_EVT_OVERRIDE () bfin_read32(EVT_OVERRIDE)#define bfin_write_EVT_OVERRIDE (val) bfin_write32(EVT_OVERRIDE, val)
Signature · 1 line
1.6.2
PATCH 3/32 Blackfin: unify net-related init code
In reply to Mike FrysingerUnify all of the net-related init code in the common Blackfin board init code to clean up the ifdef mess a bit.
--- lib_blackfin/board.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-)
lib_blackfin/board.c +20 -10
@@ -291,6 +291,25 @@ void board_init_f(ulong bootflag)board_init_r ((gd_t *) gd,0x20000010 ); } +static void board_net_init_r (bd_t *bd) +{ +#ifdef CONFIG_CMD_NET +uchar enetaddr[6 ]; +char *s; + +if ((s =getenv ("bootfile" )) !=NULL ) +copy_filename (BootFile, s,sizeof (BootFile)); + + bd->bi_ip_addr =getenv_IPaddr ("ipaddr" ); + +printf ("Net: " ); +eth_initialize (gd->bd); + +eth_getenv_enetaddr ("ethaddr" , enetaddr); +printf ("MAC: %pM\n" , enetaddr); +#endif +} +void board_init_r (gd_t * id,ulong dest_addr) {extern void malloc_bin_reloc (void );
@@ -349,22 +368,13 @@ void board_init_r(gd_t * id, ulong dest_addr)/* Initialize from environment */ if ((s =getenv ("loadaddr" )) !=NULL ) load_addr =simple_strtoul (s,NULL ,16 ); -#ifdef CONFIG_CMD_NET -if ((s =getenv ("bootfile" )) !=NULL ) -copy_filename (BootFile, s,sizeof (BootFile)); -#endif #if defined(CONFIG_MISC_INIT_R )/* miscellaneous platform dependent initialisations */ misc_init_r ();#endif -#ifdef CONFIG_CMD_NET -/* IP Address */ - bd->bi_ip_addr =getenv_IPaddr ("ipaddr" ); -printf ("Net: " ); -eth_initialize (gd->bd); -#endif +board_net_init_r (bd);display_global_data ();
Signature · 1 line
1.6.2
PATCH 4/32 Blackfin: bf537-stamp: move CONFIG_POST handling to COBJS-$(...)
In reply to Mike Frysinger--- board/bf537-stamp/Makefile | 3 ++- board/bf537-stamp/post-memory.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-)
board/bf537-stamp/Makefile +2 -1
@@ -29,9 +29,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS-y := $(BOARD).o post-memory.o cmd_bf537led.o +COBJS-y := $(BOARD).o cmd_bf537led.o COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o COBJS-$(CONFIG_CMD_NAND) += nand.o +COBJS-$(CONFIG_POST) += post-memory.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/bf537-stamp/post-memory.c +0 -3
@@ -1,8 +1,6 @@#include <common.h> #include <asm/io.h> -#ifdef CONFIG_POST -#include <post.h> #include <watchdog.h>
@@ -318,4 +316,3 @@ int post_init_sdram(int sclk) }#endif /* CONFIG_POST & CONFIG_SYS_POST_MEMORY */ -#endif /* CONFIG_POST */
Signature · 1 line
1.6.2
PATCH 5/32 Blackfin: fix jtag console tstc
In reply to Mike FrysingerThe jtag tstc operation was checking the hardware to see if data is available from it (which is fine for the jtag getc operation), but the higher layers need to know whether any data is available. Since we have to read up to 4 bytes at a time from the hardware, the higher layers need to know they can consume the cached bytes as well.
--- cpu/blackfin/jtag-console.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
cpu/blackfin/jtag-console.c +11 -4
@@ -54,16 +54,23 @@ static void jtag_puts(const char *s)jtag_send (s,strlen (s)); } -static int jtag_tstc (void ) +static size_t inbound_len, leftovers_len; + +/* Lower layers want to know when jtag has data */ +static int jtag_tstc_dbg (void ) {return (bfin_read_DBGSTAT () &0x2 ); } +/* Higher layers want to know when any data is available */ +static int jtag_tstc (void ) +{ +return jtag_tstc_dbg () || leftovers_len; +} +/* Receive a buffer. The format is: * [32bit length][actual data] */ -static size_t inbound_len; -static int leftovers_len;static uint32_t leftovers;static int jtag_getc (void ) {
@@ -79,7 +86,7 @@ static int jtag_getc(void) }/* wait for new data ! */ -while (!jtag_tstc ()) +while (!jtag_tstc_dbg ())continue ; __asm__("%0 = emudat;" :"=d" (emudat));
Signature · 1 line
1.6.2
PATCH 6/32 Blackfin: spi: there is no PORTJ_FER MMR on BF537
In reply to Mike FrysingerFrom: Sonic Zhang <[email protected]>
Since the PORTJ on the BF537 is peripheral-only (no GPIO functionality), then there is no PORTJ_FER register for us to worry about.
--- drivers/spi/bfin_spi.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/spi/bfin_spi.c +3 -5
@@ -191,21 +191,19 @@ static void spi_portmux(struct spi_slave *slave)#elif defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__)u16 mux =bfin_read_PORT_MUX ();u16 f_fer =bfin_read_PORTF_FER (); -u16 j_fer =bfin_read_PORTJ_FER ();/* set SCK/MISO/MOSI */ f_fer |=PF11 |PF12 |PF13 ;switch (slave->cs) {case 1 : f_fer |=PF10 ;break ; -case 2 : mux |=PJSE ; j_fer |=PJ11 ;break ; -case 3 : mux |=PJSE ; j_fer |=PJ10 ;break ; +case 2 : mux |=PJSE ;break ; +case 3 : mux |=PJSE ;break ;case 4 : mux |=PFS4E ; f_fer |=PF6 ;break ;case 5 : mux |=PFS5E ; f_fer |=PF5 ;break ;case 6 : mux |=PFS6E ; f_fer |=PF4 ;break ; -case 7 : mux |=PJCE_SPI ; j_fer |=PJ5 ;break ; +case 7 : mux |=PJCE_SPI ;break ; }bfin_write_PORT_MUX (mux);bfin_write_PORTF_FER (f_fer); -bfin_write_PORTJ_FER (j_fer);#elif defined(__ADSPBF54x__)#define DO_MUX (port, pin) \ mux = ((mux & ~PORT_x_MUX_##pin##_MASK) | PORT_x_MUX_##pin##_FUNC_1); \
Signature · 1 line
1.6.2
PATCH 7/32 Blackfin: mark bfin_reset static
In reply to Mike FrysingerThe function is only used locally, so mark it static.
--- cpu/blackfin/reset.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
cpu/blackfin/reset.c +1 -1
@@ -20,7 +20,7 @@* the core reset. */ __attribute__ ((__l1_text__, __noreturn__)) -void bfin_reset (void ) +static void bfin_reset (void ) {/* Wait for completion of "system" events such as cache line * line fills so that we avoid infinite stalls later on as
Signature · 1 line
1.6.2
PATCH 8/32 Blackfin: update lockbox api according to latest documentation
In reply to Mike Frysinger--- include/asm-blackfin/mach-common/bits/lockbox.h | 70 +++++++++++----------- 1 files changed, 35 insertions(+), 35 deletions(-)
include/asm-blackfin/mach-common/bits/lockbox.h +35 -35
@@ -11,52 +11,52 @@/* SESR argument structure. Expected to reside at 0xFF900018. */ typedef struct SESR_args { -unsigned short usFlags;/* security firmware flags */ -unsigned short usIRQMask;/* interrupt mask */ -unsigned long ulMessageSize;/* message length in bytes */ -unsigned long ulSFEntryPoint;/* entry point of secure function */ -unsigned long ulMessagePtr;/* pointer to the buffer containing */ -/* the digital signature and message */ -unsigned long ulReserved1;/* reserved */ -unsigned long ulReserved2;/* reserved */ +unsigned short usFlags;/* security firmware flags */ +unsigned short usIRQMask;/* interrupt mask */ +unsigned long ulMessageSize;/* message length in bytes */ +unsigned long ulSFEntryPoint;/* entry point of secure function */ +unsigned long ulMessagePtr;/* pointer to the buffer containing +the digital signature and message */ +unsigned long ulReserved1;/* reserved */ +unsigned long ulReserved2;/* reserved */ }tSESR_args ;/* Secure Entry Service Routine */ -void (*const sesr)(void ) = (void *)_BOOTROM_SESR; +static void (*const sesr)(void ) = (void *)_BOOTROM_SESR;#endif -/* SESR flags argument bitfields */ -#define SESR_FLAGS_STAY_AT_NMI 0x0000 -#define SESR_FLAGS_DROP_BELOW_NMI 0x0001 -#define SESR_FLAGS_NO_SF_DMA 0x0000 -#define SESR_FLAGS_DMA_SF_TO_RUN_DEST 0x0002 -#define SESR_FLAGS_USE_ADI_PUB_KEY 0x0000 -#define SESR_FLAGS_USE_CUST_PUB_KEY 0x0100 +/* SESR flags argument bitfields */ +#define SESR_FLAGS_STAY_AT_NMI 0x0000 +#define SESR_FLAGS_DROP_BELOW_NMI 0x0001 +#define SESR_FLAGS_NO_SF_DMA 0x0000 +#define SESR_FLAGS_DMA_SF_TO_RUN_DEST 0x0002 +#define SESR_FLAGS_USE_ADI_PUB_KEY 0x0000 +#define SESR_FLAGS_USE_CUST_PUB_KEY 0x0100/* Bit masks for SECURE_SYSSWT */ -#define EMUDABL 0x00000001/* Emulation Disable */ -#define RSTDABL 0x00000002/* Reset Disable */ -#define L1IDABL 0x0000001c/* L1 Instruction Memory Disable */ -#define L1DADABL 0x000000e0/* L1 Data Bank A Memory Disable */ -#define L1DBDABL 0x00000700/* L1 Data Bank B Memory Disable */ -#define DMA0OVR 0x00000800/* DMA0 Memory Access Override */ -#define DMA1OVR 0x00001000/* DMA1 Memory Access Override */ -#define EMUOVR 0x00004000/* Emulation Override */ -#define OTPSEN 0x00008000/* OTP Secrets Enable */ -#define L2DABL 0x00070000/* L2 Memory Disable */ +#define EMUDABL 0x00000001/* Emulation Disable */ +#define RSTDABL 0x00000002/* Reset Disable */ +#define L1IDABL 0x0000001c/* L1 Instruction Memory Disable */ +#define L1DADABL 0x000000e0/* L1 Data Bank A Memory Disable */ +#define L1DBDABL 0x00000700/* L1 Data Bank B Memory Disable */ +#define DMA0OVR 0x00000800/* DMA0 Memory Access Override */ +#define DMA1OVR 0x00001000/* DMA1 Memory Access Override */ +#define EMUOVR 0x00004000/* Emulation Override */ +#define OTPSEN 0x00008000/* OTP Secrets Enable */ +#define L2DABL 0x00070000/* L2 Memory Disable */ /* Bit masks for SECURE_CONTROL */ -#define SECURE0 0x0001/* SECURE 0 */ -#define SECURE1 0x0002/* SECURE 1 */ -#define SECURE2 0x0004/* SECURE 2 */ -#define SECURE3 0x0008/* SECURE 3 */ +#define SECURE0 0x0001/* SECURE 0 */ +#define SECURE1 0x0002/* SECURE 1 */ +#define SECURE2 0x0004/* SECURE 2 */ +#define SECURE3 0x0008/* SECURE 3 */ /* Bit masks for SECURE_STATUS */ -#define SECMODE 0x0003/* Secured Mode Control State */ -#define NMI 0x0004/* Non Maskable Interrupt */ -#define AFVALID 0x0008/* Authentication Firmware Valid */ -#define AFEXIT 0x0010/* Authentication Firmware Exit */ -#define SECSTAT 0x00e0/* Secure Status */ +#define SECMODE 0x0003/* Secured Mode Control State */ +#define NMI 0x0004/* Non Maskable Interrupt */ +#define AFVALID 0x0008/* Authentication Firmware Valid */ +#define AFEXIT 0x0010/* Authentication Firmware Exit */ +#define SECSTAT 0x00e0/* Secure Status */ #endif
Signature · 1 line
1.6.2
PATCH 9/32 Blackfin: safely flush data caches when in writeback mode
In reply to Mike Frysinger--- lib_blackfin/cache.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-)
lib_blackfin/cache.c +42 -0
@@ -36,6 +36,44 @@ void flush_cache(unsigned long addr, unsigned long size)blackfin_dcache_flush_range (start_addr, end_addr); } +#ifdef CONFIG_DCACHE_WB +static void flushinv_all_dcache (void ) +{ +u32 way, bank, subbank, set; +u32 status, addr; +u32 dmem_ctl =bfin_read_DMEM_CONTROL (); + +for (bank =0 ; bank <2 ; ++bank) { +if (!(dmem_ctl & (1 << (DMC1_P - bank)))) +continue ; + +for (way =0 ; way <2 ; ++way) +for (subbank =0 ; subbank <4 ; ++subbank) +for (set =0 ; set <64 ; ++set) { + +bfin_write_DTEST_COMMAND ( + way <<26 | + bank <<23 | + subbank <<16 | + set <<5 + ); +CSYNC (); + status =bfin_read_DTEST_DATA0 (); + +/* only worry about valid/dirty entries */ +if ((status &0x3 ) !=0x3 ) +continue ; + +/* construct the address using the tag */ + addr = (status &0xFFFFC800 ) | (subbank <<12 ) | (set <<5 ); + +/* flush it */ + __asm__ __volatile__("FLUSHINV[%0];" : :"a" (addr)); + } + } +} +#endif +void icache_enable (void ) {bfin_write_IMEM_CONTROL (IMC |ENICPLB );
@@ -61,6 +99,10 @@ void dcache_enable(void)void dcache_disable (void ) { +#ifdef CONFIG_DCACHE_WB +bfin_write_DMEM_CONTROL (bfin_read_DMEM_CONTROL () & ~(ENDCPLB )); +flushinv_all_dcache (); +#endif bfin_write_DMEM_CONTROL (0 );SSYNC (); }
Signature · 1 line
1.6.2
PATCH 10/32 Blackfin: print out Flash: before checking it
In reply to Mike FrysingerIf there is some problem in the flash init/checking code, it's nicer to see the message "Flash:" before crashing. This way the source of the problem is a bit more straightforward.
--- lib_blackfin/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib_blackfin/board.c +1 -1
@@ -327,8 +327,8 @@ void board_init_r(gd_t * id, ulong dest_addr)#if !defined(CONFIG_SYS_NO_FLASH )/* Initialize the flash and protect u-boot by default */ extern flash_info_t flash_info[]; -ulong size =flash_init ();puts ("Flash: " ); +ulong size =flash_init ();print_size (size,"\n" ); flash_protect(FLAG_PROTECT_SET, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN - 1,
Signature · 1 line
1.6.2
PATCH 11/32 Blackfin: drop now-unused CONFIG_SYS_BFIN_CMD_XXX
In reply to Mike FrysingerWith the new CONFIG_XXX system and CONFIG_CMD_XXX handling, these defines are no longer used/needed.
--- include/asm-blackfin/blackfin-config-pre.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
include/asm-blackfin/blackfin-config-pre.h +0 -6
@@ -14,12 +14,6 @@#define MK_STR (x) XMK_STR(x)#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -/* Configurable Blackfin-specific monitor commands */ -#define CONFIG_SYS_BFIN_CMD_BOOTLDR 0x01 -#define CONFIG_SYS_BFIN_CMD_CPLBINFO 0x02 -#define CONFIG_SYS_BFIN_CMD_OTP 0x04 -#define CONFIG_SYS_BFIN_CMD_CACHE_DUMP 0x08 -/* Bootmode defines -- your config needs to select this via CONFIG_BFIN_BOOT_MODE. * Depending on your cpu, some of these may not be valid, check your HRM. * The actual values here are meaningless as long as they're unique.
Signature · 1 line
1.6.2
PATCH 12/32 Blackfin: unify duplicate CPU port definitions
In reply to Mike Frysinger--- include/asm-blackfin/mach-bf527/ports.h | 75 +--------- include/asm-blackfin/mach-bf533/ports.h | 18 +-- include/asm-blackfin/mach-bf537/ports.h | 56 +------- include/asm-blackfin/mach-bf548/ports.h | 189 ++--------------------- include/asm-blackfin/mach-bf561/def_local.h | 2 + include/asm-blackfin/mach-bf561/ports.h | 44 ++++++ include/asm-blackfin/mach-common/bits/ports-a.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-b.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-c.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-d.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-e.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-f.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-g.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-h.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-i.h | 25 +++ include/asm-blackfin/mach-common/bits/ports-j.h | 25 +++ 16 files changed, 314 insertions(+), 320 deletions(-) create mode 100644 include/asm-blackfin/mach-bf561/ports.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-a.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-b.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-c.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-d.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-e.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-f.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-g.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-h.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-i.h create mode 100644 include/asm-blackfin/mach-common/bits/ports-j.h
include/asm-blackfin/mach-bf527/ports.h +4 -71
@@ -52,76 +52,9 @@#define PORT_x_MUX_7_FUNC_3 (PORT_x_MUX_FUNC_3 << 14)#define PORT_x_MUX_7_FUNC_4 (PORT_x_MUX_FUNC_4 << 14) -/* Port F Masks */ -#define PF0 0x0001 -#define PF1 0x0002 -#define PF2 0x0004 -#define PF3 0x0008 -#define PF4 0x0010 -#define PF5 0x0020 -#define PF6 0x0040 -#define PF7 0x0080 -#define PF8 0x0100 -#define PF9 0x0200 -#define PF10 0x0400 -#define PF11 0x0800 -#define PF12 0x1000 -#define PF13 0x2000 -#define PF14 0x4000 -#define PF15 0x8000 - -/* Port G Masks */ -#define PG0 0x0001 -#define PG1 0x0002 -#define PG2 0x0004 -#define PG3 0x0008 -#define PG4 0x0010 -#define PG5 0x0020 -#define PG6 0x0040 -#define PG7 0x0080 -#define PG8 0x0100 -#define PG9 0x0200 -#define PG10 0x0400 -#define PG11 0x0800 -#define PG12 0x1000 -#define PG13 0x2000 -#define PG14 0x4000 -#define PG15 0x8000 - -/* Port H Masks */ -#define PH0 0x0001 -#define PH1 0x0002 -#define PH2 0x0004 -#define PH3 0x0008 -#define PH4 0x0010 -#define PH5 0x0020 -#define PH6 0x0040 -#define PH7 0x0080 -#define PH8 0x0100 -#define PH9 0x0200 -#define PH10 0x0400 -#define PH11 0x0800 -#define PH12 0x1000 -#define PH13 0x2000 -#define PH14 0x4000 -#define PH15 0x8000 - -/* Port J Masks */ -#define PJ0 0x0001 -#define PJ1 0x0002 -#define PJ2 0x0004 -#define PJ3 0x0008 -#define PJ4 0x0010 -#define PJ5 0x0020 -#define PJ6 0x0040 -#define PJ7 0x0080 -#define PJ8 0x0100 -#define PJ9 0x0200 -#define PJ10 0x0400 -#define PJ11 0x0800 -#define PJ12 0x1000 -#define PJ13 0x2000 -#define PJ14 0x4000 -#define PJ15 0x8000 +#include "../mach-common/bits/ports-f.h" +#include "../mach-common/bits/ports-g.h" +#include "../mach-common/bits/ports-h.h" +#include "../mach-common/bits/ports-j.h" #endif
include/asm-blackfin/mach-bf533/ports.h +1 -17
@@ -5,22 +5,6 @@#ifndef __BFIN_PERIPHERAL_PORT__#define __BFIN_PERIPHERAL_PORT__ -/* Port F Masks */ -#define PF0 0x0001 -#define PF1 0x0002 -#define PF2 0x0004 -#define PF3 0x0008 -#define PF4 0x0010 -#define PF5 0x0020 -#define PF6 0x0040 -#define PF7 0x0080 -#define PF8 0x0100 -#define PF9 0x0200 -#define PF10 0x0400 -#define PF11 0x0800 -#define PF12 0x1000 -#define PF13 0x2000 -#define PF14 0x4000 -#define PF15 0x8000 +#include "../mach-common/bits/ports-f.h" #endif
include/asm-blackfin/mach-bf537/ports.h +3 -53
61 lines not on this page · raw message
include/asm-blackfin/mach-bf548/ports.h +10 -179
194 lines not on this page · raw message
include/asm-blackfin/mach-bf561/def_local.h +2 -0
@@ -8,3 +8,5 @@#define bfin_write_WDOG_CNT (val) bfin_write_WDOGA_CNT(val)#define bfin_write_WDOG_CTL (val) bfin_write_WDOGA_CTL(val)#define bfin_write_WDOG_STAT (val) bfin_write_WDOGA_STAT(val) + +#include "ports.h"
include/asm-blackfin/mach-bf561/ports.h new file +44 -0
44 lines not on this page · raw message
include/asm-blackfin/mach-common/bits/ports-a.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port A Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_A__ +#define __BFIN_PERIPHERAL_PORT_A__ + +#define PA0 (1 << 0) +#define PA1 (1 << 1) +#define PA2 (1 << 2) +#define PA3 (1 << 3) +#define PA4 (1 << 4) +#define PA5 (1 << 5) +#define PA6 (1 << 6) +#define PA7 (1 << 7) +#define PA8 (1 << 8) +#define PA9 (1 << 9) +#define PA10 (1 << 10) +#define PA11 (1 << 11) +#define PA12 (1 << 12) +#define PA13 (1 << 13) +#define PA14 (1 << 14) +#define PA15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-b.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port B Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_B__ +#define __BFIN_PERIPHERAL_PORT_B__ + +#define PB0 (1 << 0) +#define PB1 (1 << 1) +#define PB2 (1 << 2) +#define PB3 (1 << 3) +#define PB4 (1 << 4) +#define PB5 (1 << 5) +#define PB6 (1 << 6) +#define PB7 (1 << 7) +#define PB8 (1 << 8) +#define PB9 (1 << 9) +#define PB10 (1 << 10) +#define PB11 (1 << 11) +#define PB12 (1 << 12) +#define PB13 (1 << 13) +#define PB14 (1 << 14) +#define PB15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-c.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port C Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_C__ +#define __BFIN_PERIPHERAL_PORT_C__ + +#define PC0 (1 << 0) +#define PC1 (1 << 1) +#define PC2 (1 << 2) +#define PC3 (1 << 3) +#define PC4 (1 << 4) +#define PC5 (1 << 5) +#define PC6 (1 << 6) +#define PC7 (1 << 7) +#define PC8 (1 << 8) +#define PC9 (1 << 9) +#define PC10 (1 << 10) +#define PC11 (1 << 11) +#define PC12 (1 << 12) +#define PC13 (1 << 13) +#define PC14 (1 << 14) +#define PC15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-d.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port D Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_D__ +#define __BFIN_PERIPHERAL_PORT_D__ + +#define PD0 (1 << 0) +#define PD1 (1 << 1) +#define PD2 (1 << 2) +#define PD3 (1 << 3) +#define PD4 (1 << 4) +#define PD5 (1 << 5) +#define PD6 (1 << 6) +#define PD7 (1 << 7) +#define PD8 (1 << 8) +#define PD9 (1 << 9) +#define PD10 (1 << 10) +#define PD11 (1 << 11) +#define PD12 (1 << 12) +#define PD13 (1 << 13) +#define PD14 (1 << 14) +#define PD15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-e.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port E Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_E__ +#define __BFIN_PERIPHERAL_PORT_E__ + +#define PE0 (1 << 0) +#define PE1 (1 << 1) +#define PE2 (1 << 2) +#define PE3 (1 << 3) +#define PE4 (1 << 4) +#define PE5 (1 << 5) +#define PE6 (1 << 6) +#define PE7 (1 << 7) +#define PE8 (1 << 8) +#define PE9 (1 << 9) +#define PE10 (1 << 10) +#define PE11 (1 << 11) +#define PE12 (1 << 12) +#define PE13 (1 << 13) +#define PE14 (1 << 14) +#define PE15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-f.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port F Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_F__ +#define __BFIN_PERIPHERAL_PORT_F__ + +#define PF0 (1 << 0) +#define PF1 (1 << 1) +#define PF2 (1 << 2) +#define PF3 (1 << 3) +#define PF4 (1 << 4) +#define PF5 (1 << 5) +#define PF6 (1 << 6) +#define PF7 (1 << 7) +#define PF8 (1 << 8) +#define PF9 (1 << 9) +#define PF10 (1 << 10) +#define PF11 (1 << 11) +#define PF12 (1 << 12) +#define PF13 (1 << 13) +#define PF14 (1 << 14) +#define PF15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-g.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port G Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_G__ +#define __BFIN_PERIPHERAL_PORT_G__ + +#define PG0 (1 << 0) +#define PG1 (1 << 1) +#define PG2 (1 << 2) +#define PG3 (1 << 3) +#define PG4 (1 << 4) +#define PG5 (1 << 5) +#define PG6 (1 << 6) +#define PG7 (1 << 7) +#define PG8 (1 << 8) +#define PG9 (1 << 9) +#define PG10 (1 << 10) +#define PG11 (1 << 11) +#define PG12 (1 << 12) +#define PG13 (1 << 13) +#define PG14 (1 << 14) +#define PG15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-h.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port H Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_H__ +#define __BFIN_PERIPHERAL_PORT_H__ + +#define PH0 (1 << 0) +#define PH1 (1 << 1) +#define PH2 (1 << 2) +#define PH3 (1 << 3) +#define PH4 (1 << 4) +#define PH5 (1 << 5) +#define PH6 (1 << 6) +#define PH7 (1 << 7) +#define PH8 (1 << 8) +#define PH9 (1 << 9) +#define PH10 (1 << 10) +#define PH11 (1 << 11) +#define PH12 (1 << 12) +#define PH13 (1 << 13) +#define PH14 (1 << 14) +#define PH15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-i.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port I Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_I__ +#define __BFIN_PERIPHERAL_PORT_I__ + +#define PI0 (1 << 0) +#define PI1 (1 << 1) +#define PI2 (1 << 2) +#define PI3 (1 << 3) +#define PI4 (1 << 4) +#define PI5 (1 << 5) +#define PI6 (1 << 6) +#define PI7 (1 << 7) +#define PI8 (1 << 8) +#define PI9 (1 << 9) +#define PI10 (1 << 10) +#define PI11 (1 << 11) +#define PI12 (1 << 12) +#define PI13 (1 << 13) +#define PI14 (1 << 14) +#define PI15 (1 << 15) + +#endif
include/asm-blackfin/mach-common/bits/ports-j.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Port J Masks +*/ + +#ifndef __BFIN_PERIPHERAL_PORT_J__ +#define __BFIN_PERIPHERAL_PORT_J__ + +#define PJ0 (1 << 0) +#define PJ1 (1 << 1) +#define PJ2 (1 << 2) +#define PJ3 (1 << 3) +#define PJ4 (1 << 4) +#define PJ5 (1 << 5) +#define PJ6 (1 << 6) +#define PJ7 (1 << 7) +#define PJ8 (1 << 8) +#define PJ9 (1 << 9) +#define PJ10 (1 << 10) +#define PJ11 (1 << 11) +#define PJ12 (1 << 12) +#define PJ13 (1 << 13) +#define PJ14 (1 << 14) +#define PJ15 (1 << 15) + +#endif
Signature · 1 line
1.6.2
PATCH 13/32 Blackfin: drop SPORT_TX read helper macros
In reply to Mike FrysingerThe SPORT_TX registers cannot be read (the hardware will trigger an error), so drop the read helper macros.
--- .../mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 2 -- .../mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 2 -- .../mach-bf548/ADSP-EDN-BF542-extended_cdef.h | 3 --- .../mach-bf548/ADSP-EDN-BF544-extended_cdef.h | 3 --- .../mach-bf548/ADSP-EDN-BF547-extended_cdef.h | 4 ---- .../mach-bf548/ADSP-EDN-BF548-extended_cdef.h | 4 ---- .../mach-bf548/ADSP-EDN-BF549-extended_cdef.h | 4 ---- .../mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h | 2 -- .../mach-common/ADSP-EDN-extended_cdef.h | 2 -- 9 files changed, 0 insertions(+), 26 deletions(-)
include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h +0 -2
@@ -304,7 +304,6 @@#define bfin_read_SPORT0_TFSDIV () bfin_read16(SPORT0_TFSDIV)#define bfin_write_SPORT0_TFSDIV (val) bfin_write16(SPORT0_TFSDIV, val)#define pSPORT0_TX ((uint32_t volatile *)SPORT0_TX)/* SPORT0 TX Data Register */ -#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RX ((uint32_t volatile *)SPORT0_RX)/* SPORT0 RX Data Register */ #define bfin_read_SPORT0_RX () bfin_read32(SPORT0_RX)
@@ -370,7 +369,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 TX Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RX ((uint32_t volatile *)SPORT1_RX)/* SPORT1 RX Data Register */ #define bfin_read_SPORT1_RX () bfin_read32(SPORT1_RX)
include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h +0 -2
@@ -304,7 +304,6 @@#define bfin_read_SPORT0_TFSDIV () bfin_read16(SPORT0_TFSDIV)#define bfin_write_SPORT0_TFSDIV (val) bfin_write16(SPORT0_TFSDIV, val)#define pSPORT0_TX ((uint32_t volatile *)SPORT0_TX)/* SPORT0 TX Data Register */ -#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RX ((uint32_t volatile *)SPORT0_RX)/* SPORT0 RX Data Register */ #define bfin_read_SPORT0_RX () bfin_read32(SPORT0_RX)
@@ -370,7 +369,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 TX Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RX ((uint32_t volatile *)SPORT1_RX)/* SPORT1 RX Data Register */ #define bfin_read_SPORT1_RX () bfin_read32(SPORT1_RX)
include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h +0 -3
@@ -3577,7 +3577,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 Transmit Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RCR1 ((uint16_t volatile *)SPORT1_RCR1)/* SPORT1 Receive Configuration 1 Register */ #define bfin_read_SPORT1_RCR1 () bfin_read16(SPORT1_RCR1)
@@ -3643,7 +3642,6 @@#define bfin_read_SPORT2_TFSDIV () bfin_read16(SPORT2_TFSDIV)#define bfin_write_SPORT2_TFSDIV (val) bfin_write16(SPORT2_TFSDIV, val)#define pSPORT2_TX ((uint32_t volatile *)SPORT2_TX)/* SPORT2 Transmit Data Register */ -#define bfin_read_SPORT2_TX () bfin_read32(SPORT2_TX)#define bfin_write_SPORT2_TX (val) bfin_write32(SPORT2_TX, val)#define pSPORT2_RCR1 ((uint16_t volatile *)SPORT2_RCR1)/* SPORT2 Receive Configuration 1 Register */ #define bfin_read_SPORT2_RCR1 () bfin_read16(SPORT2_RCR1)
@@ -3709,7 +3707,6 @@#define bfin_read_SPORT3_TFSDIV () bfin_read16(SPORT3_TFSDIV)#define bfin_write_SPORT3_TFSDIV (val) bfin_write16(SPORT3_TFSDIV, val)#define pSPORT3_TX ((uint32_t volatile *)SPORT3_TX)/* SPORT3 Transmit Data Register */ -#define bfin_read_SPORT3_TX () bfin_read32(SPORT3_TX)#define bfin_write_SPORT3_TX (val) bfin_write32(SPORT3_TX, val)#define pSPORT3_RCR1 ((uint16_t volatile *)SPORT3_RCR1)/* SPORT3 Receive Configuration 1 Register */ #define bfin_read_SPORT3_RCR1 () bfin_read16(SPORT3_RCR1)
include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h +0 -3
@@ -4678,7 +4678,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 Transmit Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RCR1 ((uint16_t volatile *)SPORT1_RCR1)/* SPORT1 Receive Configuration 1 Register */ #define bfin_read_SPORT1_RCR1 () bfin_read16(SPORT1_RCR1)
@@ -4744,7 +4743,6 @@#define bfin_read_SPORT2_TFSDIV () bfin_read16(SPORT2_TFSDIV)#define bfin_write_SPORT2_TFSDIV (val) bfin_write16(SPORT2_TFSDIV, val)#define pSPORT2_TX ((uint32_t volatile *)SPORT2_TX)/* SPORT2 Transmit Data Register */ -#define bfin_read_SPORT2_TX () bfin_read32(SPORT2_TX)#define bfin_write_SPORT2_TX (val) bfin_write32(SPORT2_TX, val)#define pSPORT2_RCR1 ((uint16_t volatile *)SPORT2_RCR1)/* SPORT2 Receive Configuration 1 Register */ #define bfin_read_SPORT2_RCR1 () bfin_read16(SPORT2_RCR1)
@@ -4810,7 +4808,6 @@#define bfin_read_SPORT3_TFSDIV () bfin_read16(SPORT3_TFSDIV)#define bfin_write_SPORT3_TFSDIV (val) bfin_write16(SPORT3_TFSDIV, val)#define pSPORT3_TX ((uint32_t volatile *)SPORT3_TX)/* SPORT3 Transmit Data Register */ -#define bfin_read_SPORT3_TX () bfin_read32(SPORT3_TX)#define bfin_write_SPORT3_TX (val) bfin_write32(SPORT3_TX, val)#define pSPORT3_RCR1 ((uint16_t volatile *)SPORT3_RCR1)/* SPORT3 Receive Configuration 1 Register */ #define bfin_read_SPORT3_RCR1 () bfin_read16(SPORT3_RCR1)
include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h +0 -4
@@ -2713,7 +2713,6 @@#define bfin_read_SPORT0_TFSDIV () bfin_read16(SPORT0_TFSDIV)#define bfin_write_SPORT0_TFSDIV (val) bfin_write16(SPORT0_TFSDIV, val)#define pSPORT0_TX ((uint32_t volatile *)SPORT0_TX)/* SPORT0 Transmit Data Register */ -#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RCR1 ((uint16_t volatile *)SPORT0_RCR1)/* SPORT0 Receive Configuration 1 Register */ #define bfin_read_SPORT0_RCR1 () bfin_read16(SPORT0_RCR1)
@@ -2779,7 +2778,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 Transmit Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RCR1 ((uint16_t volatile *)SPORT1_RCR1)/* SPORT1 Receive Configuration 1 Register */ #define bfin_read_SPORT1_RCR1 () bfin_read16(SPORT1_RCR1)
@@ -2845,7 +2843,6 @@#define bfin_read_SPORT2_TFSDIV () bfin_read16(SPORT2_TFSDIV)#define bfin_write_SPORT2_TFSDIV (val) bfin_write16(SPORT2_TFSDIV, val)#define pSPORT2_TX ((uint32_t volatile *)SPORT2_TX)/* SPORT2 Transmit Data Register */ -#define bfin_read_SPORT2_TX () bfin_read32(SPORT2_TX)#define bfin_write_SPORT2_TX (val) bfin_write32(SPORT2_TX, val)#define pSPORT2_RCR1 ((uint16_t volatile *)SPORT2_RCR1)/* SPORT2 Receive Configuration 1 Register */ #define bfin_read_SPORT2_RCR1 () bfin_read16(SPORT2_RCR1)
@@ -2911,7 +2908,6 @@#define bfin_read_SPORT3_TFSDIV () bfin_read16(SPORT3_TFSDIV)#define bfin_write_SPORT3_TFSDIV (val) bfin_write16(SPORT3_TFSDIV, val)#define pSPORT3_TX ((uint32_t volatile *)SPORT3_TX)/* SPORT3 Transmit Data Register */ -#define bfin_read_SPORT3_TX () bfin_read32(SPORT3_TX)#define bfin_write_SPORT3_TX (val) bfin_write32(SPORT3_TX, val)#define pSPORT3_RCR1 ((uint16_t volatile *)SPORT3_RCR1)/* SPORT3 Receive Configuration 1 Register */ #define bfin_read_SPORT3_RCR1 () bfin_read16(SPORT3_RCR1)
include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h +0 -4
@@ -4885,7 +4885,6 @@#define bfin_read_SPORT0_TFSDIV () bfin_read16(SPORT0_TFSDIV)#define bfin_write_SPORT0_TFSDIV (val) bfin_write16(SPORT0_TFSDIV, val)#define pSPORT0_TX ((uint32_t volatile *)SPORT0_TX)/* SPORT0 Transmit Data Register */ -#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RCR1 ((uint16_t volatile *)SPORT0_RCR1)/* SPORT0 Receive Configuration 1 Register */ #define bfin_read_SPORT0_RCR1 () bfin_read16(SPORT0_RCR1)
@@ -4951,7 +4950,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 Transmit Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RCR1 ((uint16_t volatile *)SPORT1_RCR1)/* SPORT1 Receive Configuration 1 Register */ #define bfin_read_SPORT1_RCR1 () bfin_read16(SPORT1_RCR1)
@@ -5017,7 +5015,6 @@#define bfin_read_SPORT2_TFSDIV () bfin_read16(SPORT2_TFSDIV)#define bfin_write_SPORT2_TFSDIV (val) bfin_write16(SPORT2_TFSDIV, val)#define pSPORT2_TX ((uint32_t volatile *)SPORT2_TX)/* SPORT2 Transmit Data Register */ -#define bfin_read_SPORT2_TX () bfin_read32(SPORT2_TX)#define bfin_write_SPORT2_TX (val) bfin_write32(SPORT2_TX, val)#define pSPORT2_RCR1 ((uint16_t volatile *)SPORT2_RCR1)/* SPORT2 Receive Configuration 1 Register */ #define bfin_read_SPORT2_RCR1 () bfin_read16(SPORT2_RCR1)
@@ -5083,7 +5080,6 @@#define bfin_read_SPORT3_TFSDIV () bfin_read16(SPORT3_TFSDIV)#define bfin_write_SPORT3_TFSDIV (val) bfin_write16(SPORT3_TFSDIV, val)#define pSPORT3_TX ((uint32_t volatile *)SPORT3_TX)/* SPORT3 Transmit Data Register */ -#define bfin_read_SPORT3_TX () bfin_read32(SPORT3_TX)#define bfin_write_SPORT3_TX (val) bfin_write32(SPORT3_TX, val)#define pSPORT3_RCR1 ((uint16_t volatile *)SPORT3_RCR1)/* SPORT3 Receive Configuration 1 Register */ #define bfin_read_SPORT3_RCR1 () bfin_read16(SPORT3_RCR1)
include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h +0 -4
@@ -5233,7 +5233,6 @@#define bfin_read_SPORT0_TFSDIV () bfin_read16(SPORT0_TFSDIV)#define bfin_write_SPORT0_TFSDIV (val) bfin_write16(SPORT0_TFSDIV, val)#define pSPORT0_TX ((uint32_t volatile *)SPORT0_TX)/* SPORT0 Transmit Data Register */ -#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RCR1 ((uint16_t volatile *)SPORT0_RCR1)/* SPORT0 Receive Configuration 1 Register */ #define bfin_read_SPORT0_RCR1 () bfin_read16(SPORT0_RCR1)
@@ -5299,7 +5298,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 Transmit Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RCR1 ((uint16_t volatile *)SPORT1_RCR1)/* SPORT1 Receive Configuration 1 Register */ #define bfin_read_SPORT1_RCR1 () bfin_read16(SPORT1_RCR1)
@@ -5365,7 +5363,6 @@#define bfin_read_SPORT2_TFSDIV () bfin_read16(SPORT2_TFSDIV)#define bfin_write_SPORT2_TFSDIV (val) bfin_write16(SPORT2_TFSDIV, val)#define pSPORT2_TX ((uint32_t volatile *)SPORT2_TX)/* SPORT2 Transmit Data Register */ -#define bfin_read_SPORT2_TX () bfin_read32(SPORT2_TX)#define bfin_write_SPORT2_TX (val) bfin_write32(SPORT2_TX, val)#define pSPORT2_RCR1 ((uint16_t volatile *)SPORT2_RCR1)/* SPORT2 Receive Configuration 1 Register */ #define bfin_read_SPORT2_RCR1 () bfin_read16(SPORT2_RCR1)
@@ -5431,7 +5428,6 @@#define bfin_read_SPORT3_TFSDIV () bfin_read16(SPORT3_TFSDIV)#define bfin_write_SPORT3_TFSDIV (val) bfin_write16(SPORT3_TFSDIV, val)#define pSPORT3_TX ((uint32_t volatile *)SPORT3_TX)/* SPORT3 Transmit Data Register */ -#define bfin_read_SPORT3_TX () bfin_read32(SPORT3_TX)#define bfin_write_SPORT3_TX (val) bfin_write32(SPORT3_TX, val)#define pSPORT3_RCR1 ((uint16_t volatile *)SPORT3_RCR1)/* SPORT3 Receive Configuration 1 Register */ #define bfin_read_SPORT3_RCR1 () bfin_read16(SPORT3_RCR1)
include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h +0 -2
@@ -1798,7 +1798,6 @@#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RX ((uint32_t volatile *)SPORT0_RX) -#define bfin_read_SPORT0_RX () bfin_read32(SPORT0_RX)#define bfin_write_SPORT0_RX (val) bfin_write32(SPORT0_RX, val)#define pSPORT0_RCR1 ((uint16_t volatile *)SPORT0_RCR1)#define bfin_read_SPORT0_RCR1 () bfin_read16(SPORT0_RCR1)
@@ -1861,7 +1860,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX) -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RX ((uint32_t volatile *)SPORT1_RX)#define bfin_read_SPORT1_RX () bfin_read32(SPORT1_RX)
include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h +0 -2
@@ -1039,7 +1039,6 @@#define bfin_read_SPORT0_TFSDIV () bfin_read16(SPORT0_TFSDIV)#define bfin_write_SPORT0_TFSDIV (val) bfin_write16(SPORT0_TFSDIV, val)#define pSPORT0_TX ((uint32_t volatile *)SPORT0_TX)/* SPORT0 TX Data Register */ -#define bfin_read_SPORT0_TX () bfin_read32(SPORT0_TX)#define bfin_write_SPORT0_TX (val) bfin_write32(SPORT0_TX, val)#define pSPORT0_RX ((uint32_t volatile *)SPORT0_RX)/* SPORT0 RX Data Register */ #define bfin_read_SPORT0_RX () bfin_read32(SPORT0_RX)
@@ -1081,7 +1080,6 @@#define bfin_read_SPORT1_TFSDIV () bfin_read16(SPORT1_TFSDIV)#define bfin_write_SPORT1_TFSDIV (val) bfin_write16(SPORT1_TFSDIV, val)#define pSPORT1_TX ((uint32_t volatile *)SPORT1_TX)/* SPORT1 TX Data Register */ -#define bfin_read_SPORT1_TX () bfin_read32(SPORT1_TX)#define bfin_write_SPORT1_TX (val) bfin_write32(SPORT1_TX, val)#define pSPORT1_RX ((uint32_t volatile *)SPORT1_RX)/* SPORT1 RX Data Register */ #define bfin_read_SPORT1_RX () bfin_read32(SPORT1_RX)
Signature · 1 line
1.6.2
PATCH 14/32 Blackfin: fix SIC_RVECT definition: it is 16bits, not 32bits
In reply to Mike Frysinger--- .../mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 6 +++--- .../mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h +3 -3
@@ -6,9 +6,9 @@#ifndef __BFIN_CDEF_ADSP_EDN_BF52x_extended__#define __BFIN_CDEF_ADSP_EDN_BF52x_extended__ -#define pSIC_RVECT ((uint32_t volatile *)SIC_RVECT)/* Interrupt Reset Vector Address Register */ -#define bfin_read_SIC_RVECT () bfin_read32(SIC_RVECT) -#define bfin_write_SIC_RVECT (val) bfin_write32(SIC_RVECT, val) +#define pSIC_RVECT ((uint16_t volatile *)SIC_RVECT)/* Interrupt Reset Vector Address Register */ +#define bfin_read_SIC_RVECT () bfin_read16(SIC_RVECT) +#define bfin_write_SIC_RVECT (val) bfin_write16(SIC_RVECT, val)#define pSIC_IMASK0 ((uint32_t volatile *)SIC_IMASK0)/* Interrupt Mask Register */ #define bfin_read_SIC_IMASK0 () bfin_read32(SIC_IMASK0)#define bfin_write_SIC_IMASK0 (val) bfin_write32(SIC_IMASK0, val)
include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h +3 -3
@@ -27,9 +27,9 @@#define pSYSCR ((uint16_t volatile *)SYSCR)/* System Configuration Register */ #define bfin_read_SYSCR () bfin_read16(SYSCR)#define bfin_write_SYSCR (val) bfin_write16(SYSCR, val) -#define pSIC_RVECT ((uint32_t volatile *)SIC_RVECT)/* Interrupt Reset Vector Address Register */ -#define bfin_read_SIC_RVECT () bfin_read32(SIC_RVECT) -#define bfin_write_SIC_RVECT (val) bfin_write32(SIC_RVECT, val) +#define pSIC_RVECT ((uint16_t volatile *)SIC_RVECT)/* Interrupt Reset Vector Address Register */ +#define bfin_read_SIC_RVECT () bfin_read16(SIC_RVECT) +#define bfin_write_SIC_RVECT (val) bfin_write16(SIC_RVECT, val)#define pSIC_IMASK ((uint32_t volatile *)SIC_IMASK)/* Interrupt Mask Register */ #define bfin_read_SIC_IMASK () bfin_read32(SIC_IMASK)#define bfin_write_SIC_IMASK (val) bfin_write32(SIC_IMASK, val)
Signature · 1 line
1.6.2
PATCH 15/32 Blackfin: simplify symbol_lookup() a bit
In reply to Mike FrysingerNo need to skip a byte as the symbol table handles this.
--- cpu/blackfin/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
cpu/blackfin/traps.c +1 -1
@@ -193,7 +193,7 @@ static const char *symbol_lookup(unsigned long addr, unsigned long *caddr)while (*sym) { sym_addr =simple_strtoul (sym, &esym,16 ); - sym = esym +1 ; + sym = esym;if (sym_addr > addr)break ; *caddr = sym_addr;
Signature · 1 line
1.6.2
PATCH 16/32 Blackfin: kill off LDR jump block
In reply to Mike FrysingerThe Boot ROM uses EVT1 as the entry point so set that rather than having to use a tiny jump block in the default EVT1 location.
--- blackfin_config.mk | 1 + board/bf533-ezkit/u-boot.lds.S | 5 ++--- board/bf533-stamp/u-boot.lds.S | 5 ++--- board/bf537-stamp/u-boot.lds.S | 5 ++--- board/bf561-ezkit/u-boot.lds.S | 5 ++--- cpu/blackfin/cpu.c | 8 +------- cpu/blackfin/initcode.c | 4 ++++ 7 files changed, 14 insertions(+), 19 deletions(-)
blackfin_config.mk +1 -0
@@ -36,6 +36,7 @@ endif SYM_PREFIX = _ +LDR_FLAGS += -J LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE)) LDR_FLAGS += --use-vmas ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
board/bf533-ezkit/u-boot.lds.S +2 -3
@@ -44,12 +44,11 @@ OUTPUT_ARCH(bfin) -/* The 0xC offset is so we don't clobber the tiny LDR jump block. */ MEMORY { ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN - l1_code : ORIGIN = L1_INST_SRAM+0xC, LENGTH = L1_INST_SRAM_SIZE - l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE + l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE + l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE } ENTRY(_start)
board/bf533-stamp/u-boot.lds.S +2 -3
@@ -44,12 +44,11 @@ OUTPUT_ARCH(bfin) -/* The 0xC offset is so we don't clobber the tiny LDR jump block. */ MEMORY { ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN - l1_code : ORIGIN = L1_INST_SRAM+0xC, LENGTH = L1_INST_SRAM_SIZE - l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE + l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE + l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE } ENTRY(_start)
board/bf537-stamp/u-boot.lds.S +2 -3
@@ -44,12 +44,11 @@ OUTPUT_ARCH(bfin) -/* The 0xC offset is so we don't clobber the tiny LDR jump block. */ MEMORY { ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN - l1_code : ORIGIN = L1_INST_SRAM+0xC, LENGTH = L1_INST_SRAM_SIZE - l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE + l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE + l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE } ENTRY(_start)
board/bf561-ezkit/u-boot.lds.S +2 -3
@@ -44,12 +44,11 @@ OUTPUT_ARCH(bfin) -/* The 0xC offset is so we don't clobber the tiny LDR jump block. */ MEMORY { ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN - l1_code : ORIGIN = L1_INST_SRAM+0xC, LENGTH = L1_INST_SRAM_SIZE - l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE + l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE + l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE } ENTRY(_start)
cpu/blackfin/cpu.c +1 -7
@@ -25,18 +25,12 @@ ulong bfin_poweron_retx; __attribute__ ((__noreturn__))void cpu_init_f (ulong bootflag,ulong loaded_from_ldr) { -/* Build a NOP slide over the LDR jump block. Whee! */ -serial_early_puts ("NOP Slide\n" ); -char nops[0xC ]; -memset (nops,0x00 ,sizeof (nops)); -extern char _stext_l1; -memcpy (&_stext_l1 -sizeof (nops), nops,sizeof (nops)); -if (!loaded_from_ldr) {/* Relocate sections into L1 if the LDR didn't do it -- don't * check length because the linker script does the size * checking at build time. */ +extern char _stext_l1;serial_early_puts ("L1 Relocate\n" );extern char _stext_l1, _etext_l1, _stext_l1_lma;memcpy (&_stext_l1, &_stext_l1_lma, (&_etext_l1 - &_stext_l1));
cpu/blackfin/initcode.c +4 -0
@@ -372,6 +372,10 @@ void initcode(ADI_BOOT_DATA *bootstruct)bfin_write_SIC_IWR (-1 );#endif +/* tell the bootrom where our entry point is */ +if (CONFIG_BFIN_BOOT_MODE !=BFIN_BOOT_BYPASS ) +bfin_write_EVT1 (CONFIG_SYS_MONITOR_BASE ); +serial_putc ('>' );serial_putc ('\n' );
Signature · 1 line
1.6.2
PATCH 17/32 Blackfin: handle reboot anomaly 432
In reply to Mike FrysingerWorkaround anomaly 432:
The bfrom_SysControl() firmware function does not clear the SIC_IWR1 register before executing the PLL programming sequence. Therefore, any interrupt enabled in the SIC_IWR1 register prior to the call to bfrom_SysControl() can prematurely terminate the idle sequence required for the PLL to relock properly. SIC_IWR0 is properly handled.
--- cpu/blackfin/initcode.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
cpu/blackfin/initcode.c +6 -0
@@ -273,8 +273,14 @@ void initcode(ADI_BOOT_DATA *bootstruct) memory_settings.uwPllCtl =CONFIG_PLL_CTL_VAL ; memory_settings.uwPllDiv =CONFIG_PLL_DIV_VAL ; memory_settings.uwPllLockCnt =CONFIG_PLL_LOCKCNT_VAL ; +#if ANOMALY_05000432 +bfin_write_SIC_IWR1 (0 ); +#endif syscontrol (SYSCTRL_WRITE |SYSCTRL_VRCTL |SYSCTRL_PLLCTL |SYSCTRL_PLLDIV |SYSCTRL_LOCKCNT | (CONFIG_VR_CTL_VAL &FREQ_MASK ?SYSCTRL_INTVOLTAGE :SYSCTRL_EXTVOLTAGE ), &memory_settings,NULL ); +#if ANOMALY_05000432 +bfin_write_SIC_IWR1 (-1 ); +#endif }else {serial_putc ('L' );
Signature · 1 line
1.6.2
PATCH 18/32 Blackfin: setup a sane default EBIU_SDBCTL for SDRAM controllers
In reply to Mike FrysingerIf the board config does not specify an explicit EBIU_SDBCTL value, set it up with sane values based on other configuration options.
--- cpu/blackfin/initcode.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-)
cpu/blackfin/initcode.c +33 -0
@@ -203,6 +203,39 @@ static inline void serial_putc(char c)# define CONFIG_VR_CTL_VAL (CONFIG_VR_CTL_CLKBUF | CONFIG_VR_CTL_VLEV | CONFIG_VR_CTL_FREQ)#endif +#ifndef EBIU_RSTCTL +/* Blackfin with SDRAM */ +#ifndef CONFIG_EBIU_SDBCTL_VAL +# if CONFIG_MEM_SIZE ==16 +# define CONFIG_EBSZ_VAL EBSZ_16 +# elif CONFIG_MEM_SIZE ==32 +# define CONFIG_EBSZ_VAL EBSZ_32 +# elif CONFIG_MEM_SIZE ==64 +# define CONFIG_EBSZ_VAL EBSZ_64 +# elif CONFIG_MEM_SIZE ==128 +# define CONFIG_EBSZ_VAL EBSZ_128 +# elif CONFIG_MEM_SIZE ==256 +# define CONFIG_EBSZ_VAL EBSZ_256 +# elif CONFIG_MEM_SIZE ==512 +# define CONFIG_EBSZ_VAL EBSZ_512 +# else +# error You need to define CONFIG_EBIU_SDBCTL_VAL or CONFIG_MEM_SIZE +# endif +# if CONFIG_MEM_ADD_WDTH ==8 +# define CONFIG_EBCAW_VAL EBCAW_8 +# elif CONFIG_MEM_ADD_WDTH ==9 +# define CONFIG_EBCAW_VAL EBCAW_9 +# elif CONFIG_MEM_ADD_WDTH ==10 +# define CONFIG_EBCAW_VAL EBCAW_10 +# elif CONFIG_MEM_ADD_WDTH ==11 +# define CONFIG_EBCAW_VAL EBCAW_11 +# else +# error You need to define CONFIG_EBIU_SDBCTL_VAL or CONFIG_MEM_ADD_WDTH +# endif +# define CONFIG_EBIU_SDBCTL_VAL (CONFIG_EBCAW_VAL | CONFIG_EBSZ_VAL | EBE) +#endif +#endif +BOOTROM_CALLED_FUNC_ATTR void initcode(ADI_BOOT_DATA *bootstruct) {
Signature · 1 line
1.6.2
PATCH 19/32 Blackfin: do not program voltage regulator on parts that do not have one
In reply to Mike FrysingerSome newer Blackfins (like the BF51x) do not have an on-chip voltage regulator, so do not attempt to program the memory as if it does.
--- cpu/blackfin/initcode.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-)
cpu/blackfin/initcode.c +20 -3
@@ -203,6 +203,15 @@ static inline void serial_putc(char c)# define CONFIG_VR_CTL_VAL (CONFIG_VR_CTL_CLKBUF | CONFIG_VR_CTL_VLEV | CONFIG_VR_CTL_FREQ)#endif +/* some parts do not have an on-chip voltage regulator */ +#if defined(__ADSPBF51x__) +# define CONFIG_HAS_VR 0 +# undef CONFIG_VR_CTL_VAL +# define CONFIG_VR_CTL_VAL 0 +#else +# define CONFIG_HAS_VR 1 +#endif +#ifndef EBIU_RSTCTL /* Blackfin with SDRAM */ #ifndef CONFIG_EBIU_SDBCTL_VAL
@@ -302,15 +311,23 @@ void initcode(ADI_BOOT_DATA *bootstruct)serial_putc ('S' );ADI_SYSCTRL_VALUES memory_settings; - memory_settings.uwVrCtl =CONFIG_VR_CTL_VAL ; +uint32_t actions =SYSCTRL_WRITE |SYSCTRL_PLLCTL |SYSCTRL_PLLDIV |SYSCTRL_LOCKCNT ; +if (CONFIG_HAS_VR ) { + actions |=SYSCTRL_VRCTL ; +if (CONFIG_VR_CTL_VAL &FREQ_MASK ) + actions |=SYSCTRL_INTVOLTAGE ; +else + actions |=SYSCTRL_EXTVOLTAGE ; + memory_settings.uwVrCtl =CONFIG_VR_CTL_VAL ; + }else + actions |=SYSCTRL_EXTVOLTAGE ; memory_settings.uwPllCtl =CONFIG_PLL_CTL_VAL ; memory_settings.uwPllDiv =CONFIG_PLL_DIV_VAL ; memory_settings.uwPllLockCnt =CONFIG_PLL_LOCKCNT_VAL ;#if ANOMALY_05000432 bfin_write_SIC_IWR1 (0 );#endif -syscontrol (SYSCTRL_WRITE |SYSCTRL_VRCTL |SYSCTRL_PLLCTL |SYSCTRL_PLLDIV |SYSCTRL_LOCKCNT | - (CONFIG_VR_CTL_VAL &FREQ_MASK ?SYSCTRL_INTVOLTAGE :SYSCTRL_EXTVOLTAGE ), &memory_settings,NULL ); +bfrom_SysControl (actions, &memory_settings,NULL );#if ANOMALY_05000432 bfin_write_SIC_IWR1 (-1 );#endif
Signature · 1 line
1.6.2
PATCH 20/32 Blackfin: put memory into self-refresh before/after programming clocks
In reply to Mike FrysingerWhen initializing the core clocks, stick external memory into self-refresh. This gains us a few cool things:
- support suspend-to-RAM with Linux
- reprogram clocks automatically when doing "go" on u-boot.bin in RAM
- make sure settings are stable before flashing new version
- finally fully unify initialize startup code path between LDR/non-LDR
--- cpu/blackfin/initcode.c | 189 +++++++++++++++++++++++++++++++++++------------ cpu/blackfin/start.S | 83 ++++++++++++-------- 2 files changed, 190 insertions(+), 82 deletions(-)
cpu/blackfin/initcode.c +140 -49
@@ -12,6 +12,7 @@#include <config.h> #include <asm/blackfin.h> #include <asm/mach-common/bits/bootrom.h> +#include <asm/mach-common/bits/core.h> #include <asm/mach-common/bits/ebiu.h> #include <asm/mach-common/bits/pll.h> #include <asm/mach-common/bits/uart.h>
@@ -257,6 +258,8 @@ void initcode(ADI_BOOT_DATA *bootstruct) divB =serial_early_get_div (); } +serial_putc ('A' ); +#ifdef CONFIG_HW_WATCHDOG # ifndef CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE # define CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE 20000
@@ -273,7 +276,23 @@ void initcode(ADI_BOOT_DATA *bootstruct) }#endif -serial_putc ('S' ); +serial_putc ('B' ); + +/* If external memory is enabled, put it into self refresh first. */ +bool put_into_srfs = false; +#ifdef EBIU_RSTCTL +if (bfin_read_EBIU_RSTCTL () &DDR_SRESET ) { +bfin_write_EBIU_RSTCTL (bfin_read_EBIU_RSTCTL () |SRREQ ); + put_into_srfs = true; + } +#else +if (bfin_read_EBIU_SDBCTL () &EBE ) { +bfin_write_EBIU_SDGCTL (bfin_read_EBIU_SDGCTL () |SRFS ); + put_into_srfs = true; + } +#endif + +serial_putc ('C' );/* Blackfin bootroms use the SPI slow read opcode instead of the SPI * fast read, so we need to slow down the SPI clock a lot more during
@@ -286,29 +305,26 @@ void initcode(ADI_BOOT_DATA *bootstruct)bfin_write_SPI_BAUD (CONFIG_SPI_BAUD_INITBLOCK ); } -serial_putc ('B' ); +serial_putc ('D' ); -/* Disable all peripheral wakeups except for the PLL event. */ -#ifdef SIC_IWR0 -bfin_write_SIC_IWR0 (1 ); -bfin_write_SIC_IWR1 (0 ); -# ifdef SIC_IWR2 -bfin_write_SIC_IWR2 (0 ); -# endif -#elif defined(SICA_IWR0 ) -bfin_write_SICA_IWR0 (1 ); -bfin_write_SICA_IWR1 (0 ); +/* If we're entering self refresh, make sure it has happened. */ + if (put_into_srfs) +#ifdef EBIU_RSTCTL +while (!(bfin_read_EBIU_RSTCTL () &SRACK )) #else -bfin_write_SIC_IWR (1 ); + while (!(bfin_read_EBIU_SDSTAT() & SDSRA))#endif +continue ; + +serial_putc ('E' );/* With newer bootroms, we use the helper function to set up * the memory controller. Older bootroms lacks such helpers * so we do it ourselves. */ -#define BOOTROM_CAPS_SYSCONTROL 0 -if (BOOTROM_CAPS_SYSCONTROL ) { -serial_putc ('S' ); +uint16_t vr_ctl =bfin_read_VR_CTL (); +if (!ANOMALY_05000386 ) { +serial_putc ('F' );ADI_SYSCTRL_VALUES memory_settings;uint32_t actions =SYSCTRL_WRITE |SYSCTRL_PLLCTL |SYSCTRL_PLLDIV |SYSCTRL_LOCKCNT ;
@@ -332,22 +348,38 @@ void initcode(ADI_BOOT_DATA *bootstruct)bfin_write_SIC_IWR1 (-1 );#endif }else { -serial_putc ('L' ); +serial_putc ('G' ); + +/* Disable all peripheral wakeups except for the PLL event. */ +#ifdef SIC_IWR0 +bfin_write_SIC_IWR0 (1 ); +bfin_write_SIC_IWR1 (0 ); +# ifdef SIC_IWR2 +bfin_write_SIC_IWR2 (0 ); +# endif +#elif defined(SICA_IWR0 ) +bfin_write_SICA_IWR0 (1 ); +bfin_write_SICA_IWR1 (0 ); +#else +bfin_write_SIC_IWR (1 ); +#endif + +serial_putc ('H' );bfin_write_PLL_LOCKCNT (CONFIG_PLL_LOCKCNT_VAL ); -serial_putc ('A' ); +serial_putc ('I' );/* Only reprogram when needed to avoid triggering unnecessary * PLL relock sequences. */ -if (bfin_read_VR_CTL () !=CONFIG_VR_CTL_VAL ) { +if (vr_ctl !=CONFIG_VR_CTL_VAL ) {serial_putc ('!' );bfin_write_VR_CTL (CONFIG_VR_CTL_VAL ); asm("idle;" ); } -serial_putc ('C' ); +serial_putc ('J' );bfin_write_PLL_DIV (CONFIG_PLL_DIV_VAL );
@@ -361,8 +393,26 @@ void initcode(ADI_BOOT_DATA *bootstruct)bfin_write_PLL_CTL (CONFIG_PLL_CTL_VAL ); asm("idle;" ); } + +serial_putc ('L' ); + +/* Restore all peripheral wakeups. */ +#ifdef SIC_IWR0 +bfin_write_SIC_IWR0 (-1 ); +bfin_write_SIC_IWR1 (-1 ); +# ifdef SIC_IWR2 +bfin_write_SIC_IWR2 (-1 ); +# endif +#elif defined(SICA_IWR0 ) +bfin_write_SICA_IWR0 (-1 ); +bfin_write_SICA_IWR1 (-1 ); +#else +bfin_write_SIC_IWR (-1 ); +#endif } +serial_putc ('M' ); +/* Since we've changed the SCLK above, we may need to update * the UART divisors (UART baud rates are based on SCLK). * Do the division by hand as there are no native instructions
@@ -380,23 +430,32 @@ void initcode(ADI_BOOT_DATA *bootstruct)serial_early_put_div (quotient -ANOMALY_05000230 ); } -serial_putc ('F' ); +serial_putc ('N' ); -/* Program the async banks controller. */ -bfin_write_EBIU_AMBCTL0 (CONFIG_EBIU_AMBCTL0_VAL ); -bfin_write_EBIU_AMBCTL1 (CONFIG_EBIU_AMBCTL1_VAL ); -bfin_write_EBIU_AMGCTL (CONFIG_EBIU_AMGCTL_VAL ); +/* Program the external memory controller before we come out of +* self-refresh. This only works with our SDRAM controller. +*/ +#ifndef EBIU_RSTCTL +bfin_write_EBIU_SDRRC (CONFIG_EBIU_SDRRC_VAL ); +bfin_write_EBIU_SDBCTL (CONFIG_EBIU_SDBCTL_VAL ); +bfin_write_EBIU_SDGCTL (CONFIG_EBIU_SDGCTL_VAL ); +#endif -#ifdef EBIU_MODE -/* Not all parts have these additional MMRs. */ -bfin_write_EBIU_MBSCTL (CONFIG_EBIU_MBSCTL_VAL ); -bfin_write_EBIU_MODE (CONFIG_EBIU_MODE_VAL ); -bfin_write_EBIU_FCTL (CONFIG_EBIU_FCTL_VAL ); +serial_putc ('O' ); + +/* Now that we've reprogrammed, take things out of self refresh. */ + if (put_into_srfs) +#ifdef EBIU_RSTCTL +bfin_write_EBIU_RSTCTL (bfin_read_EBIU_RSTCTL () & ~(SRREQ )); +#else +bfin_write_EBIU_SDGCTL (bfin_read_EBIU_SDGCTL () & ~(SRFS ));#endif -serial_putc ('I' ); +serial_putc ('P' ); -/* Program the external memory controller. */ +/* Our DDR controller sucks and cannot be programmed while in +* self-refresh. So we have to pull it out before programming. +*/ #ifdef EBIU_RSTCTL bfin_write_EBIU_RSTCTL (bfin_read_EBIU_RSTCTL () |0x1 /*DDRSRESET*/ |CONFIG_EBIU_RSTCTL_VAL );bfin_write_EBIU_DDRCTL0 (CONFIG_EBIU_DDRCTL0_VAL );
@@ -406,28 +465,60 @@ void initcode(ADI_BOOT_DATA *bootstruct)/* default is disable, so don't need to force this */ bfin_write_EBIU_DDRCTL3 (CONFIG_EBIU_DDRCTL3_VAL );# endif -#else -bfin_write_EBIU_SDRRC (CONFIG_EBIU_SDRRC_VAL ); -bfin_write_EBIU_SDBCTL (CONFIG_EBIU_SDBCTL_VAL ); -bfin_write_EBIU_SDGCTL (CONFIG_EBIU_SDGCTL_VAL ); +# ifdef CONFIG_EBIU_DDRQUE_VAL +bfin_write_EBIU_DDRQUE (bfin_read_EBIU_DDRQUE () |CONFIG_EBIU_DDRQUE_VAL ); +# endif #endif -serial_putc ('N' ); +serial_putc ('Q' ); -/* Restore all peripheral wakeups. */ -#ifdef SIC_IWR0 -bfin_write_SIC_IWR0 (-1 ); -bfin_write_SIC_IWR1 (-1 ); -# ifdef SIC_IWR2 -bfin_write_SIC_IWR2 (-1 ); -# endif -#elif defined(SICA_IWR0 ) -bfin_write_SICA_IWR0 (-1 ); -bfin_write_SICA_IWR1 (-1 ); -#else -bfin_write_SIC_IWR (-1 ); +/* Are we coming out of hibernate (suspend to memory) ? +* The memory layout is: +* 0x0: hibernate magic for anomaly 307 (0xDEADBEEF) +* 0x4: return address +* 0x8: stack pointer +* +* SCKELOW is unreliable on older parts (anomaly 307) +*/ +if (ANOMALY_05000307 || vr_ctl &0x8000 ) { +uint32_t *hibernate_magic =0 ; +__builtin_bfin_ssync ();/* make sure memory controller is done */ +if (hibernate_magic[0 ] ==0xDEADBEEF ) { +serial_putc ('R' ); +bfin_write_EVT15 (hibernate_magic[1 ]); +bfin_write_IMASK (EVT_IVG15 ); + __asm__ __volatile__ ( +/* load reti early to avoid anomaly 281 */ +"reti = %0;" +/* clear hibernate magic */ +"[%0] = %1;" +/* load stack pointer */ +"SP = [%0 + 8];" +/* lower ourselves from reset ivg to ivg15 */ +"raise 15;" +"rti;" + : + :"p" (hibernate_magic),"d" (0x2000 /* jump.s 0 */ ) + ); + } + } + +serial_putc ('S' ); + +/* Program the async banks controller. */ +bfin_write_EBIU_AMBCTL0 (CONFIG_EBIU_AMBCTL0_VAL ); +bfin_write_EBIU_AMBCTL1 (CONFIG_EBIU_AMBCTL1_VAL ); +bfin_write_EBIU_AMGCTL (CONFIG_EBIU_AMGCTL_VAL ); + +#ifdef EBIU_MODE +/* Not all parts have these additional MMRs. */ +bfin_write_EBIU_MBSCTL (CONFIG_EBIU_MBSCTL_VAL ); +bfin_write_EBIU_MODE (CONFIG_EBIU_MODE_VAL ); +bfin_write_EBIU_FCTL (CONFIG_EBIU_FCTL_VAL );#endif +serial_putc ('T' ); +/* tell the bootrom where our entry point is */ if (CONFIG_BFIN_BOOT_MODE !=BFIN_BOOT_BYPASS )bfin_write_EVT1 (CONFIG_SYS_MONITOR_BASE );
cpu/blackfin/start.S +50 -33
105 lines not on this page · raw message
Signature · 1 line
1.6.2
PATCH 21/32 Blackfin: unify common ADI board settings
In reply to Mike FrysingerRather than duplicate the same ADI settings in every ADI board, create a common ADI config header and have all ADI boards start using that. This will also make merging the ~10 boards I have to forward port a lot easier.
--- include/configs/bf533-ezkit.h | 286 ++++++++++--------------- include/configs/bf533-stamp.h | 429 ++++++++++++------------------------- include/configs/bf537-stamp.h | 421 ++++++++++++------------------------ include/configs/bf561-ezkit.h | 295 ++++++++++---------------- include/configs/bfin_adi_common.h | 198 +++++++++++++++++ 5 files changed, 690 insertions(+), 939 deletions(-) create mode 100644 include/configs/bfin_adi_common.h
include/configs/bf533-ezkit.h +114 -172
@@ -2,213 +2,155 @@* U-boot - Configuration file for BF533 EZKIT board */ -#ifndef __CONFIG_EZKIT533_H__ -#define __CONFIG_EZKIT533_H__ +#ifndef __CONFIG_BF533_EZKIT_H__ +#define __CONFIG_BF533_EZKIT_H__#include <asm/blackfin-config-pre.h> -#define CONFIG_BAUDRATE 57600 -#define CONFIG_BOOTDELAY 5 -#define CONFIG_SYS_AUTOLOAD "no"/*rarpb, bootp or dhcp commands will perform only a */ +/* +* Processor Settings +*/ +#define CONFIG_BFIN_CPU bf533-0.3 +#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_LOADADDR 0x01000000/* default load address */ -#define CONFIG_BOOTCOMMAND "tftp $(loadaddr) linux" -/* #define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw" */ -#define CONFIG_DRIVER_SMC91111 1 -#define CONFIG_SMC91111_BASE 0x20310300 +/* +* Clock Settings +* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV +* SCLK = (CLKIN * VCO_MULT) / SCLK_DIV +*/ +/* CONFIG_CLKIN_HZ is any value in Hz */ +#define CONFIG_CLKIN_HZ 27000000 +/* CLKIN_HALF controls the DF bit in PLL_CTL 0 = CLKIN */ +/* 1 = CLKIN / 2 */ +#define CONFIG_CLKIN_HALF 0 +/* PLL_BYPASS controls the BYPASS bit in PLL_CTL 0 = do not bypass */ +/* 1 = bypass PLL */ +#define CONFIG_PLL_BYPASS 0 +/* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL */ +/* Values can range from 0-63 (where 0 means 64) */ +#define CONFIG_VCO_MULT 22 +/* CCLK_DIV controls the core clock divider */ +/* Values can be 1, 2, 4, or 8 ONLY */ +#define CONFIG_CCLK_DIV 1 +/* SCLK_DIV controls the system clock divider */ +/* Values can range from 1-15 */ +#define CONFIG_SCLK_DIV 5 -#if 0 -#define CONFIG_MII -#define CONFIG_SYS_DISCOVER_PHY -#endif -#define CONFIG_RTC_BFIN 1 -#define CONFIG_BOOT_RETRY_TIME -1/* Enable this if bootretry required, currently its disabled */ - -#define CONFIG_PANIC_HANG 1 - -#define CONFIG_BFIN_CPU bf533-0.3 -#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS - -/* This sets the default state of the cache on U-Boot's boot */ -#define CONFIG_ICACHE_ON -#define CONFIG_DCACHE_ON - -/* CONFIG_CLKIN_HZ is any value in Hz */ -#define CONFIG_CLKIN_HZ 27000000 -/* CONFIG_CLKIN_HALF controls what is passed to PLL 0=CLKIN */ -/* 1=CLKIN/2 */ -#define CONFIG_CLKIN_HALF 0 -/* CONFIG_PLL_BYPASS controls if the PLL is used 0=don't bypass */ -/* 1=bypass PLL */ -#define CONFIG_PLL_BYPASS 0 -/* CONFIG_VCO_MULT controls what the multiplier of the PLL is. */ -/* Values can range from 1-64 */ -#define CONFIG_VCO_MULT 22 -/* CONFIG_CCLK_DIV controls what the core clock divider is */ -/* Values can be 1, 2, 4, or 8 ONLY */ -#define CONFIG_CCLK_DIV 1 -/* CONFIG_SCLK_DIV controls what the peripheral clock divider is */ -/* Values can range from 1-15 */ -#define CONFIG_SCLK_DIV 5 -/* CONFIG_SPI_BAUD controls the SPI peripheral clock divider */ -/* Values can range from 2-65535 */ -/* SCK Frequency = SCLK / (2 * CONFIG_SPI_BAUD) */ -#define CONFIG_SPI_BAUD 2 -#define CONFIG_SPI_BAUD_INITBLOCK 4 - -#if (CONFIG_CLKIN_HALF ==0 ) -#define CONFIG_VCO_HZ ( CONFIG_CLKIN_HZ * CONFIG_VCO_MULT ) +/* +* Memory Settings +*/ +#define CONFIG_MEM_SIZE 32 +/* Early EZKITs had 32megs, but later have 64megs */ +#if (CONFIG_MEM_SIZE ==64 ) +# define CONFIG_MEM_ADD_WDTH 10#else -#define CONFIG_VCO_HZ (( CONFIG_CLKIN_HZ * CONFIG_VCO_MULT ) / 2 ) +# define CONFIG_MEM_ADD_WDTH 9#endif -#if (CONFIG_PLL_BYPASS ==0 ) -#define CONFIG_CCLK_HZ ( CONFIG_VCO_HZ / CONFIG_CCLK_DIV ) -#define CONFIG_SCLK_HZ ( CONFIG_VCO_HZ / CONFIG_SCLK_DIV ) -#else -#define CONFIG_CCLK_HZ CONFIG_CLKIN_HZ -#define CONFIG_SCLK_HZ CONFIG_CLKIN_HZ -#endif +#define CONFIG_EBIU_SDRRC_VAL 0x398 +#define CONFIG_EBIU_SDGCTL_VAL 0x91118d -#define CONFIG_MEM_SIZE 32/* 128, 64, 32, 16 */ -#define CONFIG_MEM_ADD_WDTH 9/* 8, 9, 10, 11 */ -#define CONFIG_MEM_MT48LC16M16A2TG_75 1 +#define CONFIG_EBIU_AMGCTL_VAL 0xFF +#define CONFIG_EBIU_AMBCTL0_VAL 0x7BB07BB0 +#define CONFIG_EBIU_AMBCTL1_VAL 0xFFC27BB0 -#define CONFIG_LOADS_ECHO 1 +#define CONFIG_SYS_MONITOR_LEN (256 * 1024) +#define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* -* BOOTP options +* Network Settings */ -#define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME +#define ADI_CMDS_NETWORK 1 +#define CONFIG_DRIVER_SMC91111 1 +#define CONFIG_SMC91111_BASE 0x20310300 +#define SMC91111_EEPROM_INIT () \ + do { \ + *pFIO_DIR |= PF1; \ + *pFIO_FLAG_S = PF1; \ + SSYNC(); \ + } while (0) +#define CONFIG_HOSTNAME bf533-ezkit +/* Uncomment next line to use fixed MAC address */ +/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */ /* -* Command line configuration. +* Flash Settings */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_PING -#define CONFIG_CMD_ELF -#define CONFIG_CMD_I2C -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_DATE - - -#define CONFIG_BOOTARGS "root=/dev/mtdblock0 ip=192.168.0.15:192.168.0.2:192.168.0.1:255.255.255.0:ezkit:eth0:off console=ttyBF0,57600" - -#define CONFIG_SYS_PROMPT "bfin> "/* Monitor Command Prompt */ -#if defined(CONFIG_CMD_KGDB ) -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ -#else -#define CONFIG_SYS_CBSIZE 256/* Console I/O Buffer Size */ -#endif -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS 16/* max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_MEMTEST_START 0x00000000/* memtest works on */ -#define CONFIG_SYS_MEMTEST_END ( (CONFIG_MEM_SIZE - 1) * 1024 * 1024)/* 1 ... 31 MB in DRAM */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000/* default load address */ -#define CONFIG_SYS_HZ 1000/* decrementer freq: 10 ms ticks */ -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_MAX_RAM_SIZE (CONFIG_MEM_SIZE * 1024 * 1024)#define CONFIG_SYS_FLASH_BASE 0x20000000 - -#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_MAX_RAM_SIZE - CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN (128 << 10)/* Reserve 128 kB for malloc() */ -#define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN) -#define CONFIG_SYS_GBL_DATA_SIZE 0x4000 -#define CONFIG_SYS_GBL_DATA_ADDR (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_STACKBASE (CONFIG_SYS_GBL_DATA_ADDR - 4) - -#define CONFIG_SYS_BOOTMAPSZ (8 << 20)/* Initial Memory map for Linux */ -#define CONFIG_SYS_FLASH0_BASE 0x20000000 -#define CONFIG_SYS_FLASH1_BASE 0x20200000 -#define CONFIG_SYS_FLASH2_BASE 0x20280000 -#define CONFIG_SYS_MAX_FLASH_BANKS 3/* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 40/* max number of sectors on one chip */ - -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 3 +#define CONFIG_SYS_MAX_FLASH_SECT 40 +#define CONFIG_ENV_IS_IN_FLASH 1#define CONFIG_ENV_ADDR 0x20020000 -#define CONFIG_ENV_SECT_SIZE 0x10000/* Total Size of Environment Sector */ - -/* JFFS Partition offset set */ -#define CONFIG_SYS_JFFS2_FIRST_BANK 0 -#define CONFIG_SYS_JFFS2_NUM_BANKS 1 -/* 512k reserved for u-boot */ -#define CONFIG_SYS_JFFS2_FIRST_SECTOR 11 - - -/* -* Stack sizes -*/ -#define CONFIG_STACKSIZE (128*1024)/* regular stack */ - -#define POLL_MODE 1 +#define CONFIG_ENV_SECT_SIZE 0x10000#define FLASH_TOT_SECT 40 -#define FLASH_SIZE 0x220000 -#define CONFIG_SYS_FLASH_SIZE 0x220000 -/* -* Initialize PSD4256 registers for using I2C -*/ -#define CONFIG_MISC_INIT_R /* -* I2C settings +* I2C Settings * By default PF1 is used as SDA and PF0 as SCL on the Stamp board */ -#define CONFIG_SOFT_I2C 1/* I2C bit-banged */ -/* -* Software (bit-bang) I2C driver configuration -*/ -#define PF_SCL PF0 -#define PF_SDA PF1 - -#define I2C_INIT (*pFIO_DIR |= PF_SCL); asm("ssync;") -#define I2C_ACTIVE (*pFIO_DIR |= PF_SDA); *pFIO_INEN &= ~PF_SDA; asm("ssync;") -#define I2C_TRISTATE (*pFIO_DIR &= ~PF_SDA); *pFIO_INEN |= PF_SDA; asm("ssync;") -#define I2C_READ ((volatile)(*pFIO_FLAG_D & PF_SDA) != 0); asm("ssync;") -#define I2C_SDA (bit) if(bit) { \ - *pFIO_FLAG_S = PF_SDA; \ - asm("ssync;"); \ - } \ - else { \ - *pFIO_FLAG_C = PF_SDA; \ - asm("ssync;"); \ - } -#define I2C_SCL (bit) if(bit) { \ - *pFIO_FLAG_S = PF_SCL; \ - asm("ssync;"); \ - } \ - else { \ - *pFIO_FLAG_C = PF_SCL; \ - asm("ssync;"); \ - } -#define I2C_DELAY udelay(5)/* 1/4 I2C clock duration */ +#define CONFIG_SOFT_I2C +#ifdef CONFIG_SOFT_I2C +#define PF_SCL PF0 +#define PF_SDA PF1 +#define I2C_INIT \ + do { \ + *pFIO_DIR |= PF_SCL; \ + SSYNC(); \ + } while (0) +#define I2C_ACTIVE \ + do { \ + *pFIO_DIR |= PF_SDA; \ + *pFIO_INEN &= ~PF_SDA; \ + SSYNC(); \ + } while (0) +#define I2C_TRISTATE \ + do { \ + *pFIO_DIR &= ~PF_SDA; \ + *pFIO_INEN |= PF_SDA; \ + SSYNC(); \ + } while (0) +#define I2C_READ ((*pFIO_FLAG_D & PF_SDA) != 0) +#define I2C_SDA (bit) \ + do { \ + if (bit) \ + *pFIO_FLAG_S = PF_SDA; \ + else \ + *pFIO_FLAG_C = PF_SDA; \ + SSYNC(); \ + } while (0) +#define I2C_SCL (bit) \ + do { \ + if (bit) \ + *pFIO_FLAG_S = PF_SCL; \ + else \ + *pFIO_FLAG_C = PF_SCL; \ + SSYNC(); \ + } while (0) +#define I2C_DELAY udelay(5)/* 1/4 I2C clock duration */ #define CONFIG_SYS_I2C_SPEED 50000#define CONFIG_SYS_I2C_SLAVE 0 +#endif -#define CONFIG_SYS_BOOTM_LEN 0x4000000/* Large Image Length, set to 64 Meg */ -#define CONFIG_EBIU_SDRRC_VAL 0x398 -#define CONFIG_EBIU_SDGCTL_VAL 0x91118d -#define CONFIG_EBIU_SDBCTL_VAL 0x13 +/* +* Misc Settings +*/ +#define CONFIG_MISC_INIT_R +#define CONFIG_RTC_BFIN +#define CONFIG_UART_CONSOLE 0 + -#define CONFIG_EBIU_AMGCTL_VAL 0xFF -#define CONFIG_EBIU_AMBCTL0_VAL 0x7BB07BB0 -#define CONFIG_EBIU_AMBCTL1_VAL 0xFFC27BB0 +/* +* Pull in common ADI header for remaining command/environment setup +*/ +#include <configs/bfin_adi_common.h> #include <asm/blackfin-config-post.h>
include/configs/bf533-stamp.h +133 -296
504 lines not on this page · raw message
include/configs/bf537-stamp.h +136 -285
509 lines not on this page · raw message
include/configs/bf561-ezkit.h +109 -186
338 lines not on this page · raw message
include/configs/bfin_adi_common.h new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
1.6.2
PATCH 22/32 Blackfin: bf533-stamp: rewrite startup LED notifications
In reply to Mike FrysingerAgain, don't clobber pins that we aren't actually using, and use the common LED framework rather than our own hob-job-but-not-really-working.
--- board/bf533-stamp/bf533-stamp.c | 62 ++++++++++++++++++++++++++++++--------- include/configs/bf533-stamp.h | 25 +++++++++++++++ 2 files changed, 73 insertions(+), 14 deletions(-)
board/bf533-stamp/bf533-stamp.c +48 -14
@@ -1,7 +1,7 @@/* -* U-boot - stamp.c STAMP board specific routines +* U-boot - main board file * -* Copyright (c) 2005-2007 Analog Devices Inc. +* Copyright (c) 2005-2009 Analog Devices Inc. * * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -31,15 +31,6 @@DECLARE_GLOBAL_DATA_PTR ; -#define STATUS_LED_OFF 0 -#define STATUS_LED_ON 1 - -#ifdef CONFIG_SHOW_BOOT_PROGRESS -# define SHOW_BOOT_PROGRESS (arg) show_boot_progress(arg) -#else -# define SHOW_BOOT_PROGRESS (arg) -#endif -int checkboard (void ) {printf ("Board: ADI BF533 Stamp board\n" );
@@ -192,10 +183,15 @@ void cf_outsw(unsigned short *addr, unsigned short *sect_buf, int words) }#endif -void stamp_led_set (int LED1 ,int LED2 ,int LED3 ) +#ifdef CONFIG_SHOW_BOOT_PROGRESS + +#define STATUS_LED_OFF 0 +#define STATUS_LED_ON 1 + +static void stamp_led_set (int LED1 ,int LED2 ,int LED3 ) { - *pFIO_INEN &= ~(PF2 |PF3 |PF4 ); - *pFIO_DIR |= (PF2 |PF3 |PF4 ); +bfin_write_FIO_INEN (bfin_read_FIO_INEN () & ~(PF2 |PF3 |PF4 )); +bfin_write_FIO_DIR (bfin_read_FIO_DIR () | (PF2 |PF3 |PF4 ));if (LED1 ==STATUS_LED_OFF ) *pFIO_FLAG_S =PF2 ;
@@ -249,3 +245,41 @@ void show_boot_progress(int status) break; } } +#endif + +#ifdef CONFIG_STATUS_LED +#include <status_led.h> + +static void set_led (int pf,int state) +{ +switch (state) { +case STATUS_LED_OFF :bfin_write_FIO_FLAG_S (pf);break ; +case STATUS_LED_BLINKING :bfin_write_FIO_FLAG_T (pf);break ; +case STATUS_LED_ON :bfin_write_FIO_FLAG_C (pf);break ; + } +} + +static void set_leds (led_id_t mask,int state) +{ +if (mask &0x1 )set_led (PF2 , state); +if (mask &0x2 )set_led (PF3 , state); +if (mask &0x4 )set_led (PF4 , state); +} + +void __led_init (led_id_t mask,int state) +{ +bfin_write_FIO_INEN (bfin_read_FIO_INEN () & ~(PF2 |PF3 |PF4 )); +bfin_write_FIO_DIR (bfin_read_FIO_DIR () | (PF2 |PF3 |PF4 )); +} + +void __led_set (led_id_t mask,int state) +{ +set_leds (mask, state); +} + +void __led_toggle (led_id_t mask) +{ +set_leds (mask,STATUS_LED_BLINKING ); +} + +#endif
include/configs/bf533-stamp.h +25 -0
@@ -196,6 +196,31 @@/* FLASH/ETHERNET uses the same async bank */ #define SHARED_RESOURCES 1 +/* define to enable boot progress via leds */ +/* #define CONFIG_SHOW_BOOT_PROGRESS */ + +/* define to enable run status via led */ +/* #define CONFIG_STATUS_LED */ +#ifdef CONFIG_STATUS_LED +#define CONFIG_BOARD_SPECIFIC_LED +#ifndef __ASSEMBLY__ +typedef unsigned int led_id_t ; +void __led_init (led_id_t mask,int state); +void __led_set (led_id_t mask,int state); +void __led_toggle (led_id_t mask); +#endif +/* use LED1 to indicate booting/alive */ +#define STATUS_LED_BOOT 0 +#define STATUS_LED_BIT 1 +#define STATUS_LED_STATE STATUS_LED_ON +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 4) +/* use LED2 to indicate crash */ +#define STATUS_LED_CRASH 1 +#define STATUS_LED_BIT1 2 +#define STATUS_LED_STATE1 STATUS_LED_ON +#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) +#endif +/* define to enable splash screen support */ /* #define CONFIG_VIDEO */
Signature · 1 line
1.6.2
PATCH 23/32 Blackfin: bf533-stamp: bump up default clocks
In reply to Mike FrysingerSince the hardware can handle it, bump the default clocks from 80mhz SCLK and 398mhz CCLK to 100mhz SCLK and 498mhz CCLK.
--- include/configs/bf533-stamp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/bf533-stamp.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_PLL_BYPASS 0/* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL */ /* Values can range from 0-63 (where 0 means 64) */ -#define CONFIG_VCO_MULT 36 +#define CONFIG_VCO_MULT 45/* CCLK_DIV controls the core clock divider */ /* Values can be 1, 2, 4, or 8 ONLY */ #define CONFIG_CCLK_DIV 1
Signature · 1 line
1.6.2
PATCH 24/32 Blackfin: add clkin_hz= to default kernel command line for ADI boards
In reply to Mike Frysinger--- include/configs/bfin_adi_common.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/configs/bfin_adi_common.h +1 -0
@@ -110,6 +110,7 @@#endif #define CONFIG_BOOTARGS \ "root=/dev/mtdblock0 rw " \ + "clkin_hz=" MK_STR(CONFIG_CLKIN_HZ) " " \ "earlyprintk=" \ "serial," \ "uart" MK_STR(CONFIG_UART_CONSOLE) "," \
Signature · 1 line
1.6.2
PATCH 25/32 Blackfin: bf537-stamp: rewrite MAC-in-flash handling
In reply to Mike FrysingerUse the common net eth functions to setup the env/global data with the MAC address, and properly handle the case where CONFIG_SYS_NO_FLASH is defined.
--- board/bf537-stamp/bf537-stamp.c | 79 +++++++++++++++++++++++++++----------- include/asm-blackfin/net.h | 28 ++++++++++++++ 2 files changed, 84 insertions(+), 23 deletions(-) create mode 100644 include/asm-blackfin/net.h
board/bf537-stamp/bf537-stamp.c +56 -23
@@ -1,7 +1,7 @@/* -* U-boot - BF537.c +* U-boot - main board file * -* Copyright (c) 2005-2007 Analog Devices Inc. +* Copyright (c) 2005-2009 Analog Devices Inc. * * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -29,7 +29,7 @@#include <config.h> #include <command.h> #include <asm/blackfin.h> -#include <asm/io.h> +#include <asm/net.h> #include <net.h> #include <asm/mach-common/bits/bootrom.h> #include <netdev.h>
@@ -89,22 +89,63 @@ phys_size_t initdram(int board_type)return gd->bd->bi_memsize; } +void board_reset (void ) +{ +/* workaround for weak pull ups on ssel */ +if (CONFIG_BFIN_BOOT_MODE ==BFIN_BOOT_SPI_MASTER ) { +bfin_write_PORTF_FER (bfin_read_PORTF_FER () & ~PF10 ); +bfin_write_PORTFIO_SET (PF10 ); +udelay (1 ); + } +} + +#ifdef CONFIG_BFIN_MAC +static void board_init_enetaddr (uchar *mac_addr) +{ +#ifdef CONFIG_SYS_NO_FLASH +# define USE_MAC_IN_FLASH 0 +#else +# define USE_MAC_IN_FLASH 1 +#endif +bool valid_mac = false; + +if (USE_MAC_IN_FLASH ) { +/* we cram the MAC in the last flash sector */ +uchar *board_mac_addr = (uchar *)0x203F0000 ; +if (is_valid_ether_addr (board_mac_addr)) { +memcpy (mac_addr, board_mac_addr,6 ); + valid_mac = true; + } + } + +if (!valid_mac) { +puts ("Warning: Generating 'random' MAC address\n" ); +bfin_gen_rand_mac (mac_addr); + } + +eth_setenv_enetaddr ("ethaddr" , mac_addr); +} + +int board_eth_init (bd_t *bis) +{ +return bfin_EMAC_initialize (bis); +} +#endif +#if defined(CONFIG_MISC_INIT_R )/* miscellaneous platform dependent initialisations */ int misc_init_r (void ) { -#if defined(CONFIG_CMD_NET ) -char nid[32 ]; -unsigned char *pMACaddr = (unsigned char *)0x203F0000 ; - -/* The 0xFF check here is to make sure we don't use the address -* in flash if it's simply been erased (aka all 0xFF values) */ -if (getenv ("ethaddr" ) ==NULL &&is_valid_ether_addr (pMACaddr)) { -sprintf (nid,"%02x:%02x:%02x:%02x:%02x:%02x" , - pMACaddr[0 ], pMACaddr[1 ], - pMACaddr[2 ], pMACaddr[3 ], pMACaddr[4 ], pMACaddr[5 ]); -setenv ("ethaddr" , nid); - } +#ifdef CONFIG_BFIN_MAC +uchar enetaddr[6 ]; +if (!eth_getenv_enetaddr ("ethaddr" , enetaddr)) +board_init_enetaddr (enetaddr); +#endif + +#ifndef CONFIG_SYS_NO_FLASH +/* we use the last sector for the MAC address / POST LDR */ +extern flash_info_t flash_info[]; +flash_protect (FLAG_PROTECT_SET ,0x203F0000 ,0x203FFFFF , &flash_info[0 ]);#endif #if defined(CONFIG_BFIN_IDE )
@@ -127,14 +168,6 @@ int misc_init_r(void) }#endif /* CONFIG_MISC_INIT_R */ -#if defined(CONFIG_BFIN_MAC ) - -int board_eth_init (bd_t *bis) -{ -return bfin_EMAC_initialize (bis); -} -#endif -#ifdef CONFIG_POST /* Using sw10-PF5 as the hotkey */ int post_hotkeys_pressed (void )
include/asm-blackfin/net.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* net.h - misc Blackfin network helpers +* +* Copyright (c) 2008-2009 Analog Devices Inc. +* +* Licensed under the GPL-2 or later. +*/ + +#ifndef __ASM_BFIN_RAND_MAC__ +#define __ASM_BFIN_RAND_MAC__ + +/* If the board does not have a real MAC assigned to it, then generate a +* locally administrated pseudo-random one based on CYCLES and compile date. +*/ +static inline void bfin_gen_rand_mac (uchar *mac_addr) +{ +/* make something up */ +const char s[] = __DATE__; +size_t i; +u32 cycles; +for (i =0 ; i <6 ; ++i) { + asm("%0 = CYCLES;" :"=r" (cycles)); + mac_addr[i] = cycles ^ s[i]; + } + mac_addr[0 ] = (mac_addr[0 ] |0x02 ) & ~0x01 ;/* make it local unicast */ +} + +#endif
Signature · 1 line
1.6.2
PATCH 26/32 Blackfin: bf537-stamp: bump default SCLK up to 125MHz
In reply to Mike FrysingerSince all of the bf537-stamp and bf537-ezkit boards out there can handle it, increase the speed of SCLK to 125MHz rather than 100MHz.
--- include/configs/bf537-stamp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/bf537-stamp.h +1 -1
@@ -36,7 +36,7 @@#define CONFIG_CCLK_DIV 1/* SCLK_DIV controls the system clock divider */ /* Values can range from 1-15 */ -#define CONFIG_SCLK_DIV 5 +#define CONFIG_SCLK_DIV 4/*
Signature · 1 line
1.6.2
PATCH 27/32 Blackfin: bf537-stamp: increase monitor size
In reply to Mike FrysingerThe new jffs2 code pushed the code size just over the limit, so increase the limit a bit more.
--- include/configs/bf537-stamp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/bf537-stamp.h +1 -1
@@ -52,7 +52,7 @@#define CONFIG_EBIU_AMBCTL0_VAL 0x7BB07BB0#define CONFIG_EBIU_AMBCTL1_VAL 0xFFC27BB0 -#define CONFIG_SYS_MONITOR_LEN (384 * 1024) +#define CONFIG_SYS_MONITOR_LEN (512 * 1024)#define CONFIG_SYS_MALLOC_LEN (384 * 1024)
Signature · 1 line
1.6.2
PATCH 28/32 Blackfin: add hack for crappy m25p80
In reply to Mike Frysinger--- board/bf537-stamp/spi_flash.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
board/bf537-stamp/spi_flash.c +7 -0
@@ -51,6 +51,7 @@ static struct flash_info flash_st_serial_flash[] = { { "m25p10", 0x2011, 32 * 1024, 4 }, { "m25p20", 0x2012, 64 * 1024, 4 }, { "m25p40", 0x2013, 64 * 1024, 8 }, + { "m25p80", 0x20FF, 64 * 1024, 16 }, { "m25p16", 0x2015, 64 * 1024, 32 }, { "m25p32", 0x2016, 64 * 1024, 64 }, { "m25p64", 0x2017, 64 * 1024, 128 },
@@ -309,6 +310,11 @@ static int spi_detect_part(void)if (called_init)return 0 ; +#ifdef CONFIG_SPI_FLASH_M25P80 + flash.manufacturer_id =JED_MANU_ST ; + flash.device_id1 =0x20 ; + flash.device_id2 =0xFF ; +#else SPI_ON ();/* Send the request for the part identification */
@@ -328,6 +334,7 @@ static int spi_detect_part(void) flash.device_id2 =spi_write_read_byte (0 );SPI_OFF (); +#endif dev_id = (flash.device_id1 <<8 ) | flash.device_id2;
Signature · 1 line
1.6.2
PATCH 29/32 Blackfin: add support for SST SPI flashes
In reply to Mike Frysinger--- board/bf537-stamp/spi_flash.c | 107 ++++++++++++++++++++++++++++++----------- 1 files changed, 78 insertions(+), 29 deletions(-)
board/bf537-stamp/spi_flash.c +78 -29
@@ -59,6 +59,15 @@ static struct flash_info flash_st_serial_flash[] = { { NULL, 0, 0, 0 } }; +/* SPI Speeds: 20 MHz / 40 MHz */ +static struct flash_info flash_sst_serial_flash[] = { + {"SST25WF512" ,0x2501 ,4 *1024 ,128 }, + {"SST25WF010" ,0x2502 ,4 *1024 ,256 }, + {"SST25WF020" ,0x2503 ,4 *1024 ,512 }, + {"SST25WF040" ,0x2504 ,4 *1024 ,1024 }, + {NULL ,0 ,0 ,0 } +}; +/* SPI Speeds: 66 MHz / 33 MHz */ static struct flash_info flash_atmel_dataflash[] = { {"AT45DB011x" ,0x0c ,264 ,512 },
@@ -98,6 +107,13 @@ static struct flash_ops flash_st_ops = { .status = 0x05, }; +static struct flash_ops flash_sst_ops = { + .read =OP_READ , + .write =0x02 , + .erase =0x20 , + .status =0x05 , +}; +static struct flash_ops flash_atmel_ops = { .read =OP_READ , .write =0x82 ,
@@ -131,6 +147,7 @@ static struct {enum {JED_MANU_SPANSION =0x01 ,JED_MANU_ST =0x20 , +JED_MANU_SST =0xBF ,JED_MANU_ATMEL =0x1F ,JED_MANU_WINBOND =0xEF , };
@@ -149,6 +166,12 @@ static struct manufacturer_info flash_manufacturers[] = { .ops = &flash_st_ops, }, { + .name = "SST", + .id = JED_MANU_SST, + .flashes = flash_sst_serial_flash, + .ops = &flash_sst_ops, + }, + { .name = "Atmel", .id = JED_MANU_ATMEL, .flashes = flash_atmel_dataflash,
@@ -276,6 +299,7 @@ static int wait_for_ready_status(void)switch (flash.manufacturer_id) {case JED_MANU_SPANSION :case JED_MANU_ST : +case JED_MANU_SST :case JED_MANU_WINBOND :if (!(read_status_register () &0x01 ))return 0 ;
@@ -297,6 +321,50 @@ static int wait_for_ready_status(void)return -1 ; } +static int enable_writing (void ) +{ +ulong start; + +if (flash.manufacturer_id ==JED_MANU_ATMEL ) +return 0 ; + +/* A write enable instruction must previously have been executed */ +SPI_ON (); +spi_write_read_byte (0x06 ); +SPI_OFF (); + +/* The status register will be polled to check the write enable latch "WREN" */ + start =get_timer (0 ); +while (get_timer (0 ) - start <TIMEOUT ) { +if (read_status_register () &0x02 ) +return 0 ; + +if (ctrlc ()) { +puts ("\nAbort\n" ); +return -1 ; + } + } + +puts ("Timeout\n" ); +return -1 ; +} + +static void write_status_register (uint8_t val) +{ +if (flash.manufacturer_id !=JED_MANU_SST ) +hang (); + +if (enable_writing ()) +return ; + +/* send instruction to write status register */ +SPI_ON (); +spi_write_read_byte (0x01 ); +/* and clear it! */ +spi_write_read_byte (val); +SPI_OFF (); +} +/* Request and read the manufacturer and device id of parts which * are compatible with the JEDEC standard (JEP106) and use that to * setup other operating conditions.
@@ -351,6 +419,7 @@ static int spi_detect_part(void)switch (flash.manufacturer_id) {case JED_MANU_SPANSION :case JED_MANU_ST : +case JED_MANU_SST :case JED_MANU_WINBOND :for (i =0 ; flash.manufacturer->flashes[i].name; ++i) {if (dev_id == flash.manufacturer->flashes[i].id)
@@ -362,7 +431,11 @@ static int spi_detect_part(void) flash.flash = &flash.manufacturer->flashes[i]; flash.sector_size = flash.flash->sector_size; flash.num_sectors = flash.flash->num_sectors; - flash.write_length =256 ; + +if (flash.manufacturer_id ==JED_MANU_SST ) + flash.write_length =1 ;/* pwnt :( */ +else + flash.write_length =256 ;break ;case JED_MANU_ATMEL : {
@@ -388,6 +461,10 @@ static int spi_detect_part(void) } } +/* the SST parts power up with software protection enabled by default */ +if (flash.manufacturer_id ==JED_MANU_SST ) +write_status_register (0 ); + called_init =1 ;return 0 ;
@@ -572,34 +649,6 @@ static int read_flash(unsigned long address, long count, uchar *buffer)return 0 ; } -static int enable_writing (void ) -{ -ulong start; - -if (flash.manufacturer_id ==JED_MANU_ATMEL ) -return 0 ; - -/* A write enable instruction must previously have been executed */ -SPI_ON (); -spi_write_read_byte (0x06 ); -SPI_OFF (); - -/* The status register will be polled to check the write enable latch "WREN" */ - start =get_timer (0 ); -while (get_timer (0 ) - start <TIMEOUT ) { -if (read_status_register () &0x02 ) -return 0 ; - -if (ctrlc ()) { -puts ("\nAbort\n" ); -return -1 ; - } - } - -puts ("Timeout\n" ); -return -1 ; -} -static long address_to_sector (unsigned long address) {if (address > (flash.num_sectors * flash.sector_size) -1 )
Signature · 1 line
1.6.2
PATCH 30/32 Blackfin: overhaul SPI flash handling to speed things up
In reply to Mike Frysinger--- board/bf537-stamp/spi_flash.c | 132 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 126 insertions(+), 6 deletions(-)
board/bf537-stamp/spi_flash.c +126 -6
@@ -18,6 +18,7 @@#include <malloc.h> #include <asm/io.h> #include <asm/mach-common/bits/spi.h> +#include <asm/mach-common/bits/dma.h> /* Forcibly phase out these */ #ifdef CONFIG_SPI_FLASH_NUM_SECTORS
@@ -185,7 +186,7 @@ static struct manufacturer_info flash_manufacturers[] = { }, }; -#define TIMEOUT 5000/* timeout of 5 seconds */ +#define TIMEOUT 5000/* timeout of 5 seconds */ /* If part has multiple SPI flashes, assume SPI0 as that is * the one we can boot off of ...
@@ -213,6 +214,7 @@ static void SPI_INIT(void)/* [#3541] This delay appears to be necessary, but not sure * exactly why as the history behind it is non-existant. */ + *pSPI_CTL =0 ;udelay (CONFIG_CCLK_HZ /25000000 );/* enable SPI pins: SSEL, MOSI, MISO, SCK */
@@ -229,14 +231,13 @@ static void SPI_INIT(void)#endif /* initate communication upon write of TDBR */ - *pSPI_CTL = (SPE |MSTR |CPHA |CPOL |0x01 ); + *pSPI_CTL = (SPE |MSTR |CPHA |CPOL |TDBR_CORE ); *pSPI_BAUD =CONFIG_SPI_BAUD ; }static void SPI_DEINIT (void ) { -/* put SPI settings back to reset state */ - *pSPI_CTL =0x0400 ; + *pSPI_CTL =0 ; *pSPI_BAUD =0 ;SSYNC (); }
@@ -622,9 +623,10 @@ static void transmit_address(uint32_t addr)* int pnData - pointer to store value read from flash * long lCount - number of elements to read */ +#ifdef CONFIG_SPI_READFLASH_NODMA static int read_flash (unsigned long address,long count,uchar *buffer) { -size_t i; +size_t i, j;/* Send the read command to SPI device */ SPI_ON ();
@@ -638,16 +640,134 @@ static int read_flash(unsigned long address, long count, uchar *buffer)/* After the SPI device address has been placed on the MOSI pin the data can be */ /* received on the MISO pin. */ + j = flash.sector_size <<1 ;for (i =1 ; i <= count; ++i) { *buffer++ =spi_write_read_byte (0 ); -if (i % flash.sector_size ==0 ) +if (!j--) {puts ("." ); + j = flash.sector_size; + } + } + +SPI_OFF (); + +return 0 ; +} +#else + +#ifdef __ADSPBF54x__ +#define bfin_write_DMA_SPI_IRQ_STATUS bfin_write_DMA4_IRQ_STATUS +#define bfin_read_DMA_SPI_IRQ_STATUS bfin_read_DMA4_IRQ_STATUS +#define bfin_write_DMA_SPI_CURR_DESC_PTR bfin_write_DMA4_CURR_DESC_PTR +#define bfin_write_DMA_SPI_CONFIG bfin_write_DMA4_CONFIG +#elif defined(__ADSPBF533__) || defined(__ADSPBF532__) || defined(__ADSPBF531__) || \ + defined(__ADSPBF538__) || defined(__ADSPBF539__) +#define bfin_write_DMA_SPI_IRQ_STATUS bfin_write_DMA5_IRQ_STATUS +#define bfin_read_DMA_SPI_IRQ_STATUS bfin_read_DMA5_IRQ_STATUS +#define bfin_write_DMA_SPI_CURR_DESC_PTR bfin_write_DMA5_CURR_DESC_PTR +#define bfin_write_DMA_SPI_CONFIG bfin_write_DMA5_CONFIG +#elif defined(__ADSPBF561__) +#define bfin_write_DMA_SPI_IRQ_STATUS bfin_write_DMA16_IRQ_STATUS +#define bfin_read_DMA_SPI_IRQ_STATUS bfin_read_DMA16_IRQ_STATUS +#define bfin_write_DMA_SPI_CURR_DESC_PTR bfin_write_DMA16_CURR_DESC_PTR +#define bfin_write_DMA_SPI_CONFIG bfin_write_DMA16_CONFIG +#elif defined(__ADSPBF537__) || defined(__ADSPBF536__) || defined(__ADSPBF534__) || \ + defined(__ADSPBF52x__) || defined(__ADSPBF51x__) +#define bfin_write_DMA_SPI_IRQ_STATUS bfin_write_DMA7_IRQ_STATUS +#define bfin_read_DMA_SPI_IRQ_STATUS bfin_read_DMA7_IRQ_STATUS +#define bfin_write_DMA_SPI_CURR_DESC_PTR bfin_write_DMA7_CURR_DESC_PTR +#define bfin_write_DMA_SPI_CONFIG bfin_write_DMA7_CONFIG +#else +#error "Please provide SPI DMA channel defines" +#endif + +struct dmadesc_array { +unsigned long start_addr; +unsigned short cfg; +unsigned short x_count; +short x_modify; +unsigned short y_count; +short y_modify; +} __attribute__((packed)); + +/* +* Read a value from flash for verify purpose +* Inputs: unsigned long ulStart - holds the SPI start address +* int pnData - pointer to store value read from flash +* long lCount - number of elements to read +*/ + +static int read_flash (unsigned long address,long count,uchar *buffer) +{ +unsigned int ndsize; +struct dmadesc_array dma[2 ]; +/* Send the read command to SPI device */ + +if (!count) +return 0 ; + + dma[0 ].start_addr = (unsigned long )buffer; + dma[0 ].x_modify =1 ; +if (count <=65536 ) { +blackfin_dcache_flush_invalidate_range (buffer, buffer + count); + ndsize =NDSIZE_5 ; + dma[0 ].cfg =NDSIZE_0 |WNR |WDSIZE_8 |FLOW_STOP |DMAEN |DI_EN ; + dma[0 ].x_count = count; + }else { +blackfin_dcache_flush_invalidate_range (buffer, buffer +65536 -1 ); + ndsize =NDSIZE_7 ; + dma[0 ].cfg =NDSIZE_5 |WNR |WDSIZE_8 |FLOW_ARRAY |DMAEN |DMA2D ; + dma[0 ].x_count =0 ;/* 2^16 */ + dma[0 ].y_count = count >>16 ;/* count / 2^16 */ + dma[0 ].y_modify =1 ; + dma[1 ].start_addr = (unsigned long )(buffer + (count & ~0xFFFF )); + dma[1 ].cfg =NDSIZE_0 |WNR |WDSIZE_8 |FLOW_STOP |DMAEN |DI_EN ; + dma[1 ].x_count = count &0xFFFF ;/* count % 2^16 */ + dma[1 ].x_modify =1 ; } +bfin_write_DMA_SPI_CONFIG (0 ); +bfin_write_DMA_SPI_IRQ_STATUS (DMA_DONE |DMA_ERR ); +bfin_write_DMA_SPI_CURR_DESC_PTR (dma); + +SPI_ON (); + +spi_write_read_byte (flash.ops->read); +transmit_address (address); + +#ifndef CONFIG_SPI_FLASH_SLOW_READ +/* Send dummy byte when doing SPI fast reads */ +spi_write_read_byte (0 ); +#endif + +bfin_write_DMA_SPI_CONFIG (ndsize |FLOW_ARRAY |DMAEN ); + *pSPI_CTL = (MSTR |CPHA |CPOL |RDBR_DMA |SPE |SZ ); +SSYNC (); + +/* +* We already invalidated the first 64k, +* now while we just wait invalidate the remaining part. +* Its not likely that the DMA is going to overtake +*/ +if (count >65536 ) +blackfin_dcache_flush_invalidate_range (buffer +65536 , + buffer + count); + +while (!(bfin_read_DMA_SPI_IRQ_STATUS () &DMA_DONE )) +if (ctrlc ()) +break ; +SPI_OFF (); + *pSPI_CTL =0 ; + +bfin_write_DMA_SPI_CONFIG (0 ); + + *pSPI_CTL = (SPE |MSTR |CPHA |CPOL |TDBR_CORE ); +return 0 ; } +#endif static long address_to_sector (unsigned long address) {
Signature · 1 line
1.6.2
PATCH 31/32 Blackfin: add support for S25FL128 parts
In reply to Mike Frysinger--- board/bf537-stamp/spi_flash.c | 85 ++++++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 38 deletions(-)
board/bf537-stamp/spi_flash.c +47 -38
@@ -33,63 +33,65 @@struct flash_info {char *name;uint16_t id; +uint16_t ext_id;unsigned sector_size;unsigned num_sectors; };/* SPI Speeds: 50 MHz / 33 MHz */ static struct flash_info flash_spansion_serial_flash[] = { - {"S25FL016" ,0x0215 ,64 *1024 ,32 }, - {"S25FL032" ,0x0216 ,64 *1024 ,64 }, - {"S25FL064" ,0x0217 ,64 *1024 ,128 }, - {"S25FL0128" ,0x0218 ,256 *1024 ,64 }, - {NULL ,0 ,0 ,0 } + {"S25FL016" ,0x0215 ,0 ,64 *1024 ,32 }, + {"S25FL032" ,0x0216 ,0 ,64 *1024 ,64 }, + {"S25FL064" ,0x0217 ,0 ,64 *1024 ,128 }, + {"S25FL128-00" ,0x2018 ,0x0301 ,64 *1024 ,256 },/* Package marking FL128PIF */ + {"S25FL128-01" ,0x2018 ,0x0300 ,128 *1024 ,64 },/* Package marking FL128PIFL */ + {NULL ,0 ,0 ,0 ,0 } };/* SPI Speeds: 50 MHz / 20 MHz */ static struct flash_info flash_st_serial_flash[] = { - {"m25p05" ,0x2010 ,32 *1024 ,2 }, - {"m25p10" ,0x2011 ,32 *1024 ,4 }, - {"m25p20" ,0x2012 ,64 *1024 ,4 }, - {"m25p40" ,0x2013 ,64 *1024 ,8 }, - {"m25p80" ,0x20FF ,64 *1024 ,16 }, - {"m25p16" ,0x2015 ,64 *1024 ,32 }, - {"m25p32" ,0x2016 ,64 *1024 ,64 }, - {"m25p64" ,0x2017 ,64 *1024 ,128 }, - {"m25p128" ,0x2018 ,256 *1024 ,64 }, - {NULL ,0 ,0 ,0 } + {"m25p05" ,0x2010 ,0 ,32 *1024 ,2 }, + {"m25p10" ,0x2011 ,0 ,32 *1024 ,4 }, + {"m25p20" ,0x2012 ,0 ,64 *1024 ,4 }, + {"m25p40" ,0x2013 ,0 ,64 *1024 ,8 }, + {"m25p80" ,0x20FF ,0 ,64 *1024 ,16 }, + {"m25p16" ,0x2015 ,0 ,64 *1024 ,32 }, + {"m25p32" ,0x2016 ,0 ,64 *1024 ,64 }, + {"m25p64" ,0x2017 ,0 ,64 *1024 ,128 }, + {"m25p128" ,0x2018 ,0 ,256 *1024 ,64 }, + {NULL ,0 ,0 ,0 ,0 } };/* SPI Speeds: 20 MHz / 40 MHz */ static struct flash_info flash_sst_serial_flash[] = { - {"SST25WF512" ,0x2501 ,4 *1024 ,128 }, - {"SST25WF010" ,0x2502 ,4 *1024 ,256 }, - {"SST25WF020" ,0x2503 ,4 *1024 ,512 }, - {"SST25WF040" ,0x2504 ,4 *1024 ,1024 }, - {NULL ,0 ,0 ,0 } + {"SST25WF512" ,0x2501 ,0 ,4 *1024 ,128 }, + {"SST25WF010" ,0x2502 ,0 ,4 *1024 ,256 }, + {"SST25WF020" ,0x2503 ,0 ,4 *1024 ,512 }, + {"SST25WF040" ,0x2504 ,0 ,4 *1024 ,1024 }, + {NULL ,0 ,0 ,0 ,0 } };/* SPI Speeds: 66 MHz / 33 MHz */ static struct flash_info flash_atmel_dataflash[] = { - {"AT45DB011x" ,0x0c ,264 ,512 }, - {"AT45DB021x" ,0x14 ,264 ,1025 }, - {"AT45DB041x" ,0x1c ,264 ,2048 }, - {"AT45DB081x" ,0x24 ,264 ,4096 }, - {"AT45DB161x" ,0x2c ,528 ,4096 }, - {"AT45DB321x" ,0x34 ,528 ,8192 }, - {"AT45DB642x" ,0x3c ,1056 ,8192 }, - {NULL ,0 ,0 ,0 } + {"AT45DB011x" ,0x0c ,0 ,264 ,512 }, + {"AT45DB021x" ,0x14 ,0 ,264 ,1025 }, + {"AT45DB041x" ,0x1c ,0 ,264 ,2048 }, + {"AT45DB081x" ,0x24 ,0 ,264 ,4096 }, + {"AT45DB161x" ,0x2c ,0 ,528 ,4096 }, + {"AT45DB321x" ,0x34 ,0 ,528 ,8192 }, + {"AT45DB642x" ,0x3c ,0 ,1056 ,8192 }, + {NULL ,0 ,0 ,0 ,0 } };/* SPI Speed: 50 MHz / 25 MHz or 40 MHz / 20 MHz */ static struct flash_info flash_winbond_serial_flash[] = { - {"W25X10" ,0x3011 ,16 *256 ,32 }, - {"W25X20" ,0x3012 ,16 *256 ,64 }, - {"W25X40" ,0x3013 ,16 *256 ,128 }, - {"W25X80" ,0x3014 ,16 *256 ,256 }, - {"W25P80" ,0x2014 ,256 *256 ,16 }, - {"W25P16" ,0x2015 ,256 *256 ,32 }, - {NULL ,0 ,0 ,0 } + {"W25X10" ,0x3011 ,0 ,16 *256 ,32 }, + {"W25X20" ,0x3012 ,0 ,16 *256 ,64 }, + {"W25X40" ,0x3013 ,0 ,16 *256 ,128 }, + {"W25X80" ,0x3014 ,0 ,16 *256 ,256 }, + {"W25P80" ,0x2014 ,0 ,256 *256 ,16 }, + {"W25P16" ,0x2015 ,0 ,256 *256 ,32 }, + {NULL ,0 ,0 ,0 ,0 } };struct flash_ops {
@@ -140,7 +142,7 @@ static struct {struct manufacturer_info *manufacturer;struct flash_info *flash;struct flash_ops *ops; -uint8_t manufacturer_id, device_id1, device_id2; +uint8_t manufacturer_id, device_id1, device_id2, device_extid1, device_extid2;unsigned int write_length;unsigned long sector_size, num_sectors; } flash;
@@ -372,7 +374,7 @@ static void write_status_register(uint8_t val)*/ static int spi_detect_part (void ) { -uint16_t dev_id; +uint16_t dev_id, dev_extid;size_t i;static char called_init;
@@ -402,10 +404,15 @@ static int spi_detect_part(void)/* Now read in the second device id byte */ flash.device_id2 =spi_write_read_byte (0 ); +/* Read extended device ids */ + flash.device_extid1 =spi_write_read_byte (0 ); + flash.device_extid2 =spi_write_read_byte (0 ); +SPI_OFF ();#endif dev_id = (flash.device_id1 <<8 ) | flash.device_id2; + dev_extid = (flash.device_extid1 <<8 ) | flash.device_extid2;for (i =0 ; i <ARRAY_SIZE (flash_manufacturers); ++i) {if (flash.manufacturer_id == flash_manufacturers[i].id)
@@ -423,7 +430,9 @@ static int spi_detect_part(void)case JED_MANU_SST :case JED_MANU_WINBOND :for (i =0 ; flash.manufacturer->flashes[i].name; ++i) { -if (dev_id == flash.manufacturer->flashes[i].id) +if (dev_id == flash.manufacturer->flashes[i].id && + (flash.manufacturer->flashes[i].ext_id ==0 || + flash.manufacturer->flashes[i].ext_id == dev_extid))break ; }if (!flash.manufacturer->flashes[i].name)
Signature · 1 line
1.6.2
PATCH 32/32 Blackfin: bf537-stamp: split post code out into dedicated post.c
In reply to Mike Frysinger--- board/bf537-stamp/Makefile | 2 +- board/bf537-stamp/bf537-stamp.c | 236 ------------------------------------- board/bf537-stamp/post.c | 244 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 245 insertions(+), 237 deletions(-) create mode 100644 board/bf537-stamp/post.c
board/bf537-stamp/Makefile +1 -1
@@ -32,7 +32,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y := $(BOARD).o cmd_bf537led.o COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o COBJS-$(CONFIG_CMD_NAND) += nand.o -COBJS-$(CONFIG_POST) += post-memory.o +COBJS-$(CONFIG_POST) += post.o post-memory.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
board/bf537-stamp/bf537-stamp.c +0 -236
245 lines not on this page · raw message
board/bf537-stamp/post.c new file +244 -0
244 lines not on this page · raw message
Signature · 1 line
1.6.2