Skip to contentSkip to conversation

Updates cookin for Blackfin for post 2009.03

PATCH New Mike Frysinger 4 participants 58 messages Feb 10, 2009 – Feb 12, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

cover Updates cookin for Blackfin for post 2009.03

i might snip a simple fix or two for 2009.03, but this is stuff largely cookin for the release after 2009.03. we've got setting unification, cache fix ups, some core cleanups, and crap ton of new board ports. i'm posting this stuff now so it can get sorted out sooner rather than later.

Hoan Hoang (1):
Blackfin: ibf-dsp561: new board port

Mike Frysinger (41):
Blackfin: update lockbox api according to latest documentation
Blackfin: safely flush data caches when in writeback mode
Blackfin: add cache_dump commands
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: make sure autoconf.mk is generated early enough
Blackfin: new spibootldr command
Blackfin: add clkin_hz= to default kernel command line for ADI boards
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: bf548-ezkit: new board port
Blackfin: bf527-ezkit: new board port
Blackfin: bf538f-ezkit: new board port
Blackfin: bf526-ezbrd: new board port
Blackfin: bf518f-ezbrd: new board port
Blackfin: cm-bf533: new board port
Blackfin: cm-bf537e: new board port
Blackfin: cm-bf561: new board port
Blackfin: tcm-bf537: new board port
Blackfin: cm-bf548: new board port
Blackfin: cm-bf527: new board port
Blackfin: bf537-pnav: new board port
Blackfin: bf537-minotaur: new board port
Blackfin: bf537-srv1: new board port
Blackfin: blackstamp: new board port

 MAINTAINERS                                        |   32 ++
 MAKEALL                                            |   16 +
 Makefile                                           |   18 +-
 blackfin_config.mk                                 |    1 +
 board/bf518f-ezbrd/.gitignore                      |    1 +
 board/bf518f-ezbrd/Makefile                        |   58 ++
 board/bf518f-ezbrd/bf518f-ezbrd.c                  |   76 +++
 board/bf518f-ezbrd/config.mk                       |   32 ++
 board/bf518f-ezbrd/spi_flash.c                     |    2 +
 board/bf518f-ezbrd/u-boot.lds.S                    |  124 ++++
 board/bf526-ezbrd/.gitignore                       |    1 +
 board/bf526-ezbrd/Makefile                         |   58 ++
 board/bf526-ezbrd/bf526-ezbrd.c                    |  109 ++++
 board/bf526-ezbrd/config.mk                        |   32 ++
 board/bf526-ezbrd/spi_flash.c                      |    2 +
 board/bf526-ezbrd/u-boot.lds.S                     |  124 ++++
 board/bf527-ezkit/.gitignore                       |    1 +
 board/bf527-ezkit/Makefile                         |   59 ++
 board/bf527-ezkit/bf527-ezkit.c                    |   60 ++
 board/bf527-ezkit/config.mk                        |   32 ++
 board/bf527-ezkit/spi_flash.c                      |    2 +
 board/bf527-ezkit/u-boot.lds.S                     |  124 ++++
 board/bf527-ezkit/video.c                          |  317 +++++++++++
 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-minotaur/.gitignore                    |    1 +
 board/bf537-minotaur/Makefile                      |   58 ++
 board/bf537-minotaur/bf537-minotaur.c              |   43 ++
 board/bf537-minotaur/config.mk                     |   33 ++
 board/bf537-minotaur/spi_flash.c                   |    2 +
 board/bf537-minotaur/u-boot.lds.S                  |  143 +++++
 board/bf537-pnav/.gitignore                        |    1 +
 board/bf537-pnav/Makefile                          |   59 ++
 board/bf537-pnav/bf537-pnav.c                      |   43 ++
 board/bf537-pnav/config.mk                         |   32 ++
 board/bf537-pnav/nand.c                            |  100 ++++
 board/bf537-pnav/spi_flash.c                       |    2 +
 board/bf537-pnav/u-boot.lds.S                      |  143 +++++
 board/bf537-srv1/.gitignore                        |    1 +
 board/bf537-srv1/Makefile                          |   58 ++
 board/bf537-srv1/bf537-srv1.c                      |   43 ++
 board/bf537-srv1/config.mk                         |   33 ++
 board/bf537-srv1/spi_flash.c                       |    2 +
 board/bf537-srv1/u-boot.lds.S                      |  143 +++++
 board/bf537-stamp/spi_flash.c                      |  297 ++++++++--
 board/bf537-stamp/u-boot.lds.S                     |    5 +-
 board/bf538f-ezkit/.gitignore                      |    1 +
 board/bf538f-ezkit/Makefile                        |   57 ++
 board/bf538f-ezkit/bf538f-ezkit.c                  |   27 +
 board/bf538f-ezkit/config.mk                       |   33 ++
 board/bf538f-ezkit/u-boot.lds.S                    |  143 +++++
 board/bf548-ezkit/.gitignore                       |    1 +
 board/bf548-ezkit/Makefile                         |   59 ++
 board/bf548-ezkit/bf548-ezkit.c                    |   79 +++
 board/bf548-ezkit/config.mk                        |   37 ++
 board/bf548-ezkit/spi_flash.c                      |    2 +
 board/bf548-ezkit/u-boot.lds.S                     |  124 ++++
 board/bf548-ezkit/video.c                          |  327 +++++++++++
 board/bf561-ezkit/u-boot.lds.S                     |    5 +-
 board/blackstamp/.gitignore                        |    1 +
 board/blackstamp/Makefile                          |   58 ++
 board/blackstamp/blackstamp.c                      |   53 ++
 board/blackstamp/config.mk                         |   32 ++
 board/blackstamp/spi_flash.c                       |    2 +
 board/blackstamp/u-boot.lds.S                      |  143 +++++
 board/cm-bf527/.gitignore                          |    1 +
 board/cm-bf527/Makefile                            |   59 ++
 board/cm-bf527/cm-bf527.c                          |   59 ++
 board/cm-bf527/config.mk                           |   32 ++
 board/cm-bf527/flash-defines.h                     |   51 ++
 board/cm-bf527/flash.c                             |  589 ++++++++++++++++++++
 board/cm-bf527/gpio.c                              |   74 +++
 board/cm-bf527/nand.c                              |    2 +
 board/cm-bf527/spi_flash.c                         |    2 +
 board/cm-bf527/u-boot.lds.S                        |  124 ++++
 board/cm-bf533/.gitignore                          |    1 +
 board/cm-bf533/Makefile                            |   57 ++
 board/cm-bf533/cm-bf533.c                          |   25 +
 board/cm-bf533/config.mk                           |   33 ++
 board/cm-bf533/flash-defines.h                     |   49 ++
 board/cm-bf533/flash.c                             |  283 ++++++++++
 board/cm-bf533/u-boot.lds.S                        |  143 +++++
 board/cm-bf537e/.gitignore                         |    1 +
 board/cm-bf537e/Makefile                           |   58 ++
 board/cm-bf537e/cm-bf537e.c                        |   44 ++
 board/cm-bf537e/config.mk                          |   33 ++
 board/cm-bf537e/flash-defines.h                    |   50 ++
 board/cm-bf537e/flash.c                            |  449 +++++++++++++++
 board/cm-bf537e/spi_flash.c                        |    2 +
 board/cm-bf537e/u-boot.lds.S                       |  143 +++++
 board/cm-bf548/.gitignore                          |    1 +
 board/cm-bf548/Makefile                            |   60 ++
 board/cm-bf548/cm-bf548.c                          |   79 +++
 board/cm-bf548/config.mk                           |   36 ++
 board/cm-bf548/nand.c                              |    2 +
 board/cm-bf548/spi_flash.c                         |    2 +
 board/cm-bf548/u-boot.lds.S                        |  124 ++++
 board/cm-bf548/video.c                             |  339 +++++++++++
 board/cm-bf561/.gitignore                          |    1 +
 board/cm-bf561/Makefile                            |   57 ++
 board/cm-bf561/cm-bf561.c                          |   25 +
 board/cm-bf561/config.mk                           |   33 ++
 board/cm-bf561/u-boot.lds.S                        |  143 +++++
 board/ibf-dsp561/.gitignore                        |    1 +
 board/ibf-dsp561/Makefile                          |   57 ++
 board/ibf-dsp561/config.mk                         |   33 ++
 board/ibf-dsp561/ibf-dsp561.c                      |   25 +
 board/ibf-dsp561/u-boot.lds.S                      |  145 +++++
 board/tcm-bf537/.gitignore                         |    1 +
 board/tcm-bf537/Makefile                           |   58 ++
 board/tcm-bf537/config.mk                          |   33 ++
 board/tcm-bf537/flash-defines.h                    |   52 ++
 board/tcm-bf537/flash.c                            |  583 +++++++++++++++++++
 board/tcm-bf537/spi_flash.c                        |    2 +
 board/tcm-bf537/tcm-bf537.c                        |   44 ++
 board/tcm-bf537/u-boot.lds.S                       |  143 +++++
 common/Makefile                                    |    1 +
 common/cmd_spibootldr.c                            |   36 ++
 cpu/blackfin/cpu.c                                 |    8 +-
 cpu/blackfin/initcode.c                            |  254 +++++++--
 cpu/blackfin/start.S                               |   83 ++--
 cpu/blackfin/traps.c                               |    2 +-
 include/asm-blackfin/blackfin-config-pre.h         |    6 -
 .../mach-bf527/ADSP-EDN-BF52x-extended_cdef.h      |    8 +-
 include/asm-blackfin/mach-bf527/ports.h            |   75 +---
 include/asm-blackfin/mach-bf533/ports.h            |   18 +-
 .../mach-bf537/ADSP-EDN-BF534-extended_cdef.h      |    8 +-
 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/ports.h            |  189 +------
 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           |    2 -
 include/asm-blackfin/mach-common/bits/bootrom.h    |   27 +
 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/configs/bf518f-ezbrd.h                     |  137 +++++
 include/configs/bf526-ezbrd.h                      |  166 ++++++
 include/configs/bf527-ezkit.h                      |  158 ++++++
 include/configs/bf533-ezkit.h                      |  286 ++++------
 include/configs/bf533-stamp.h                      |  450 ++++++----------
 include/configs/bf537-minotaur.h                   |  214 +++++++
 include/configs/bf537-pnav.h                       |  271 +++++++++
 include/configs/bf537-srv1.h                       |  214 +++++++
 include/configs/bf537-stamp.h                      |  423 +++++----------
 include/configs/bf538f-ezkit.h                     |  125 +++++
 include/configs/bf548-ezkit.h                      |  201 +++++++
 include/configs/bf561-ezkit.h                      |  295 ++++------
 include/configs/bfin_adi_common.h                  |  199 +++++++
 include/configs/blackstamp.h                       |  266 +++++++++
 include/configs/cm-bf527.h                         |  144 +++++
 include/configs/cm-bf533.h                         |  100 ++++
 include/configs/cm-bf537e.h                        |  133 +++++
 include/configs/cm-bf548.h                         |  150 +++++
 include/configs/cm-bf561.h                         |  100 ++++
 include/configs/ibf-dsp561.h                       |  130 +++++
 include/configs/tcm-bf537.h                        |  135 +++++
 lib_blackfin/Makefile                              |    1 +
 lib_blackfin/board.c                               |    2 +-
 lib_blackfin/cache.c                               |   42 ++
 lib_blackfin/cmd_cache_dump.c                      |  145 +++++
 176 files changed, 12360 insertions(+), 1508 deletions(-)
 create mode 100644 board/bf518f-ezbrd/.gitignore
 create mode 100644 board/bf518f-ezbrd/Makefile
 create mode 100644 board/bf518f-ezbrd/bf518f-ezbrd.c
 create mode 100644 board/bf518f-ezbrd/config.mk
 create mode 100644 board/bf518f-ezbrd/spi_flash.c
 create mode 100644 board/bf518f-ezbrd/u-boot.lds.S
 create mode 100644 board/bf526-ezbrd/.gitignore
 create mode 100644 board/bf526-ezbrd/Makefile
 create mode 100644 board/bf526-ezbrd/bf526-ezbrd.c
 create mode 100644 board/bf526-ezbrd/config.mk
 create mode 100644 board/bf526-ezbrd/spi_flash.c
 create mode 100644 board/bf526-ezbrd/u-boot.lds.S
 create mode 100644 board/bf527-ezkit/.gitignore
 create mode 100644 board/bf527-ezkit/Makefile
 create mode 100644 board/bf527-ezkit/bf527-ezkit.c
 create mode 100644 board/bf527-ezkit/config.mk
 create mode 100644 board/bf527-ezkit/spi_flash.c
 create mode 100644 board/bf527-ezkit/u-boot.lds.S
 create mode 100644 board/bf527-ezkit/video.c
 create mode 100644 board/bf537-minotaur/.gitignore
 create mode 100644 board/bf537-minotaur/Makefile
 create mode 100644 board/bf537-minotaur/bf537-minotaur.c
 create mode 100644 board/bf537-minotaur/config.mk
 create mode 100644 board/bf537-minotaur/spi_flash.c
 create mode 100644 board/bf537-minotaur/u-boot.lds.S
 create mode 100644 board/bf537-pnav/.gitignore
 create mode 100644 board/bf537-pnav/Makefile
 create mode 100644 board/bf537-pnav/bf537-pnav.c
 create mode 100644 board/bf537-pnav/config.mk
 create mode 100644 board/bf537-pnav/nand.c
 create mode 100644 board/bf537-pnav/spi_flash.c
 create mode 100644 board/bf537-pnav/u-boot.lds.S
 create mode 100644 board/bf537-srv1/.gitignore
 create mode 100644 board/bf537-srv1/Makefile
 create mode 100644 board/bf537-srv1/bf537-srv1.c
 create mode 100644 board/bf537-srv1/config.mk
 create mode 100644 board/bf537-srv1/spi_flash.c
 create mode 100644 board/bf537-srv1/u-boot.lds.S
 create mode 100644 board/bf538f-ezkit/.gitignore
 create mode 100644 board/bf538f-ezkit/Makefile
 create mode 100644 board/bf538f-ezkit/bf538f-ezkit.c
 create mode 100644 board/bf538f-ezkit/config.mk
 create mode 100644 board/bf538f-ezkit/u-boot.lds.S
 create mode 100644 board/bf548-ezkit/.gitignore
 create mode 100644 board/bf548-ezkit/Makefile
 create mode 100644 board/bf548-ezkit/bf548-ezkit.c
 create mode 100644 board/bf548-ezkit/config.mk
 create mode 100644 board/bf548-ezkit/spi_flash.c
 create mode 100644 board/bf548-ezkit/u-boot.lds.S
 create mode 100644 board/bf548-ezkit/video.c
 create mode 100644 board/blackstamp/.gitignore
 create mode 100644 board/blackstamp/Makefile
 create mode 100644 board/blackstamp/blackstamp.c
 create mode 100644 board/blackstamp/config.mk
 create mode 100644 board/blackstamp/spi_flash.c
 create mode 100644 board/blackstamp/u-boot.lds.S
 create mode 100644 board/cm-bf527/.gitignore
 create mode 100644 board/cm-bf527/Makefile
 create mode 100644 board/cm-bf527/cm-bf527.c
 create mode 100644 board/cm-bf527/config.mk
 create mode 100644 board/cm-bf527/flash-defines.h
 create mode 100644 board/cm-bf527/flash.c
 create mode 100644 board/cm-bf527/gpio.c
 create mode 100644 board/cm-bf527/nand.c
 create mode 100644 board/cm-bf527/spi_flash.c
 create mode 100644 board/cm-bf527/u-boot.lds.S
 create mode 100644 board/cm-bf533/.gitignore
 create mode 100644 board/cm-bf533/Makefile
 create mode 100644 board/cm-bf533/cm-bf533.c
 create mode 100644 board/cm-bf533/config.mk
 create mode 100644 board/cm-bf533/flash-defines.h
 create mode 100644 board/cm-bf533/flash.c
 create mode 100644 board/cm-bf533/u-boot.lds.S
 create mode 100644 board/cm-bf537e/.gitignore
 create mode 100644 board/cm-bf537e/Makefile
 create mode 100644 board/cm-bf537e/cm-bf537e.c
 create mode 100644 board/cm-bf537e/config.mk
 create mode 100644 board/cm-bf537e/flash-defines.h
 create mode 100644 board/cm-bf537e/flash.c
 create mode 100644 board/cm-bf537e/spi_flash.c
 create mode 100644 board/cm-bf537e/u-boot.lds.S
 create mode 100644 board/cm-bf548/.gitignore
 create mode 100644 board/cm-bf548/Makefile
 create mode 100644 board/cm-bf548/cm-bf548.c
 create mode 100644 board/cm-bf548/config.mk
 create mode 100644 board/cm-bf548/nand.c
 create mode 100644 board/cm-bf548/spi_flash.c
 create mode 100644 board/cm-bf548/u-boot.lds.S
 create mode 100644 board/cm-bf548/video.c
 create mode 100644 board/cm-bf561/.gitignore
 create mode 100644 board/cm-bf561/Makefile
 create mode 100644 board/cm-bf561/cm-bf561.c
 create mode 100644 board/cm-bf561/config.mk
 create mode 100644 board/cm-bf561/u-boot.lds.S
 create mode 100644 board/ibf-dsp561/.gitignore
 create mode 100644 board/ibf-dsp561/Makefile
 create mode 100644 board/ibf-dsp561/config.mk
 create mode 100644 board/ibf-dsp561/ibf-dsp561.c
 create mode 100644 board/ibf-dsp561/u-boot.lds.S
 create mode 100644 board/tcm-bf537/.gitignore
 create mode 100644 board/tcm-bf537/Makefile
 create mode 100644 board/tcm-bf537/config.mk
 create mode 100644 board/tcm-bf537/flash-defines.h
 create mode 100644 board/tcm-bf537/flash.c
 create mode 100644 board/tcm-bf537/spi_flash.c
 create mode 100644 board/tcm-bf537/tcm-bf537.c
 create mode 100644 board/tcm-bf537/u-boot.lds.S
 create mode 100644 common/cmd_spibootldr.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/configs/bf518f-ezbrd.h
 create mode 100644 include/configs/bf526-ezbrd.h
 create mode 100644 include/configs/bf527-ezkit.h
 create mode 100644 include/configs/bf537-minotaur.h
 create mode 100644 include/configs/bf537-pnav.h
 create mode 100644 include/configs/bf537-srv1.h
 create mode 100644 include/configs/bf538f-ezkit.h
 create mode 100644 include/configs/bf548-ezkit.h
 create mode 100644 include/configs/bfin_adi_common.h
 create mode 100644 include/configs/blackstamp.h
 create mode 100644 include/configs/cm-bf527.h
 create mode 100644 include/configs/cm-bf533.h
 create mode 100644 include/configs/cm-bf537e.h
 create mode 100644 include/configs/cm-bf548.h
 create mode 100644 include/configs/cm-bf561.h
 create mode 100644 include/configs/ibf-dsp561.h
 create mode 100644 include/configs/tcm-bf537.h
 create mode 100644 lib_blackfin/cmd_cache_dump.c
#1 lore raw

PATCH 1/42 Blackfin: update lockbox api according to latest documentation

---
 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
index 8b696f3..77f849e 100644
@@ -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.1.2
#2 lore raw

PATCH 2/42 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
index 1557864..0a321a4 100644
@@ -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.1.2
#3 lore raw

PATCH 3/42 Blackfin: add cache_dump commands

In reply to Mike Frysinger

A few debug-type commands used to dump the raw icache/dcache data. Useful when trying to track down cache-related bugs.

---
 lib_blackfin/Makefile         |    1 +
 lib_blackfin/cmd_cache_dump.c |  145 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 0 deletions(-)
 create mode 100644 lib_blackfin/cmd_cache_dump.c
lib_blackfin/Makefile +1 -0
index 46ef7f3..cbf47f0 100644
@@ -40,6 +40,7 @@ COBJS-y	+= board.o
 COBJS-y	+= boot.o
 COBJS-y	+= cache.o
 COBJS-y	+= clocks.o
+COBJS-$(CONFIG_CMD_CACHE_DUMP) += cmd_cache_dump.o
 COBJS-y	+= muldi3.o
 COBJS-$(CONFIG_POST) += post.o tests.o
 COBJS-y	+= string.o
lib_blackfin/cmd_cache_dump.c new file +145 -0

145 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#4 lore raw

PATCH 4/42 Blackfin: print out Flash: before checking it

In reply to Mike Frysinger

If 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
index c223711..b3452f8 100644
@@ -312,8 +312,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.1.2
#5 lore raw

PATCH 5/42 Blackfin: drop now-unused CONFIG_SYS_BFIN_CMD_XXX

In reply to Mike Frysinger

With 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
index 9df01ad..e973de7 100644
@@ -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.1.2
#6 lore raw

PATCH 6/42 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
index c32d69f..e6b1df8 100644
@@ -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
index 79bc54d..512d6df 100644
@@ -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
index 3ddd689..597dcec 100644
@@ -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
new file mode 100644
index 0000000..9f78a76
@@ -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
new file mode 100644
index 0000000..b81702f
@@ -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
new file mode 100644
index 0000000..3cc665e
@@ -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
new file mode 100644
index 0000000..868c6a0
@@ -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
new file mode 100644
index 0000000..c88b0d0
@@ -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
new file mode 100644
index 0000000..d6af206
@@ -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
new file mode 100644
index 0000000..09355d3
@@ -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
new file mode 100644
index 0000000..fa3910c
@@ -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
new file mode 100644
index 0000000..f176f08
@@ -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
new file mode 100644
index 0000000..924123e
@@ -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.1.2
#7 lore raw

PATCH 7/42 Blackfin: drop SPORT_TX read helper macros

In reply to Mike Frysinger

The 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
index 85acdd6..dec7c63 100644
@@ -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
index b9e4d67..58df301 100644
@@ -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
index e9572a0..51d9cf2 100644
@@ -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
index 968cd3e..4c0fdf5 100644
@@ -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
index bd40f35..e0f76ae 100644
@@ -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
index 77cd5dc..caf2f6f 100644
@@ -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
index c5d3511..af90e4c 100644
@@ -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
index c0c7e1e..43f3850 100644
@@ -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
index 4c439e5..4a3f34c 100644
@@ -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.1.2
#8 lore raw

PATCH 8/42 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
index dec7c63..f65b439 100644
@@ -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
index 58df301..0700875 100644
@@ -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.1.2
#9 lore raw

PATCH 9/42 Blackfin: simplify symbol_lookup() a bit

In reply to Mike Frysinger

No 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
index a2c6f1e..2121b0e 100644
@@ -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.1.2
#10 lore raw

PATCH 10/42 Blackfin: kill off LDR jump block

In reply to Mike Frysinger

The 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
index f3fcd7a..04a7529 100644
@@ -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
index da16726..f80f894 100644
@@ -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
index 76daa75..8ddfa81 100644
@@ -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
index 76daa75..8ddfa81 100644
@@ -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
index 3d0453e..4220e81 100644
@@ -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
index 30c214b..c2ff8cd 100644
@@ -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
index ae0016d..23d683a 100644
@@ -371,6 +371,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.1.2
#11 lore raw

PATCH 11/42 Blackfin: handle reboot anomaly 432

In reply to Mike Frysinger

Workaround 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
index 23d683a..5e48564 100644
@@ -272,8 +272,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.1.2
#12 lore raw

PATCH 12/42 Blackfin: setup a sane default EBIU_SDBCTL for SDRAM controllers

In reply to Mike Frysinger

If 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
index 5e48564..882ec11 100644
@@ -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.1.2
#13 lore raw

PATCH 13/42 Blackfin: do not program voltage regulator on parts that do not have one

In reply to Mike Frysinger

Some 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
index 882ec11..231474a 100644
@@ -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
@@ -301,15 +310,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.1.2
#14 lore raw

PATCH 14/42 Blackfin: put memory into self-refresh before/after programming clocks

In reply to Mike Frysinger

When 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 |  188 +++++++++++++++++++++++++++++++++++------------
 cpu/blackfin/start.S    |   83 +++++++++++++--------
 2 files changed, 190 insertions(+), 81 deletions(-)
cpu/blackfin/initcode.c +140 -48
index 231474a..7bd4b22 100644
@@ -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,28 +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.
 	 */
-	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;
@@ -331,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);
 
@@ -360,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
@@ -379,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);
@@ -405,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.1.2
#15 lore raw

PATCH 15/42 Blackfin: unify common ADI board settings

In reply to Mike Frysinger

Rather 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 |  197 +++++++++++++++++
 5 files changed, 689 insertions(+), 939 deletions(-)
 create mode 100644 include/configs/bfin_adi_common.h
include/configs/bf533-ezkit.h +114 -172
index 48c0252..90e2743 100644
@@ -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 +197 -0

197 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#16 lore raw

PATCH 16/42 Blackfin: bf533-stamp: rewrite startup LED notifications

In reply to Mike Frysinger

Again, 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
index 44ebc93..7108dda 100644
@@ -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-2008 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
index 0aa4d92..ea5cf41 100644
@@ -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.1.2
#17 lore raw

PATCH 17/42 Blackfin: bf533-stamp: bump up default clocks

In reply to Mike Frysinger

Since 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
index ea5cf41..b1cdf49 100644
@@ -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.1.2
#18 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

In reply to Mike Frysinger

We use things from autoconf.mk in the top level Makefile, so it needs to exist before doing a top level make. Otherwise, the top level make env does not get the values in the autoconf.mk.

---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +2 -0
index 787c5f2..db77d3b 100644
@@ -3293,6 +3293,8 @@ BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
 
 $(BFIN_BOARDS):
 	$(MAKE) $@_config
Signature · 1 line
1.6.1.2
#19 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Hi Mike,

Quoted 14 lines · Mike Frysinger

We use things from autoconf.mk in the top level Makefile, so it needs to exist before doing a top level make. Otherwise, the top level make env does not get the values in the autoconf.mk.

---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +0 -0
index 787c5f2..db77d3b 100644

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3299

Quoted 7 lines
Makefile +2 -0
@@ -3293,6 +3293,8 @@ BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
 
 

Do you really mean to do this twice?

Quoted 3 lines
Makefile +0 -0
 $(BFIN_BOARDS):

$(MAKE) $@_config

regards,
Ben

#20 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Quoted 17 lines · On Tuesday 10 February 2009 12:54:31 Ben Warren wrote:
Quoted 16 lines · Mike Frysinger

We use things from autoconf.mk in the top level Makefile, so it needs to exist before doing a top level make. Otherwise, the top level make env does not get the values in the autoconf.mk.

---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +0 -0
index 787c5f2..db77d3b 100644
@@ -3293,6 +3293,8 @@ BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp

bf561-ezkit

Quoted 6 lines

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3297

Quoted 4 lines

$(BFIN_BOARDS:%=%_config) : unconfig

Makefile +2 -0
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk

Do you really mean to do this twice?

unfortunately, yes. since some settings in the board config are turned into compiler flags and those compiler flags can in turn affect the board config, we need to do it twice. first is to make sure the proper cpu flags are propagated into the toplevel build env while the second is to make sure the autoconf.mk fully reflects the board config.

i guess i could add a one line comment above each one giving hints about why each is needed ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090210/a4740708/attachment.pgp

#21 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Quoted 34 lines · Mike Frysinger
Quoted 18 lines · On Tuesday 10 February 2009 12:54:31 Ben Warren wrote:
Quoted 16 lines · Mike Frysinger

We use things from autoconf.mk in the top level Makefile, so it needs to exist before doing a top level make. Otherwise, the top level make env does not get the values in the autoconf.mk.

---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +0 -0
index 787c5f2..db77d3b 100644
@@ -3293,6 +3293,8 @@ BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp

bf561-ezkit

Quoted 7 lines

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3297

Quoted 5 lines

$(BFIN_BOARDS:%=%_config) : unconfig

Makefile +2 -0
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk

Do you really mean to do this twice?

unfortunately, yes. since some settings in the board config are turned into compiler flags and those compiler flags can in turn affect the board config, we need to do it twice. first is to make sure the proper cpu flags are propagated into the toplevel build env while the second is to make sure the autoconf.mk fully reflects the board config.

Quoted 4 lines

i guess i could add a one line comment above each one giving hints about why each is needed ...
-mike

No problem. Just a sanity check. Turns out you're sane :)

regards,
Ben

#22 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

In reply to Mike Frysinger

Dear Mike Frysinger,

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

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3297

Quoted 5 lines

$(BFIN_BOARDS:%=%_config) : unconfig

Makefile +2 -0
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk

Do you really mean to do this twice?

Quoted 5 lines

unfortunately, yes. since some settings in the board config are turned into compiler flags and those compiler flags can in turn affect the board config, we need to do it twice. first is to make sure the proper cpu flags are propagated into the toplevel build env while the second is to make sure the autoconf.mk fully reflects the board config.

Sounds like a design problem to me.

Quoted 2 lines

i guess i could add a one line comment above each one giving hints about why each is needed ...

That would be the minimum, but given the fact that the top level Makefile already includes rules to build autoconf.mk I really wonder if we must do this so often, and if so, then why this is only the case for blackfin.

I think you should fix the cuase rather then doctor about the symptoms.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The joys of love made her human and the  agonies  of  love  destroyed
her.
	-- Spock, "Requiem for Methuselah", stardate 5842.8
#23 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Quoted 10 lines · On Tuesday 10 February 2009 14:42:20 Wolfgang Denk wrote:

Dear Mike Frysinger,

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

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3297

Quoted 4 lines

$(BFIN_BOARDS:%=%_config) : unconfig

Makefile +2 -0
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk

Do you really mean to do this twice?

Quoted 7 lines
Quoted 5 lines

unfortunately, yes. since some settings in the board config are turned into compiler flags and those compiler flags can in turn affect the board config, we need to do it twice. first is to make sure the proper cpu flags are propagated into the toplevel build env while the second is to make sure the autoconf.mk fully reflects the board config.

Sounds like a design problem to me.

not really. the point is to avoid duplication and considering the method to attain that, sounds pretty good to me.

Quoted 7 lines
Quoted 2 lines

i guess i could add a one line comment above each one giving hints about why each is needed ...

That would be the minimum, but given the fact that the top level Makefile already includes rules to build autoconf.mk I really wonder if we must do this so often, and if so, then why this is only the case for blackfin.

the top level Makefile includes rules to build it, but it doesnt re-source it once it's been generated. so anything in the top level cannot use things from autoconf.mk (like $(arch)_config.mk).
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090210/e9b4a053/attachment.pgp

#24 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Dear Mike Frysinger,

Quoted 12 lines · In message <[email protected]> you wrote:
Quoted 12 lines
Quoted 11 lines
Quoted 5 lines

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3297

Quoted 3 lines
Makefile +2 -0
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk

Do you really mean to do this twice?

unfortunately, yes. since some settings in the board config are turned into compiler flags and those compiler flags can in turn affect the board config, we need to do it twice. first is to make sure the proper cpu flags are propagated into the toplevel build env while the second is to make sure the autoconf.mk fully reflects the board config.

Quoted 4 lines
Quoted 1 line

Sounds like a design problem to me.

not really. the point is to avoid duplication and considering the method to attain that, sounds pretty good to me.

Well, no othe rarchitecture seems to need that, and it looks very strange. I guess 4 out of 5 persons who will see this are tempted to "clean this up".

Quoted 8 lines
Quoted 4 lines

That would be the minimum, but given the fact that the top level Makefile already includes rules to build autoconf.mk I really wonder if we must do this so often, and if so, then why this is only the case for blackfin.

the top level Makefile includes rules to build it, but it doesnt re-source it once it's been generated. so anything in the top level cannot use things from autoconf.mk (like $(arch)_config.mk).

To me it seems as if you were rebuilding it twice without re-sourcing it inbetween, too.

And you fail to explain why BF needs this, while all other architectures don't.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
 The software required `Windows 95 or better', so I installed Linux.
#25 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Quoted 15 lines · On Wednesday 11 February 2009 16:36:37 Wolfgang Denk wrote:

Dear Mike Frysinger,

Quoted 12 lines · In message <[email protected]> you wrote:
Quoted 12 lines
Quoted 11 lines
Quoted 4 lines

Makefile BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit · line 3297

Quoted 2 lines
Makefile +2 -0
+	@$(MAKE) -s -B $(obj)include/autoconf.mk
+	@$(MAKE) -s -B $(obj)include/autoconf.mk

Do you really mean to do this twice?

unfortunately, yes. since some settings in the board config are turned into compiler flags and those compiler flags can in turn affect the board config, we need to do it twice. first is to make sure the proper cpu flags are propagated into the toplevel build env while the second is to make sure the autoconf.mk fully reflects the board config.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Sounds like a design problem to me.

not really. the point is to avoid duplication and considering the method to attain that, sounds pretty good to me.

Well, no othe rarchitecture seems to need that, and it looks very strange. I guess 4 out of 5 persons who will see this are tempted to "clean this up".

that's why i said i would add comments. they're in there now and anyone touching code that doesnt belong to them while ignoring the comments shouldnt be doing clean up work in the first place.

Quoted 9 lines
Quoted 8 lines
Quoted 4 lines

That would be the minimum, but given the fact that the top level Makefile already includes rules to build autoconf.mk I really wonder if we must do this so often, and if so, then why this is only the case for blackfin.

the top level Makefile includes rules to build it, but it doesnt re-source it once it's been generated. so anything in the top level cannot use things from autoconf.mk (like $(arch)_config.mk).

Quoted 5 lines

To me it seems as if you were rebuilding it twice without re-sourcing it inbetween, too.

And you fail to explain why BF needs this, while all other architectures don't.

i explained it already when Ben asked. the processor variant is selected in the board config and the board config (and shared settings) can change based on that selection. and the top level build flags use that processor selection. first one is to make sure the cpu settings make it from the board config into the environment while the second is to make sure the board config has been fully processed by the proper cpu selection.

also, other people dont seem to have a problem sprinkling duplication over the place until things work. i do.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090211/ecdcfc5d/attachment.pgp

#26 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Dear Mike Frysinger,

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

And you fail to explain why BF needs this, while all other architectures don't.

i explained it already when Ben asked. the processor variant is selected in the board config and the board config (and shared settings) can change based on that selection. and the top level build flags use that processor

If you define the processor variant right at  the  beginning  of  the
board  config  file,  then  why  would  that  not  be  visible in the

remainder of the board config so you'd have to re-run this?

Quoted 3 lines

selection. first one is to make sure the cpu settings make it from the board config into the environment while the second is to make sure the board config has been fully processed by the proper cpu selection.

I still don;t get why BF has such a problem while none of the N other arches has it?

Quoted 2 lines

also, other people dont seem to have a problem sprinkling duplication over the place until things work. i do.

What exactly are you referring to here?

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
2000 pounds of chinese soup                               = 1 Won Ton
#27 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Quoted 4 lines · On Wednesday 11 February 2009 17:16:38 Wolfgang Denk wrote:
Quoted 3 lines · In message Mike Frysinger you
Quoted 2 lines

And you fail to explain why BF needs this, while all other architectures don't.

Quoted 8 lines
Quoted 4 lines

i explained it already when Ben asked. the processor variant is selected in the board config and the board config (and shared settings) can change based on that selection. and the top level build flags use that processor

If you define the processor variant right at  the  beginning  of  the
board  config  file,  then  why  would  that  not  be  visible in the

remainder of the board config so you'd have to re-run this?

that's a string representation that defines (1) the variant and (2) the silicon revision. that gets turned into CFLAGS via -mcpu=... and the toolchain itself then sets up the proper defines which everything else uses. -mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090211/8732658a/attachment.pgp

#28 lore raw

PATCH 18/42 Blackfin: make sure autoconf.mk is generated early enough

Dear Mike Frysinger,

Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 4 lines
If you define the processor variant right at  the  beginning  of  the
board  config  file,  then  why  would  that  not  be  visible in the

remainder of the board config so you'd have to re-run this?

that's a string representation that defines (1) the variant and (2) the silicon revision. that gets turned into CFLAGS via -mcpu=... and the toolchain itself then sets up the proper defines which everything else uses.

Sorry, I still fail to see in which way this is different for BF than for any other architecture?

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The glory of creation is in its infinite diversity." "And in the way
our differences combine to create meaning and beauty."
	-- Dr. Miranda Jones and Spock, "Is There in Truth No Beauty?",
	   stardate 5630.8
#29 lore raw

PATCH 19/42 Blackfin: new spibootldr command

In reply to Mike Frysinger

Newer Blackfin parts can an on-chip ROM that can boot LDRs over SPI flashes, so add a new 'spibootldr' command to take advantage of it.

---
 common/Makefile                                 |    1 +
 common/cmd_spibootldr.c                         |   36 +++++++++++++++++++++++
 include/asm-blackfin/mach-common/bits/bootrom.h |   27 +++++++++++++++++
 include/configs/bfin_adi_common.h               |    1 +
 4 files changed, 65 insertions(+), 0 deletions(-)
 create mode 100644 common/cmd_spibootldr.c
common/Makefile +1 -0
index 93e3963..2a5ab9d 100644
@@ -126,6 +126,7 @@ COBJS-$(CONFIG_CMD_SF) += cmd_sf.o
 COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
 COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o
 COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
+COBJS-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o
 COBJS-$(CONFIG_CMD_STRINGS) += cmd_strings.o
 COBJS-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o
 COBJS-$(CONFIG_CMD_UBI) += cmd_ubi.o
common/cmd_spibootldr.c new file +36 -0
new file mode 100644
index 0000000..acd6b43
@@ -0,0 +1,36 @@
+/*
+ * U-boot - spibootldr.c
+ *
+ * Copyright (c) 2005-2008 Analog Devices Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+#include <command.h>
+
+#include <asm/blackfin.h>
+#include <asm/mach-common/bits/bootrom.h>
+
+int do_spibootldr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	s32 addr;
+
+	/* Get the address */
+	if (argc < 2)
+		addr = 0;
+	else
+		addr = simple_strtoul(argv[1], NULL, 16);
+
+	printf("## Booting ldr image at SPI offset 0x%x ...\n", addr);
+
+	return bfrom_SpiBoot(addr, BFLAG_PERIPHERAL | 4, 0, NULL);
+}
+
+U_BOOT_CMD(spibootldr, 2, 0, do_spibootldr,
+	"spibootldr - boot ldr image from spi\n",
+	"[offset]\n"
+	"    - boot ldr image stored@offset into spi\n");
include/asm-blackfin/mach-common/bits/bootrom.h +27 -0
index fb97ff8..f537e93 100644
@@ -200,6 +200,33 @@ typedef struct ADI_BOOT_DATA {
 	int32_t dLogByteCount;
 } ADI_BOOT_DATA;
 
+typedef void ADI_BOOT_HOOK_FUNC (ADI_BOOT_DATA *);
+
+#ifndef _BOOTROM_MEMBOOT
+#define _BOOTROM_MEMBOOT 0
+#endif
+static uint32_t (* const bfrom_MemBoot)(void *pBootStream, int32_t dFlags, int32_t dBlockCount, ADI_BOOT_HOOK_FUNC *pCallHook) = (void *)_BOOTROM_MEMBOOT;
+
+#ifndef _BOOTROM_TWIBOOT
+#define _BOOTROM_TWIBOOT 0
+#endif
+static uint32_t (* const bfrom_TwiBoot)(int32_t dTwiAddress, int32_t dFlags, int32_t dBlockCount, ADI_BOOT_HOOK_FUNC *pCallHook) = (void *)_BOOTROM_TWIBOOT;
+
+#ifndef _BOOTROM_SPIBOOT
+#define _BOOTROM_SPIBOOT 0
+#endif
+static uint32_t (* const bfrom_SpiBoot)(int32_t dSpiAddress, int32_t dFlags, int32_t dBlockCount, ADI_BOOT_HOOK_FUNC *pCallHook) = (void *)_BOOTROM_SPIBOOT;
+
+#ifndef _BOOTROM_OTPBOOT
+#define _BOOTROM_OTPBOOT 0
+#endif
+static uint32_t (* const bfrom_OtpBoot)(int32_t dOtpAddress, int32_t dFlags, int32_t dBlockCount, ADI_BOOT_HOOK_FUNC *pCallHook) = (void *)_BOOTROM_OTPBOOT;
+
+#ifndef _BOOTROM_NANDBOOT
+#define _BOOTROM_NANDBOOT 0
+#endif
+static uint32_t (* const bfrom_NandBoot)(int32_t dNandAddress, int32_t dFlags, int32_t dBlockCount, ADI_BOOT_HOOK_FUNC *pCallHook) = (void *)_BOOTROM_NANDBOOT;
+
 #endif /* __ASSEMBLY__ */
 
 /* Bit defines for ADI_BOOT_DATA->dFlags */
include/configs/bfin_adi_common.h +1 -0
index e40bb2c..b714d32 100644
@@ -71,6 +71,7 @@
 # define CONFIG_CMD_STRINGS
 # if defined(__ADSPBF51x__) || defined(__ADSPBF52x__) || defined(__ADSPBF54x__)
 #  define CONFIG_CMD_OTP
+#  define CONFIG_CMD_SPIBOOTLDR
 # endif
 #endif
 
Signature · 1 line
1.6.1.2
#30 lore raw

PATCH 20/42 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
index b714d32..c89253d 100644
@@ -111,6 +111,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.1.2
#31 lore raw

PATCH 21/42 Blackfin: bf537-stamp: bump default SCLK up to 125MHz

In reply to Mike Frysinger

Since 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
index e0b107b..5be2748 100644
@@ -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.1.2
#32 lore raw

PATCH 22/42 Blackfin: bf537-stamp: increase monitor size

In reply to Mike Frysinger

The 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
index 5be2748..0339a80 100644
@@ -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.1.2
#33 lore raw

PATCH 23/42 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
index 7b764b4..797daf2 100644
@@ -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.1.2
#34 lore raw

PATCH 24/42 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
index 797daf2..a336894 100644
@@ -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.1.2
#35 lore raw

PATCH 25/42 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
index a336894..214981a 100644
@@ -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.1.2
#36 lore raw

PATCH 26/42 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
index 214981a..7b753ad 100644
@@ -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.1.2
#37 lore raw

PATCH 27/42 Blackfin: bf548-ezkit: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    4 +-
 board/bf548-ezkit/.gitignore    |    1 +
 board/bf548-ezkit/Makefile      |   59 +++++++
 board/bf548-ezkit/bf548-ezkit.c |   79 ++++++++++
 board/bf548-ezkit/config.mk     |   37 +++++
 board/bf548-ezkit/spi_flash.c   |    2 +
 board/bf548-ezkit/u-boot.lds.S  |  124 +++++++++++++++
 board/bf548-ezkit/video.c       |  327 +++++++++++++++++++++++++++++++++++++++
 include/configs/bf548-ezkit.h   |  201 ++++++++++++++++++++++++
 11 files changed, 834 insertions(+), 2 deletions(-)
 create mode 100644 board/bf548-ezkit/.gitignore
 create mode 100644 board/bf548-ezkit/Makefile
 create mode 100644 board/bf548-ezkit/bf548-ezkit.c
 create mode 100644 board/bf548-ezkit/config.mk
 create mode 100644 board/bf548-ezkit/spi_flash.c
 create mode 100644 board/bf548-ezkit/u-boot.lds.S
 create mode 100644 board/bf548-ezkit/video.c
 create mode 100644 include/configs/bf548-ezkit.h
MAINTAINERS +1 -0
index 38feac8..59da854 100644
@@ -848,6 +848,7 @@ Blackfin Team <[email protected]>
 	BF533-EZKIT	BF533
 	BF533-STAMP	BF533
 	BF537-STAMP	BF537
+	BF548-EZKIT	BF548
 	BF561-EZKIT	BF561
 
 #########################################################################
MAKEALL +1 -0
index cf05133..3f3170c 100755
@@ -783,6 +783,7 @@ LIST_blackfin="		\
 	bf533-ezkit	\
 	bf533-stamp	\
 	bf537-stamp	\
+	bf548-ezkit	\
 	bf561-ezkit	\
 "
 
Makefile +2 -2
index db77d3b..c209e53 100644
@@ -3289,7 +3289,7 @@ suzaku_config:	unconfig
 #========================================================================
 
 # Analog Devices boards
-BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit
+BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3452,7 +3452,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds \
+	       $(obj)board/{bf5{33,48,61}-ezkit,bf5{33,37}-stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf548-ezkit/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf548-ezkit/Makefile new file +59 -0

59 lines not on this page · raw message

board/bf548-ezkit/bf548-ezkit.c new file +79 -0

79 lines not on this page · raw message

board/bf548-ezkit/config.mk new file +37 -0
new file mode 100644
index 0000000..8b471f6
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
+LDR_FLAGS-BFIN_BOOT_FIFO       := --dma 1
+LDR_FLAGS-BFIN_BOOT_SPI_MASTER := --dma 1
+LDR_FLAGS-BFIN_BOOT_UART       := --dma 1
+LDR_FLAGS-BFIN_BOOT_NAND       := --dma 6
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf548-ezkit/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf548-ezkit/u-boot.lds.S new file +124 -0

124 lines not on this page · raw message

board/bf548-ezkit/video.c new file +327 -0

327 lines not on this page · raw message

include/configs/bf548-ezkit.h new file +201 -0

201 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#38 lore raw

PATCH 28/42 Blackfin: bf527-ezkit: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    5 +-
 board/bf527-ezkit/.gitignore    |    1 +
 board/bf527-ezkit/Makefile      |   59 +++++++
 board/bf527-ezkit/bf527-ezkit.c |   60 ++++++++
 board/bf527-ezkit/config.mk     |   32 ++++
 board/bf527-ezkit/spi_flash.c   |    2 +
 board/bf527-ezkit/u-boot.lds.S  |  124 +++++++++++++++
 board/bf527-ezkit/video.c       |  317 +++++++++++++++++++++++++++++++++++++++
 include/configs/bf527-ezkit.h   |  158 +++++++++++++++++++
 11 files changed, 758 insertions(+), 2 deletions(-)
 create mode 100644 board/bf527-ezkit/.gitignore
 create mode 100644 board/bf527-ezkit/Makefile
 create mode 100644 board/bf527-ezkit/bf527-ezkit.c
 create mode 100644 board/bf527-ezkit/config.mk
 create mode 100644 board/bf527-ezkit/spi_flash.c
 create mode 100644 board/bf527-ezkit/u-boot.lds.S
 create mode 100644 board/bf527-ezkit/video.c
 create mode 100644 include/configs/bf527-ezkit.h
MAINTAINERS +1 -0
index 59da854..7eda61e 100644
@@ -845,6 +845,7 @@ Yusuke Goda <[email protected]>
 Mike Frysinger <[email protected]>
 Blackfin Team <[email protected]>
 
+	BF527-EZKIT	BF527
 	BF533-EZKIT	BF533
 	BF533-STAMP	BF533
 	BF537-STAMP	BF537
MAKEALL +1 -0
index 3f3170c..c3c8765 100755
@@ -780,6 +780,7 @@ LIST_avr32="		\
 #########################################################################
 
 LIST_blackfin="		\
+	bf527-ezkit	\
 	bf533-ezkit	\
 	bf533-stamp	\
 	bf537-stamp	\
Makefile +3 -2
index c209e53..e6df6cd 100644
@@ -3289,7 +3289,8 @@ suzaku_config:	unconfig
 #========================================================================
 
 # Analog Devices boards
-BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit bf561-ezkit
+BFIN_BOARDS = bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit \
+	bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3452,7 +3453,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/{bf5{33,48,61}-ezkit,bf5{33,37}-stamp}/u-boot.lds \
+	       $(obj)board/{bf5{27,33,48,61}-ezkit,bf5{33,37}-stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf527-ezkit/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf527-ezkit/Makefile new file +59 -0

59 lines not on this page · raw message

board/bf527-ezkit/bf527-ezkit.c new file +60 -0

60 lines not on this page · raw message

board/bf527-ezkit/config.mk new file +32 -0
new file mode 100644
index 0000000..f4a5a80
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf527-ezkit/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf527-ezkit/u-boot.lds.S new file +124 -0

124 lines not on this page · raw message

board/bf527-ezkit/video.c new file +317 -0

317 lines not on this page · raw message

include/configs/bf527-ezkit.h new file +158 -0

158 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#39 lore raw

PATCH 29/42 Blackfin: bf538f-ezkit: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                       |    1 +
 MAKEALL                           |    1 +
 Makefile                          |    6 +-
 board/bf538f-ezkit/.gitignore     |    1 +
 board/bf538f-ezkit/Makefile       |   57 +++++++++++++++
 board/bf538f-ezkit/bf538f-ezkit.c |   27 +++++++
 board/bf538f-ezkit/config.mk      |   33 +++++++++
 board/bf538f-ezkit/u-boot.lds.S   |  143 +++++++++++++++++++++++++++++++++++++
 include/configs/bf538f-ezkit.h    |  125 ++++++++++++++++++++++++++++++++
 9 files changed, 391 insertions(+), 3 deletions(-)
 create mode 100644 board/bf538f-ezkit/.gitignore
 create mode 100644 board/bf538f-ezkit/Makefile
 create mode 100644 board/bf538f-ezkit/bf538f-ezkit.c
 create mode 100644 board/bf538f-ezkit/config.mk
 create mode 100644 board/bf538f-ezkit/u-boot.lds.S
 create mode 100644 include/configs/bf538f-ezkit.h
MAINTAINERS +1 -0
index 7eda61e..1abdbd5 100644
@@ -849,6 +849,7 @@ Blackfin Team <[email protected]>
 	BF533-EZKIT	BF533
 	BF533-STAMP	BF533
 	BF537-STAMP	BF537
+	BF538F-EZKIT	BF538
 	BF548-EZKIT	BF548
 	BF561-EZKIT	BF561
 
MAKEALL +1 -0
index c3c8765..dada5a4 100755
@@ -784,6 +784,7 @@ LIST_blackfin="		\
 	bf533-ezkit	\
 	bf533-stamp	\
 	bf537-stamp	\
+	bf538f-ezkit	\
 	bf548-ezkit	\
 	bf561-ezkit	\
 "
Makefile +3 -3
index e6df6cd..9f7dd36 100644
@@ -3289,8 +3289,8 @@ suzaku_config:	unconfig
 #========================================================================
 
 # Analog Devices boards
-BFIN_BOARDS = bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp bf548-ezkit \
-	bf561-ezkit
+BFIN_BOARDS = bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp bf538f-ezkit \
+	bf548-ezkit bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3453,7 +3453,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/{bf5{27,33,48,61}-ezkit,bf5{33,37}-stamp}/u-boot.lds \
+	       $(obj)board/{bf5{27,33,38f,48,61}-ezkit,bf5{33,37}-stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf538f-ezkit/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf538f-ezkit/Makefile new file +57 -0

57 lines not on this page · raw message

board/bf538f-ezkit/bf538f-ezkit.c new file +27 -0
new file mode 100644
index 0000000..bbee989
@@ -0,0 +1,27 @@
+/*
+ * U-boot - main board file
+ *
+ * Copyright (c) 2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+#include <config.h>
+#include <asm/blackfin.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int checkboard(void)
+{
+	printf("Board: ADI BF538F EZ-Kit Lite board\n");
+	printf("       Support: http://blackfin.uclinux.org/\n");
+	return 0;
+}
+
+phys_size_t initdram(int board_type)
+{
+	gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
+	return gd->bd->bi_memsize;
+}
board/bf538f-ezkit/config.mk new file +33 -0
new file mode 100644
index 0000000..c8b9fb8
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf538f-ezkit/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/bf538f-ezkit.h new file +125 -0

125 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#40 lore raw

PATCH 30/42 Blackfin: bf526-ezbrd: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    6 +-
 board/bf526-ezbrd/.gitignore    |    1 +
 board/bf526-ezbrd/Makefile      |   58 ++++++++++++++
 board/bf526-ezbrd/bf526-ezbrd.c |  109 +++++++++++++++++++++++++
 board/bf526-ezbrd/config.mk     |   32 ++++++++
 board/bf526-ezbrd/spi_flash.c   |    2 +
 board/bf526-ezbrd/u-boot.lds.S  |  124 +++++++++++++++++++++++++++++
 include/configs/bf526-ezbrd.h   |  166 +++++++++++++++++++++++++++++++++++++++
 10 files changed, 497 insertions(+), 3 deletions(-)
 create mode 100644 board/bf526-ezbrd/.gitignore
 create mode 100644 board/bf526-ezbrd/Makefile
 create mode 100644 board/bf526-ezbrd/bf526-ezbrd.c
 create mode 100644 board/bf526-ezbrd/config.mk
 create mode 100644 board/bf526-ezbrd/spi_flash.c
 create mode 100644 board/bf526-ezbrd/u-boot.lds.S
 create mode 100644 include/configs/bf526-ezbrd.h
MAINTAINERS +1 -0
index 1abdbd5..7acb22c 100644
@@ -845,6 +845,7 @@ Yusuke Goda <[email protected]>
 Mike Frysinger <[email protected]>
 Blackfin Team <[email protected]>
 
+	BF526-EZBRD	BF526
 	BF527-EZKIT	BF527
 	BF533-EZKIT	BF533
 	BF533-STAMP	BF533
MAKEALL +1 -0
index dada5a4..7862940 100755
@@ -780,6 +780,7 @@ LIST_avr32="		\
 #########################################################################
 
 LIST_blackfin="		\
+	bf526-ezbrd	\
 	bf527-ezkit	\
 	bf533-ezkit	\
 	bf533-stamp	\
Makefile +3 -3
index 9f7dd36..95945a9 100644
@@ -3289,8 +3289,8 @@ suzaku_config:	unconfig
 #========================================================================
 
 # Analog Devices boards
-BFIN_BOARDS = bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp bf538f-ezkit \
-	bf548-ezkit bf561-ezkit
+BFIN_BOARDS = bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp \
+	bf538f-ezkit bf548-ezkit bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3453,7 +3453,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/{bf5{27,33,38f,48,61}-ezkit,bf5{33,37}-stamp}/u-boot.lds \
+	       $(obj)board/bf5{26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf526-ezbrd/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf526-ezbrd/Makefile new file +58 -0

58 lines not on this page · raw message

board/bf526-ezbrd/bf526-ezbrd.c new file +109 -0

109 lines not on this page · raw message

board/bf526-ezbrd/config.mk new file +32 -0
new file mode 100644
index 0000000..f4a5a80
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf526-ezbrd/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf526-ezbrd/u-boot.lds.S new file +124 -0

124 lines not on this page · raw message

include/configs/bf526-ezbrd.h new file +166 -0

166 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#41 lore raw

PATCH 31/42 Blackfin: bf518f-ezbrd: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                       |    1 +
 MAKEALL                           |    1 +
 Makefile                          |    6 +-
 board/bf518f-ezbrd/.gitignore     |    1 +
 board/bf518f-ezbrd/Makefile       |   58 ++++++++++++++++
 board/bf518f-ezbrd/bf518f-ezbrd.c |   76 ++++++++++++++++++++
 board/bf518f-ezbrd/config.mk      |   32 +++++++++
 board/bf518f-ezbrd/spi_flash.c    |    2 +
 board/bf518f-ezbrd/u-boot.lds.S   |  124 +++++++++++++++++++++++++++++++++
 include/configs/bf518f-ezbrd.h    |  137 +++++++++++++++++++++++++++++++++++++
 10 files changed, 435 insertions(+), 3 deletions(-)
 create mode 100644 board/bf518f-ezbrd/.gitignore
 create mode 100644 board/bf518f-ezbrd/Makefile
 create mode 100644 board/bf518f-ezbrd/bf518f-ezbrd.c
 create mode 100644 board/bf518f-ezbrd/config.mk
 create mode 100644 board/bf518f-ezbrd/spi_flash.c
 create mode 100644 board/bf518f-ezbrd/u-boot.lds.S
 create mode 100644 include/configs/bf518f-ezbrd.h
MAINTAINERS +1 -0
index 7acb22c..49a456f 100644
@@ -845,6 +845,7 @@ Yusuke Goda <[email protected]>
 Mike Frysinger <[email protected]>
 Blackfin Team <[email protected]>
 
+	BF518F-EZBRD	BF518
 	BF526-EZBRD	BF526
 	BF527-EZKIT	BF527
 	BF533-EZKIT	BF533
MAKEALL +1 -0
index 7862940..db78210 100755
@@ -780,6 +780,7 @@ LIST_avr32="		\
 #########################################################################
 
 LIST_blackfin="		\
+	bf518f-ezbrd	\
 	bf526-ezbrd	\
 	bf527-ezkit	\
 	bf533-ezkit	\
Makefile +3 -3
index 95945a9..b5eac84 100644
@@ -3289,8 +3289,8 @@ suzaku_config:	unconfig
 #========================================================================
 
 # Analog Devices boards
-BFIN_BOARDS = bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp bf537-stamp \
-	bf538f-ezkit bf548-ezkit bf561-ezkit
+BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
+	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3453,7 +3453,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/bf5{26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
+	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf518f-ezbrd/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf518f-ezbrd/Makefile new file +58 -0

58 lines not on this page · raw message

board/bf518f-ezbrd/bf518f-ezbrd.c new file +76 -0

76 lines not on this page · raw message

board/bf518f-ezbrd/config.mk new file +32 -0
new file mode 100644
index 0000000..f4a5a80
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf518f-ezbrd/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf518f-ezbrd/u-boot.lds.S new file +124 -0

124 lines not on this page · raw message

include/configs/bf518f-ezbrd.h new file +137 -0

137 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#42 lore raw

PATCH 32/42 Blackfin: cm-bf533: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                    |    5 +
 MAKEALL                        |    1 +
 Makefile                       |    4 +
 board/cm-bf533/.gitignore      |    1 +
 board/cm-bf533/Makefile        |   57 ++++++++
 board/cm-bf533/cm-bf533.c      |   25 ++++
 board/cm-bf533/config.mk       |   33 +++++
 board/cm-bf533/flash-defines.h |   49 +++++++
 board/cm-bf533/flash.c         |  283 ++++++++++++++++++++++++++++++++++++++++
 board/cm-bf533/u-boot.lds.S    |  143 ++++++++++++++++++++
 include/configs/cm-bf533.h     |  100 ++++++++++++++
 11 files changed, 701 insertions(+), 0 deletions(-)
 create mode 100644 board/cm-bf533/.gitignore
 create mode 100644 board/cm-bf533/Makefile
 create mode 100644 board/cm-bf533/cm-bf533.c
 create mode 100644 board/cm-bf533/config.mk
 create mode 100644 board/cm-bf533/flash-defines.h
 create mode 100644 board/cm-bf533/flash.c
 create mode 100644 board/cm-bf533/u-boot.lds.S
 create mode 100644 include/configs/cm-bf533.h
MAINTAINERS +5 -0
index 49a456f..d5fa707 100644
@@ -855,6 +855,11 @@ Blackfin Team <[email protected]>
 	BF548-EZKIT	BF548
 	BF561-EZKIT	BF561
 
+Bluetechnix Tinyboards <[email protected]>
+Blackfin Team <[email protected]>
+
+	CM-BF533	BF533
+
 #########################################################################
 # End of MAINTAINERS list						#
 #########################################################################
MAKEALL +1 -0
index db78210..3074465 100755
@@ -789,6 +789,7 @@ LIST_blackfin="		\
 	bf538f-ezkit	\
 	bf548-ezkit	\
 	bf561-ezkit	\
+	cm-bf533	\
 "
 
 #########################################################################
Makefile +4 -0
index b5eac84..69e3d83 100644
@@ -3292,6 +3292,9 @@ suzaku_config:	unconfig
 BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
+# Bluetechnix tinyboards
+BFIN_BOARDS += cm-bf533
+
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
 	@$(MAKE) -s -B $(obj)include/autoconf.mk
@@ -3453,6 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
+	       $(obj)board/cm-bf533/u-boot.lds				  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
board/cm-bf533/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/cm-bf533/Makefile new file +57 -0

57 lines not on this page · raw message

board/cm-bf533/cm-bf533.c new file +25 -0
new file mode 100644
index 0000000..7eb761d
@@ -0,0 +1,25 @@
+/*
+ * U-boot - main board file
+ *
+ * Copyright (c) 2005-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int checkboard(void)
+{
+	printf("Board: Bluetechnix CM-BF533 board\n");
+	printf("       Support: http://www.bluetechnix.at/\n");
+	return 0;
+}
+
+phys_size_t initdram(int board_type)
+{
+	gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
+	return gd->bd->bi_memsize;
+}
board/cm-bf533/config.mk new file +33 -0
new file mode 100644
index 0000000..c8b9fb8
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf533/flash-defines.h new file +49 -0

49 lines not on this page · raw message

board/cm-bf533/flash.c new file +283 -0

283 lines not on this page · raw message

board/cm-bf533/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/cm-bf533.h new file +100 -0

100 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#43 lore raw

PATCH 32/42 Blackfin: cm-bf533: new board port

Dear Mike Frysinger,

Quoted 14 lines · In message <[email protected]> you wrote:
---
 MAINTAINERS                    |    5 +
 MAKEALL                        |    1 +
 Makefile                       |    4 +
 board/cm-bf533/.gitignore      |    1 +
 board/cm-bf533/Makefile        |   57 ++++++++
 board/cm-bf533/cm-bf533.c      |   25 ++++
 board/cm-bf533/config.mk       |   33 +++++
 board/cm-bf533/flash-defines.h |   49 +++++++
 board/cm-bf533/flash.c         |  283 ++++++++++++++++++++++++++++++++++++++++
 board/cm-bf533/u-boot.lds.S    |  143 ++++++++++++++++++++
 include/configs/cm-bf533.h     |  100 ++++++++++++++
 11 files changed, 701 insertions(+), 0 deletions(-)
Quoted 8 lines
 create mode 100644 board/cm-bf533/.gitignore
 create mode 100644 board/cm-bf533/Makefile
 create mode 100644 board/cm-bf533/cm-bf533.c
 create mode 100644 board/cm-bf533/config.mk
 create mode 100644 board/cm-bf533/flash-defines.h
 create mode 100644 board/cm-bf533/flash.c
 create mode 100644 board/cm-bf533/u-boot.lds.S
 create mode 100644 include/configs/cm-bf533.h

General comment here and for the othe rpatches:

...

Quoted 13 lines
Makefile +3 -0
@@ -3292,6 +3292,9 @@ suzaku_config:	unconfig
 BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
+# Bluetechnix tinyboards
+BFIN_BOARDS += cm-bf533
+
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
 	@$(MAKE) -s -B $(obj)include/autoconf.mk

Makefile clean: · line 3460

Quoted 5 lines
Makefile +1 -0
@@ -3453,6 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
+	       $(obj)board/cm-bf533/u-boot.lds				  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

...

Quoted 6 lines
board/cm-bf533/flash-defines.h new file +0 -0
new file mode 100644
index 0000000..a5b590a
@@ -0,0 +1,49 @@

...

Quoted 1 line

+#define MT_MANUFACT_CM_BF533 0x00890016 /* MT manuf. ID in D23..D16, D7..D0 */

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...

Quoted 6 lines
board/cm-bf533/flash.c new file +0 -0
new file mode 100644
index 0000000..f850840
@@ -0,0 +1,283 @@

...

Quoted 1 line

+ * This file is based on BF533EzFlash.c originally written by Analog Devices, Inc.

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...

board/cm-bf533/flash.c line 45

Quoted 1 line
board/cm-bf533/flash.c new file +1 -0
+		flash_info[0].start[i] = (CONFIG_SYS_FLASH_BASE + (i * FLASH_SECTOR_SIZE));

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

board/cm-bf533/flash.c line 52

Quoted 7 lines
board/cm-bf533/flash.c new file +7 -0
+	flash_info[0].size = CONFIG_SYS_FLASH_SIZE;
+	flash_info[0].sector_count = FLASH_TOT_SECT;
+	if (flash_info[0].flash_id == FLASH_UNKNOWN)
+		printf("## Unknown FLASH on Bank 0\n");
+	else {
+		printf("Memory Map for the Flash\n");
+		printf("0x%x - 0x%x Single Flash Chip\n", CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE);

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Many, many lines are *way* too long.

Please fix gobally.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Wenn Du ein' weise Antwort verlangst, Mu?t Du vern?nftig fragen.
                                                -- Goethe, Invektiven
#44 lore raw

PATCH 33/42 Blackfin: cm-bf537e: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    4 +-
 board/cm-bf537e/.gitignore      |    1 +
 board/cm-bf537e/Makefile        |   58 +++++
 board/cm-bf537e/cm-bf537e.c     |   44 ++++
 board/cm-bf537e/config.mk       |   33 +++
 board/cm-bf537e/flash-defines.h |   50 +++++
 board/cm-bf537e/flash.c         |  449 +++++++++++++++++++++++++++++++++++++++
 board/cm-bf537e/spi_flash.c     |    2 +
 board/cm-bf537e/u-boot.lds.S    |  143 +++++++++++++
 include/configs/cm-bf537e.h     |  133 ++++++++++++
 12 files changed, 917 insertions(+), 2 deletions(-)
 create mode 100644 board/cm-bf537e/.gitignore
 create mode 100644 board/cm-bf537e/Makefile
 create mode 100644 board/cm-bf537e/cm-bf537e.c
 create mode 100644 board/cm-bf537e/config.mk
 create mode 100644 board/cm-bf537e/flash-defines.h
 create mode 100644 board/cm-bf537e/flash.c
 create mode 100644 board/cm-bf537e/spi_flash.c
 create mode 100644 board/cm-bf537e/u-boot.lds.S
 create mode 100644 include/configs/cm-bf537e.h
MAINTAINERS +1 -0
index d5fa707..41e9903 100644
@@ -859,6 +859,7 @@ Bluetechnix Tinyboards <[email protected]>
 Blackfin Team <[email protected]>
 
 	CM-BF533	BF533
+	CM-BF537E	BF537
 
 #########################################################################
 # End of MAINTAINERS list						#
MAKEALL +1 -0
index 3074465..bc1514d 100755
@@ -790,6 +790,7 @@ LIST_blackfin="		\
 	bf548-ezkit	\
 	bf561-ezkit	\
 	cm-bf533	\
+	cm-bf537e	\
 "
 
 #########################################################################
Makefile +2 -2
index 69e3d83..53c56a4 100644
@@ -3293,7 +3293,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf533
+BFIN_BOARDS += cm-bf533 cm-bf537e
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3456,7 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/cm-bf533/u-boot.lds				  \
+	       $(obj)board/cm-bf5{33,37e}/u-boot.lds			  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
board/cm-bf537e/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/cm-bf537e/Makefile new file +58 -0

58 lines not on this page · raw message

board/cm-bf537e/cm-bf537e.c new file +44 -0

44 lines not on this page · raw message

board/cm-bf537e/config.mk new file +33 -0
new file mode 100644
index 0000000..c8b9fb8
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf537e/flash-defines.h new file +50 -0

50 lines not on this page · raw message

board/cm-bf537e/flash.c new file +449 -0

449 lines not on this page · raw message

board/cm-bf537e/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/cm-bf537e/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/cm-bf537e.h new file +133 -0

133 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#45 lore raw

PATCH 33/42 Blackfin: cm-bf537e: new board port

Dear Mike Frysinger,

Quoted 16 lines · In message <[email protected]> you wrote:
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    4 +-
 board/cm-bf537e/.gitignore      |    1 +
 board/cm-bf537e/Makefile        |   58 +++++
 board/cm-bf537e/cm-bf537e.c     |   44 ++++
 board/cm-bf537e/config.mk       |   33 +++
 board/cm-bf537e/flash-defines.h |   50 +++++
 board/cm-bf537e/flash.c         |  449 +++++++++++++++++++++++++++++++++++++++
 board/cm-bf537e/spi_flash.c     |    2 +
 board/cm-bf537e/u-boot.lds.S    |  143 +++++++++++++
 include/configs/cm-bf537e.h     |  133 ++++++++++++
 12 files changed, 917 insertions(+), 2 deletions(-)
 create mode 100644 board/cm-bf537e/.gitignore
Quoted 8 lines
 create mode 100644 board/cm-bf537e/Makefile
 create mode 100644 board/cm-bf537e/cm-bf537e.c
 create mode 100644 board/cm-bf537e/config.mk
 create mode 100644 board/cm-bf537e/flash-defines.h
 create mode 100644 board/cm-bf537e/flash.c
 create mode 100644 board/cm-bf537e/spi_flash.c
 create mode 100644 board/cm-bf537e/u-boot.lds.S
 create mode 100644 include/configs/cm-bf537e.h

Global comment for all patches in this series:

Quoted 8 lines
board/cm-bf537e/flash.c new file +2 -0
new file mode 100644
index 0000000..1806be6
@@ -0,0 +1,449 @@
+/*
+ * U-boot - flash.c Flash driver for MT28F320J3FS-11

...

Quoted 5 lines
board/cm-bf537e/flash.c new file +5 -0
+#define SWITCH_BANK do { if (memIndex >= 0x20200000) {\
+			  *pPORTFIO_SET = GPIO_4; \
+			  memIndex -= 0x200000; \
+			  crossed = 1;\
+			} else { \

board/cm-bf537e/flash.c line 58

Quoted 10 lines
board/cm-bf537e/flash.c new file +10 -0
+			  *pPORTFIO_CLEAR = GPIO_4; \
+			} \
+			asm("ssync;"); } while (0)
+
+#define SWITCH_BACK do {if (crossed) {\
+			*pPORTFIO_CLEAR = GPIO_4; \
+			memIndex += 0x200000; \
+			crossed = 0;\
+			asm("ssync;");\
+			} } while (0)

Better use inline functions instead of such macros.

Please use accessor functions instead of pointer accesses (which alslo will allow you to get rid of the "ssync" stuff here).

board/cm-bf537e/flash.c line 72

Quoted 3 lines
board/cm-bf537e/flash.c new file +3 -0
+	for (i = 0; i < CONFIG_SYS_MAX_FLASH_SECT; i++)
+		flash_info[0].start[i] =
+		    (CONFIG_SYS_FLASH_BASE + (i * FLASH_SECTOR_SIZE));

Please use curly braces for multiline statements.

...

board/cm-bf537e/flash.c line 132

Quoted 13 lines
board/cm-bf537e/flash.c new file +13 -0
+int flash_erase(flash_info_t *info, int s_first, int s_last)
+{
+	int prot, sect, i;
+
+	prot = 0;
+	for (sect = s_first; sect <= s_last; ++sect) {
+		if (info->protect[sect])
+			prot++;
+	}
+	if (prot)
+		printf("- Warning: %d protected sectors will not be erased!\n",
+		       prot);
+	else

Please use curly braces for multiline statements.

board/cm-bf537e/flash.c line 155

Quoted 8 lines
board/cm-bf537e/flash.c new file +8 -0
+int write_buff(flash_info_t *info, unsigned char *src, ulong addr, ulong cnt)
+{
+	long i = 0;
+	unsigned long ulOffset = addr - CONFIG_SYS_FLASH_BASE;
+	int nLeftover = cnt % 4;
+	int iSectors = 0;
+	int iFirst_sector = 0;
+	int iProgress = cnt / (4 * 20);

Please do not use camel-case variable names.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Q:  Do you know what the death rate around here is?
A:  One per person.
#46 lore raw

PATCH 33/42 Blackfin: cm-bf537e: new board port

Quoted 11 lines · On Wednesday 11 February 2009 16:43:51 Wolfgang Denk wrote:
Quoted 10 lines · In message Mike Frysinger you
board/cm-bf537e/flash.c new file +10 -0
+#define SWITCH_BANK do { if (memIndex >= 0x20200000) {\
+			  *pPORTFIO_SET = GPIO_4; \
+			  memIndex -= 0x200000; \
+			  crossed = 1;\
+			} else { \
+			  *pPORTFIO_CLEAR = GPIO_4; \
+			} \
+			asm("ssync;"); } while (0)
+
+#define SWITCH_BACK do {if (crossed) {\
Quoted 8 lines

board/cm-bf537e/flash.c line 58

Quoted 5 lines
board/cm-bf537e/flash.c new file +5 -0
+			*pPORTFIO_CLEAR = GPIO_4; \
+			memIndex += 0x200000; \
+			crossed = 0;\
+			asm("ssync;");\
+			} } while (0)

Please use accessor functions instead of pointer accesses (which alslo will allow you to get rid of the "ssync" stuff here).

the ssync would still be required. it's to force the GPIO pins to the proper state, not to make sure some address request has gone out.

all the flash drivers in the tinyboard dirs (cm-*) are "throw away" ... they all exist because a common driver does not yet exist to hook CFI compliant flashes up partially with addressing lines and partially with GPIOs. once i get around to implementing that, all of these can be summarily scuttled. sorry, i should have noted this in the summary.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090211/4eeda703/attachment.pgp

#47 lore raw

PATCH 34/42 Blackfin: cm-bf561: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                 |    1 +
 MAKEALL                     |    1 +
 Makefile                    |    4 +-
 board/cm-bf561/.gitignore   |    1 +
 board/cm-bf561/Makefile     |   57 +++++++++++++++++
 board/cm-bf561/cm-bf561.c   |   25 ++++++++
 board/cm-bf561/config.mk    |   33 ++++++++++
 board/cm-bf561/u-boot.lds.S |  143 +++++++++++++++++++++++++++++++++++++++++++
 include/configs/cm-bf561.h  |  100 ++++++++++++++++++++++++++++++
 9 files changed, 363 insertions(+), 2 deletions(-)
 create mode 100644 board/cm-bf561/.gitignore
 create mode 100644 board/cm-bf561/Makefile
 create mode 100644 board/cm-bf561/cm-bf561.c
 create mode 100644 board/cm-bf561/config.mk
 create mode 100644 board/cm-bf561/u-boot.lds.S
 create mode 100644 include/configs/cm-bf561.h
MAINTAINERS +1 -0
index 41e9903..727de20 100644
@@ -860,6 +860,7 @@ Blackfin Team <[email protected]>
 
 	CM-BF533	BF533
 	CM-BF537E	BF537
+	CM-BF561	BF561
 
 #########################################################################
 # End of MAINTAINERS list						#
MAKEALL +1 -0
index bc1514d..5ce3ea1 100755
@@ -791,6 +791,7 @@ LIST_blackfin="		\
 	bf561-ezkit	\
 	cm-bf533	\
 	cm-bf537e	\
+	cm-bf561	\
 "
 
 #########################################################################
Makefile +2 -2
index 53c56a4..5ea9435 100644
@@ -3293,7 +3293,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf533 cm-bf537e
+BFIN_BOARDS += cm-bf533 cm-bf537e cm-bf561
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3456,7 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/cm-bf5{33,37e}/u-boot.lds			  \
+	       $(obj)board/cm-bf5{33,37e,61}/u-boot.lds			  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
board/cm-bf561/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/cm-bf561/Makefile new file +57 -0

57 lines not on this page · raw message

board/cm-bf561/cm-bf561.c new file +25 -0
new file mode 100644
index 0000000..5bce9eb
@@ -0,0 +1,25 @@
+/*
+ * U-boot - main board file
+ *
+ * Copyright (c) 2005-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int checkboard(void)
+{
+	printf("Board: Bluetechnix CM-BF561 core module\n");
+	printf("       Support: http://www.bluetechnix.at/\n");
+	return 0;
+}
+
+phys_size_t initdram(int board_type)
+{
+	gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
+	return gd->bd->bi_memsize;
+}
board/cm-bf561/config.mk new file +33 -0
new file mode 100644
index 0000000..710809a
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf561/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/cm-bf561.h new file +100 -0

100 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#48 lore raw

PATCH 35/42 Blackfin: tcm-bf537: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    4 +-
 board/tcm-bf537/.gitignore      |    1 +
 board/tcm-bf537/Makefile        |   58 ++++
 board/tcm-bf537/config.mk       |   33 +++
 board/tcm-bf537/flash-defines.h |   52 ++++
 board/tcm-bf537/flash.c         |  583 +++++++++++++++++++++++++++++++++++++++
 board/tcm-bf537/spi_flash.c     |    2 +
 board/tcm-bf537/tcm-bf537.c     |   44 +++
 board/tcm-bf537/u-boot.lds.S    |  143 ++++++++++
 include/configs/tcm-bf537.h     |  135 +++++++++
 12 files changed, 1055 insertions(+), 2 deletions(-)
 create mode 100644 board/tcm-bf537/.gitignore
 create mode 100644 board/tcm-bf537/Makefile
 create mode 100644 board/tcm-bf537/config.mk
 create mode 100644 board/tcm-bf537/flash-defines.h
 create mode 100644 board/tcm-bf537/flash.c
 create mode 100644 board/tcm-bf537/spi_flash.c
 create mode 100644 board/tcm-bf537/tcm-bf537.c
 create mode 100644 board/tcm-bf537/u-boot.lds.S
 create mode 100644 include/configs/tcm-bf537.h
MAINTAINERS +1 -0
index 727de20..6d1bfee 100644
@@ -861,6 +861,7 @@ Blackfin Team <[email protected]>
 	CM-BF533	BF533
 	CM-BF537E	BF537
 	CM-BF561	BF561
+	TCM-BF537	BF537
 
 #########################################################################
 # End of MAINTAINERS list						#
MAKEALL +1 -0
index 5ce3ea1..806e7a9 100755
@@ -792,6 +792,7 @@ LIST_blackfin="		\
 	cm-bf533	\
 	cm-bf537e	\
 	cm-bf561	\
+	tcm-bf537	\
 "
 
 #########################################################################
Makefile +2 -2
index 5ea9435..65a6c9f 100644
@@ -3293,7 +3293,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf533 cm-bf537e cm-bf561
+BFIN_BOARDS += cm-bf533 cm-bf537e cm-bf561 tcm-bf537
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3456,7 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/cm-bf5{33,37e,61}/u-boot.lds			  \
+	       $(obj)board/{,t}cm-bf5{33,37e,61}/u-boot.lds		  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
board/tcm-bf537/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/tcm-bf537/Makefile new file +58 -0

58 lines not on this page · raw message

board/tcm-bf537/config.mk new file +33 -0
new file mode 100644
index 0000000..c8b9fb8
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/tcm-bf537/flash-defines.h new file +52 -0

52 lines not on this page · raw message

board/tcm-bf537/flash.c new file +583 -0

583 lines not on this page · raw message

board/tcm-bf537/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/tcm-bf537/tcm-bf537.c new file +44 -0

44 lines not on this page · raw message

board/tcm-bf537/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/tcm-bf537.h new file +135 -0

135 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#49 lore raw

PATCH 36/42 Blackfin: cm-bf548: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                 |    1 +
 MAKEALL                     |    1 +
 Makefile                    |    4 +-
 board/cm-bf548/.gitignore   |    1 +
 board/cm-bf548/Makefile     |   60 ++++++++
 board/cm-bf548/cm-bf548.c   |   79 ++++++++++
 board/cm-bf548/config.mk    |   36 +++++
 board/cm-bf548/nand.c       |    2 +
 board/cm-bf548/spi_flash.c  |    2 +
 board/cm-bf548/u-boot.lds.S |  124 ++++++++++++++++
 board/cm-bf548/video.c      |  339 +++++++++++++++++++++++++++++++++++++++++++
 include/configs/cm-bf548.h  |  150 +++++++++++++++++++
 12 files changed, 797 insertions(+), 2 deletions(-)
 create mode 100644 board/cm-bf548/.gitignore
 create mode 100644 board/cm-bf548/Makefile
 create mode 100644 board/cm-bf548/cm-bf548.c
 create mode 100644 board/cm-bf548/config.mk
 create mode 100644 board/cm-bf548/nand.c
 create mode 100644 board/cm-bf548/spi_flash.c
 create mode 100644 board/cm-bf548/u-boot.lds.S
 create mode 100644 board/cm-bf548/video.c
 create mode 100644 include/configs/cm-bf548.h
MAINTAINERS +1 -0
index 6d1bfee..37f8118 100644
@@ -860,6 +860,7 @@ Blackfin Team <[email protected]>
 
 	CM-BF533	BF533
 	CM-BF537E	BF537
+	CM-BF548	BF548
 	CM-BF561	BF561
 	TCM-BF537	BF537
 
MAKEALL +1 -0
index 806e7a9..32f770e 100755
@@ -791,6 +791,7 @@ LIST_blackfin="		\
 	bf561-ezkit	\
 	cm-bf533	\
 	cm-bf537e	\
+	cm-bf548	\
 	cm-bf561	\
 	tcm-bf537	\
 "
Makefile +2 -2
index 65a6c9f..7a50144 100644
@@ -3293,7 +3293,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf533 cm-bf537e cm-bf561 tcm-bf537
+BFIN_BOARDS += cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3456,7 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/{,t}cm-bf5{33,37e,61}/u-boot.lds		  \
+	       $(obj)board/{,t}cm-bf5{33,37e,48,61}/u-boot.lds		  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
board/cm-bf548/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/cm-bf548/Makefile new file +60 -0

60 lines not on this page · raw message

board/cm-bf548/cm-bf548.c new file +79 -0

79 lines not on this page · raw message

board/cm-bf548/config.mk new file +36 -0
new file mode 100644
index 0000000..0dbce93
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
+LDR_FLAGS-BFIN_BOOT_FIFO       := --dma 1
+LDR_FLAGS-BFIN_BOOT_SPI_MASTER := --dma 1
+LDR_FLAGS-BFIN_BOOT_UART       := --dma 1
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf548/nand.c new file +2 -0
new file mode 100644
index 0000000..bce563e
@@ -0,0 +1,2 @@
+/* Share the nand driver */
+#include "../bf548-ezkit/nand.c"
board/cm-bf548/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/cm-bf548/u-boot.lds.S new file +124 -0

124 lines not on this page · raw message

board/cm-bf548/video.c new file +339 -0

339 lines not on this page · raw message

include/configs/cm-bf548.h new file +150 -0

150 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#50 lore raw

PATCH 36/42 Blackfin: cm-bf548: new board port

Quoted 14 lines · Mike Frysinger
board/cm-bf548/nand.c new file +2 -0
new file mode 100644
index 0000000..bce563e
@@ -0,0 +1,2 @@
+/* Share the nand driver */
+#include "../bf548-ezkit/nand.c"
board/cm-bf548/spi_flash.c new file +0 -0
new file mode 100644
index 0000000..8784741

board/cm-bf548/spi_flash.c line 2

Quoted 2 lines
board/cm-bf548/spi_flash.c new file +2 -0
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"

Why not move the driver to a more appropriate directory, if it's going to be shared?

-Scott

#51 lore raw

PATCH 36/42 Blackfin: cm-bf548: new board port

Quoted 12 lines · On Tuesday 10 February 2009 12:34:03 Scott Wood wrote:
Quoted 11 lines · Mike Frysinger
board/cm-bf548/nand.c new file +2 -0
new file mode 100644
index 0000000..bce563e
@@ -0,0 +1,2 @@
+/* Share the nand driver */
+#include "../bf548-ezkit/nand.c"
board/cm-bf548/spi_flash.c new file +0 -0
new file mode 100644
index 0000000..8784741
Quoted 8 lines

board/cm-bf548/spi_flash.c line 2

Quoted 5 lines
board/cm-bf548/spi_flash.c new file +2 -0
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"

Why not move the driver to a more appropriate directory, if it's going to be shared?

hmm, the nand driver has already been moved, so the bf54x boards need updating. the spi_flash.c driver is deprecated and ive been working on getting the common spiflash driver up to date instead.

thanks for pointing the nand onoe ut
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090210/15d1aa77/attachment.pgp

#52 lore raw

PATCH 37/42 Blackfin: cm-bf527: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                    |    1 +
 MAKEALL                        |    1 +
 Makefile                       |    4 +-
 board/cm-bf527/.gitignore      |    1 +
 board/cm-bf527/Makefile        |   59 ++++
 board/cm-bf527/cm-bf527.c      |   59 ++++
 board/cm-bf527/config.mk       |   32 +++
 board/cm-bf527/flash-defines.h |   51 ++++
 board/cm-bf527/flash.c         |  589 ++++++++++++++++++++++++++++++++++++++++
 board/cm-bf527/gpio.c          |   74 +++++
 board/cm-bf527/nand.c          |    2 +
 board/cm-bf527/spi_flash.c     |    2 +
 board/cm-bf527/u-boot.lds.S    |  124 +++++++++
 include/configs/cm-bf527.h     |  144 ++++++++++
 14 files changed, 1141 insertions(+), 2 deletions(-)
 create mode 100644 board/cm-bf527/.gitignore
 create mode 100644 board/cm-bf527/Makefile
 create mode 100644 board/cm-bf527/cm-bf527.c
 create mode 100644 board/cm-bf527/config.mk
 create mode 100644 board/cm-bf527/flash-defines.h
 create mode 100644 board/cm-bf527/flash.c
 create mode 100644 board/cm-bf527/gpio.c
 create mode 100644 board/cm-bf527/nand.c
 create mode 100644 board/cm-bf527/spi_flash.c
 create mode 100644 board/cm-bf527/u-boot.lds.S
 create mode 100644 include/configs/cm-bf527.h
MAINTAINERS +1 -0
index 37f8118..f56fccf 100644
@@ -858,6 +858,7 @@ Blackfin Team <[email protected]>
 Bluetechnix Tinyboards <[email protected]>
 Blackfin Team <[email protected]>
 
+	CM-BF527	BF527
 	CM-BF533	BF533
 	CM-BF537E	BF537
 	CM-BF548	BF548
MAKEALL +1 -0
index 32f770e..362730a 100755
@@ -789,6 +789,7 @@ LIST_blackfin="		\
 	bf538f-ezkit	\
 	bf548-ezkit	\
 	bf561-ezkit	\
+	cm-bf527	\
 	cm-bf533	\
 	cm-bf537e	\
 	cm-bf548	\
Makefile +2 -2
index 7a50144..8fbc58f 100644
@@ -3293,7 +3293,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
+BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3456,7 +3456,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
-	       $(obj)board/{,t}cm-bf5{33,37e,48,61}/u-boot.lds		  \
+	       $(obj)board/{,t}cm-bf5{27,33,37e,48,61}/u-boot.lds	  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
board/cm-bf527/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/cm-bf527/Makefile new file +59 -0

59 lines not on this page · raw message

board/cm-bf527/cm-bf527.c new file +59 -0

59 lines not on this page · raw message

board/cm-bf527/config.mk new file +32 -0
new file mode 100644
index 0000000..f4a5a80
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf527/flash-defines.h new file +51 -0

51 lines not on this page · raw message

board/cm-bf527/flash.c new file +589 -0

589 lines not on this page · raw message

board/cm-bf527/gpio.c new file +74 -0

74 lines not on this page · raw message

board/cm-bf527/nand.c new file +2 -0
new file mode 100644
index 0000000..bce563e
@@ -0,0 +1,2 @@
+/* Share the nand driver */
+#include "../bf548-ezkit/nand.c"
board/cm-bf527/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/cm-bf527/u-boot.lds.S new file +124 -0

124 lines not on this page · raw message

include/configs/cm-bf527.h new file +144 -0

144 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#53 lore raw

PATCH 38/42 Blackfin: bf537-pnav: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                   |    1 +
 MAKEALL                       |    1 +
 Makefile                      |    3 +-
 board/bf537-pnav/.gitignore   |    1 +
 board/bf537-pnav/Makefile     |   59 +++++++++
 board/bf537-pnav/bf537-pnav.c |   43 +++++++
 board/bf537-pnav/config.mk    |   32 +++++
 board/bf537-pnav/nand.c       |  100 +++++++++++++++
 board/bf537-pnav/spi_flash.c  |    2 +
 board/bf537-pnav/u-boot.lds.S |  143 ++++++++++++++++++++++
 include/configs/bf537-pnav.h  |  271 +++++++++++++++++++++++++++++++++++++++++
 11 files changed, 655 insertions(+), 1 deletions(-)
 create mode 100644 board/bf537-pnav/.gitignore
 create mode 100644 board/bf537-pnav/Makefile
 create mode 100644 board/bf537-pnav/bf537-pnav.c
 create mode 100644 board/bf537-pnav/config.mk
 create mode 100644 board/bf537-pnav/nand.c
 create mode 100644 board/bf537-pnav/spi_flash.c
 create mode 100644 board/bf537-pnav/u-boot.lds.S
 create mode 100644 include/configs/bf537-pnav.h
MAINTAINERS +1 -0
index f56fccf..5a790e0 100644
@@ -850,6 +850,7 @@ Blackfin Team <[email protected]>
 	BF527-EZKIT	BF527
 	BF533-EZKIT	BF533
 	BF533-STAMP	BF533
+	BF537-PNAV	BF537
 	BF537-STAMP	BF537
 	BF538F-EZKIT	BF538
 	BF548-EZKIT	BF548
MAKEALL +1 -0
index 362730a..6fe71aa 100755
@@ -785,6 +785,7 @@ LIST_blackfin="		\
 	bf527-ezkit	\
 	bf533-ezkit	\
 	bf533-stamp	\
+	bf537-pnav	\
 	bf537-stamp	\
 	bf538f-ezkit	\
 	bf548-ezkit	\
Makefile +2 -1
index 8fbc58f..8c1e1f7 100644
@@ -3290,7 +3290,7 @@ suzaku_config:	unconfig
 
 # Analog Devices boards
 BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
-	bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
+	bf537-pnav bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
 BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
@@ -3458,6 +3458,7 @@ clean:
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
 	       $(obj)board/{,t}cm-bf5{27,33,37e,48,61}/u-boot.lds	  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
+	       $(obj)board/bf537-pnav/u-boot.lds			  \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf537-pnav/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf537-pnav/Makefile new file +59 -0

59 lines not on this page · raw message

board/bf537-pnav/bf537-pnav.c new file +43 -0

43 lines not on this page · raw message

board/bf537-pnav/config.mk new file +32 -0
new file mode 100644
index 0000000..f4a5a80
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf537-pnav/nand.c new file +100 -0

100 lines not on this page · raw message

board/bf537-pnav/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf537-pnav/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/bf537-pnav.h new file +271 -0

271 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#54 lore raw

PATCH 39/42 Blackfin: bf537-minotaur: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                           |    5 +
 MAKEALL                               |    1 +
 Makefile                              |    5 +-
 board/bf537-minotaur/.gitignore       |    1 +
 board/bf537-minotaur/Makefile         |   58 +++++++++
 board/bf537-minotaur/bf537-minotaur.c |   43 +++++++
 board/bf537-minotaur/config.mk        |   33 +++++
 board/bf537-minotaur/spi_flash.c      |    2 +
 board/bf537-minotaur/u-boot.lds.S     |  143 ++++++++++++++++++++++
 include/configs/bf537-minotaur.h      |  214 +++++++++++++++++++++++++++++++++
 10 files changed, 504 insertions(+), 1 deletions(-)
 create mode 100644 board/bf537-minotaur/.gitignore
 create mode 100644 board/bf537-minotaur/Makefile
 create mode 100644 board/bf537-minotaur/bf537-minotaur.c
 create mode 100644 board/bf537-minotaur/config.mk
 create mode 100644 board/bf537-minotaur/spi_flash.c
 create mode 100644 board/bf537-minotaur/u-boot.lds.S
 create mode 100644 include/configs/bf537-minotaur.h
MAINTAINERS +5 -0
index 5a790e0..5bf9dd3 100644
@@ -866,6 +866,11 @@ Blackfin Team <[email protected]>
 	CM-BF561	BF561
 	TCM-BF537	BF537
 
+Martin Strubel <[email protected]>
+Blackfin Team <[email protected]>
+
+	BF537-minotaur	BF537
+
 #########################################################################
 # End of MAINTAINERS list						#
 #########################################################################
MAKEALL +1 -0
index 6fe71aa..bb5a305 100755
@@ -785,6 +785,7 @@ LIST_blackfin="		\
 	bf527-ezkit	\
 	bf533-ezkit	\
 	bf533-stamp	\
+	bf537-minotaur	\
 	bf537-pnav	\
 	bf537-stamp	\
 	bf538f-ezkit	\
Makefile +4 -1
index 8c1e1f7..a2e7c89 100644
@@ -3295,6 +3295,9 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 # Bluetechnix tinyboards
 BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
 
+# Misc third party boards
+BFIN_BOARDS += bf537-minotaur
+
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
 	@$(MAKE) -s -B $(obj)include/autoconf.mk
@@ -3458,7 +3461,7 @@ clean:
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
 	       $(obj)board/{,t}cm-bf5{27,33,37e,48,61}/u-boot.lds	  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
-	       $(obj)board/bf537-pnav/u-boot.lds			  \
+	       $(obj)board/bf537-{minotaur,pnav}/u-boot.lds		  \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf537-minotaur/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf537-minotaur/Makefile new file +58 -0

58 lines not on this page · raw message

board/bf537-minotaur/bf537-minotaur.c new file +43 -0

43 lines not on this page · raw message

board/bf537-minotaur/config.mk new file +33 -0
new file mode 100644
index 0000000..feafcef
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_UART       := --port g --gpio 6
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf537-minotaur/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf537-minotaur/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/bf537-minotaur.h new file +214 -0

214 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#55 lore raw

PATCH 40/42 Blackfin: bf537-srv1: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                   |    1 +
 MAKEALL                       |    1 +
 Makefile                      |    4 +-
 board/bf537-srv1/.gitignore   |    1 +
 board/bf537-srv1/Makefile     |   58 +++++++++++
 board/bf537-srv1/bf537-srv1.c |   43 ++++++++
 board/bf537-srv1/config.mk    |   33 +++++++
 board/bf537-srv1/spi_flash.c  |    2 +
 board/bf537-srv1/u-boot.lds.S |  143 +++++++++++++++++++++++++++
 include/configs/bf537-srv1.h  |  214 +++++++++++++++++++++++++++++++++++++++++
 10 files changed, 498 insertions(+), 2 deletions(-)
 create mode 100644 board/bf537-srv1/.gitignore
 create mode 100644 board/bf537-srv1/Makefile
 create mode 100644 board/bf537-srv1/bf537-srv1.c
 create mode 100644 board/bf537-srv1/config.mk
 create mode 100644 board/bf537-srv1/spi_flash.c
 create mode 100644 board/bf537-srv1/u-boot.lds.S
 create mode 100644 include/configs/bf537-srv1.h
MAINTAINERS +1 -0
index 5bf9dd3..74f38d8 100644
@@ -870,6 +870,7 @@ Martin Strubel <[email protected]>
 Blackfin Team <[email protected]>
 
 	BF537-minotaur	BF537
+	BF537-srv1	BF537
 
 #########################################################################
 # End of MAINTAINERS list						#
MAKEALL +1 -0
index bb5a305..c8cb1f4 100755
@@ -787,6 +787,7 @@ LIST_blackfin="		\
 	bf533-stamp	\
 	bf537-minotaur	\
 	bf537-pnav	\
+	bf537-srv1	\
 	bf537-stamp	\
 	bf538f-ezkit	\
 	bf548-ezkit	\
Makefile +2 -2
index a2e7c89..73d778c 100644
@@ -3296,7 +3296,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
 
 # Misc third party boards
-BFIN_BOARDS += bf537-minotaur
+BFIN_BOARDS += bf537-minotaur bf537-srv1
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3461,7 +3461,7 @@ clean:
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
 	       $(obj)board/{,t}cm-bf5{27,33,37e,48,61}/u-boot.lds	  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
-	       $(obj)board/bf537-{minotaur,pnav}/u-boot.lds		  \
+	       $(obj)board/bf537-{minotaur,pnav,srv1}/u-boot.lds	  \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/bf537-srv1/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/bf537-srv1/Makefile new file +58 -0

58 lines not on this page · raw message

board/bf537-srv1/bf537-srv1.c new file +43 -0

43 lines not on this page · raw message

board/bf537-srv1/config.mk new file +33 -0
new file mode 100644
index 0000000..feafcef
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_UART       := --port g --gpio 6
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf537-srv1/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/bf537-srv1/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/bf537-srv1.h new file +214 -0

214 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#56 lore raw

PATCH 41/42 Blackfin: blackstamp: new board port

In reply to Mike Frysinger
---
 MAINTAINERS                   |    5 +
 MAKEALL                       |    1 +
 Makefile                      |    4 +-
 board/blackstamp/.gitignore   |    1 +
 board/blackstamp/Makefile     |   58 +++++++++
 board/blackstamp/blackstamp.c |   53 ++++++++
 board/blackstamp/config.mk    |   32 +++++
 board/blackstamp/spi_flash.c  |    2 +
 board/blackstamp/u-boot.lds.S |  143 ++++++++++++++++++++++
 include/configs/blackstamp.h  |  266 +++++++++++++++++++++++++++++++++++++++++
 10 files changed, 563 insertions(+), 2 deletions(-)
 create mode 100644 board/blackstamp/.gitignore
 create mode 100644 board/blackstamp/Makefile
 create mode 100644 board/blackstamp/blackstamp.c
 create mode 100644 board/blackstamp/config.mk
 create mode 100644 board/blackstamp/spi_flash.c
 create mode 100644 board/blackstamp/u-boot.lds.S
 create mode 100644 include/configs/blackstamp.h
MAINTAINERS +5 -0
index 74f38d8..8d95bde 100644
@@ -872,6 +872,11 @@ Blackfin Team <[email protected]>
 	BF537-minotaur	BF537
 	BF537-srv1	BF537
 
+Wojtek Skulski <[email protected]>
+Benjamin Matthews <[email protected]>
+
+	BLACKSTAMP	BF532
+
 #########################################################################
 # End of MAINTAINERS list						#
 #########################################################################
MAKEALL +1 -0
index c8cb1f4..69a8a5f 100755
@@ -792,6 +792,7 @@ LIST_blackfin="		\
 	bf538f-ezkit	\
 	bf548-ezkit	\
 	bf561-ezkit	\
+	blackstamp	\
 	cm-bf527	\
 	cm-bf533	\
 	cm-bf537e	\
Makefile +2 -2
index 73d778c..cc2abf8 100644
@@ -3296,7 +3296,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
 BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
 
 # Misc third party boards
-BFIN_BOARDS += bf537-minotaur bf537-srv1
+BFIN_BOARDS += bf537-minotaur bf537-srv1 blackstamp
 
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
@@ -3461,7 +3461,7 @@ clean:
 	       $(obj)board/{integratorap,integratorcp}/u-boot.lds	  \
 	       $(obj)board/{,t}cm-bf5{27,33,37e,48,61}/u-boot.lds	  \
 	       $(obj)board/bf5{18f,26,27,33,37,38f,48,61}-{ez{kit,brd},stamp}/u-boot.lds \
-	       $(obj)board/bf537-{minotaur,pnav,srv1}/u-boot.lds	  \
+	       $(obj)board/{bf537-{minotaur,pnav,srv1},blackstamp}/u-boot.lds \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
board/blackstamp/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/blackstamp/Makefile new file +58 -0

58 lines not on this page · raw message

board/blackstamp/blackstamp.c new file +53 -0

53 lines not on this page · raw message

board/blackstamp/config.mk new file +32 -0
new file mode 100644
index 0000000..f4a5a80
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/blackstamp/spi_flash.c new file +2 -0
new file mode 100644
index 0000000..8784741
@@ -0,0 +1,2 @@
+/* Share the spi flash code */
+#include "../bf537-stamp/spi_flash.c"
board/blackstamp/u-boot.lds.S new file +143 -0

143 lines not on this page · raw message

include/configs/blackstamp.h new file +266 -0

266 lines not on this page · raw message

Signature · 1 line
1.6.1.2
#57 lore raw

PATCH 42/42 Blackfin: ibf-dsp561: new board port

In reply to Mike Frysinger

From: Hoan Hoang <[email protected]>

---
 MAINTAINERS                   |    5 ++
 MAKEALL                       |    1 +
 Makefile                      |    3 +
 board/ibf-dsp561/.gitignore   |    1 +
 board/ibf-dsp561/Makefile     |   57 ++++++++++++++++
 board/ibf-dsp561/config.mk    |   33 +++++++++
 board/ibf-dsp561/ibf-dsp561.c |   25 +++++++
 board/ibf-dsp561/u-boot.lds.S |  145 +++++++++++++++++++++++++++++++++++++++++
 include/configs/ibf-dsp561.h  |  130 ++++++++++++++++++++++++++++++++++++
 9 files changed, 400 insertions(+), 0 deletions(-)
 create mode 100644 board/ibf-dsp561/.gitignore
 create mode 100644 board/ibf-dsp561/Makefile
 create mode 100644 board/ibf-dsp561/config.mk
 create mode 100644 board/ibf-dsp561/ibf-dsp561.c
 create mode 100644 board/ibf-dsp561/u-boot.lds.S
 create mode 100644 include/configs/ibf-dsp561.h
MAINTAINERS +5 -0
index 8d95bde..5ad7eab 100644
@@ -877,6 +877,11 @@ Benjamin Matthews <[email protected]>
 
 	BLACKSTAMP	BF532
 
+I-SYST Micromodule <[email protected]>
+Blackfin Team <[email protected]>
+
+	IBF-DSP561	BF561
+
 #########################################################################
 # End of MAINTAINERS list						#
 #########################################################################
MAKEALL +1 -0
index 69a8a5f..206a0d6 100755
@@ -798,6 +798,7 @@ LIST_blackfin="		\
 	cm-bf537e	\
 	cm-bf548	\
 	cm-bf561	\
+	ibf-dsp561	\
 	tcm-bf537	\
 "
 
Makefile +3 -0
index cc2abf8..36c6517 100644
@@ -3298,6 +3298,9 @@ BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
 # Misc third party boards
 BFIN_BOARDS += bf537-minotaur bf537-srv1 blackstamp
 
+# I-SYST Micromodule
+BFIN_BOARDS += ibf-dsp561
+
 $(BFIN_BOARDS:%=%_config)	: unconfig
 	@$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=)
 	@$(MAKE) -s -B $(obj)include/autoconf.mk
board/ibf-dsp561/.gitignore new file +1 -0
new file mode 100644
index 0000000..945f324
@@ -0,0 +1 @@
+/u-boot.lds
board/ibf-dsp561/Makefile new file +57 -0

57 lines not on this page · raw message

board/ibf-dsp561/config.mk new file +33 -0
new file mode 100644
index 0000000..710809a
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2005-2008 Analog Device Inc.
+#
+# (C) Copyright 2001
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+# This is not actually used for Blackfin boards so do not change it
+#TEXT_BASE = do-not-use-me
+
+LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds
+
+# Set some default LDR flags based on boot mode.
+LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
+LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/ibf-dsp561/ibf-dsp561.c new file +25 -0
new file mode 100644
index 0000000..551fc29
@@ -0,0 +1,25 @@
+/*
+ * U-boot - main board file
+ *
+ * Copyright (c) 2008-2009 I-SYST.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int checkboard(void)
+{
+	printf("Board: I-SYST IBF-DSP561 Micromodule\n");
+	printf("       Support: http://www.i-syst.com/\n");
+	return 0;
+}
+
+phys_size_t initdram(int board_type)
+{
+	gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
+	return gd->bd->bi_memsize;
+}
board/ibf-dsp561/u-boot.lds.S new file +145 -0

145 lines not on this page · raw message

include/configs/ibf-dsp561.h new file +130 -0

130 lines not on this page · raw message

Signature · 1 line
1.6.1.2