Blackfin updates for v2011.03
cover Blackfin updates for v2011.03
More processor header cleanups, board config.mk unification and removal, a few new board ports, and random bug fixes. Most clean up work is to address complaints from Wolfgang since he won't pull patches otherwise.
The processor header updates are too large for the list, but you can of course find them in my git tree:
git://git.denx.de/u-boot-blackfin.git
Andreas Schallenberg (1):
Blackfin: dnp5370: new board port
Chong Huang (1):
Blackfin: bf525-ucr2: new board port
Mike Frysinger (26):
MAINTAINERS: sort Blackfin entries
Blackfin: bf518f-ezbrd: don't require SPI logic all the time
Blackfin: skip RAM display for 0 mem systems
Blackfin: drop CONFIG_SYS_TEXT_BASE from boards
Blackfin: unify bootmode based LDR_FLAGS setup
Blackfin: move CONFIG_BFIN_CPU back to board config.h
Blackfin: bf527-sdp: update custom CFLAGS paths
Blackfin: bf537-pnav/blackstamp/blackvme: drop empty config.mk files
Blackfin: serial: clean up muxing a bit
Blackfin: bf537-minotaur/bf537-srv1: undefine nfs when net is
disabled
Blackfin: bf537: fix L1 data defines
Blackfin: bf561-ezkit/ibf-dsp561: invert env offset/addr logic
Blackfin: fix bd_t handling
Blackfin: BF50x: new processor port
Blackfin: drop duplicate system mmr and L1 scratch defines
Blackfin: BF52x: unify duplicated headers
Blackfin: BF537: unify duplicated headers
Blackfin: only check for os log when we have external memory
Blackfin: turn off caches when self initializing
Blackfin: default to L1 bank A when L1 bank B does not exist
Blackfin: bf506f-ezkit: new board port
Blackfin: adi boards: drop old ELF define
Blackfin: bootrom.h: sync with toolchain
Blackfin: bootldr: use common defines
Blackfin: ldrinfo: new command
Blackfin: adi boards: enable ldrinfo
MAINTAINERS | 54 +- arch/blackfin/config.mk | 15 +- arch/blackfin/cpu/gpio.c | 8 +- arch/blackfin/cpu/initcode.c | 25 +- arch/blackfin/cpu/serial.h | 72 +- arch/blackfin/cpu/start.S | 45 +- arch/blackfin/include/asm/blackfin_cdef.h | 6 + arch/blackfin/include/asm/blackfin_def.h | 10 + arch/blackfin/include/asm/config.h | 10 +- arch/blackfin/include/asm/mach-bf506/BF504_cdef.h | 1782 ++++++++++++++++++++ arch/blackfin/include/asm/mach-bf506/BF504_def.h | 944 +++++++++++ arch/blackfin/include/asm/mach-bf506/BF506_cdef.h | 11 + arch/blackfin/include/asm/mach-bf506/BF506_def.h | 11 + arch/blackfin/include/asm/mach-bf506/anomaly.h | 128 ++ arch/blackfin/include/asm/mach-bf506/def_local.h | 5 + arch/blackfin/include/asm/mach-bf506/gpio.h | 52 + arch/blackfin/include/asm/mach-bf506/portmux.h | 148 ++ arch/blackfin/include/asm/mach-bf506/ports.h | 59 + arch/blackfin/include/asm/mach-bf518/BF512_def.h | 6 - .../asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 994 ----------- .../asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h | 503 ------ arch/blackfin/include/asm/mach-bf527/BF522_cdef.h | 986 +++++++++++- arch/blackfin/include/asm/mach-bf527/BF522_def.h | 495 ++++++- arch/blackfin/include/asm/mach-bf527/BF524_cdef.h | 20 +- arch/blackfin/include/asm/mach-bf527/BF524_def.h | 12 +- arch/blackfin/include/asm/mach-bf527/BF526_cdef.h | 358 +---- arch/blackfin/include/asm/mach-bf527/BF526_def.h | 181 +-- arch/blackfin/include/asm/mach-bf533/BF531_def.h | 6 - arch/blackfin/include/asm/mach-bf533/BF532_def.h | 6 - arch/blackfin/include/asm/mach-bf533/BF533_def.h | 6 - .../asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 1624 ------------------ .../asm/mach-bf537/ADSP-EDN-BF534-extended_def.h | 819 --------- arch/blackfin/include/asm/mach-bf537/BF534_cdef.h | 1614 ++++++++++++++++++- arch/blackfin/include/asm/mach-bf537/BF534_def.h | 816 +++++++++- arch/blackfin/include/asm/mach-bf538/BF538_def.h | 6 - arch/blackfin/include/asm/mach-bf561/BF561_def.h | 7 +- .../include/asm/mach-common/bits/bootrom.h | 86 +- arch/blackfin/lib/board.c | 21 +- arch/blackfin/lib/u-boot.lds.S | 10 +- board/bct-brettl2/config.mk | 8 - board/bf506f-ezkit/Makefile | 54 + board/bf506f-ezkit/bf506f-ezkit.c | 27 + board/bf518f-ezbrd/bf518f-ezbrd.c | 30 +- board/bf518f-ezbrd/config.mk | 8 - board/bf525-ucr2/Makefile | 54 + board/bf525-ucr2/bf525-ucr2.c | 16 + board/bf526-ezbrd/config.mk | 8 - board/bf527-ad7160-eval/config.mk | 8 - board/bf527-ezkit/config.mk | 8 - board/bf527-sdp/config.mk | 10 +- board/bf533-ezkit/config.mk | 6 - board/bf533-stamp/config.mk | 6 - board/bf537-minotaur/config.mk | 8 +- board/bf537-pnav/config.mk | 32 - board/bf537-srv1/config.mk | 8 +- board/bf537-stamp/config.mk | 6 - board/bf538f-ezkit/config.mk | 6 - board/bf548-ezkit/config.mk | 6 - board/bf561-acvilon/config.mk | 6 - board/bf561-ezkit/config.mk | 6 - board/blackstamp/config.mk | 32 - board/blackvme/config.mk | 32 - board/cm-bf527/config.mk | 8 - board/cm-bf533/config.mk | 6 - board/cm-bf537e/config.mk | 6 - board/cm-bf537u/config.mk | 6 - board/cm-bf548/config.mk | 6 - board/cm-bf561/config.mk | 6 - board/dnp5370/Makefile | 54 + board/dnp5370/dnp5370.c | 104 ++ board/ibf-dsp561/config.mk | 6 - board/ip04/config.mk | 6 - board/tcm-bf518/config.mk | 8 - board/tcm-bf537/config.mk | 6 - boards.cfg | 3 + common/Makefile | 1 + common/cmd_bootldr.c | 21 +- common/cmd_ldrinfo.c | 192 +++ doc/README.dnp5370 | 67 + drivers/mmc/bfin_sdh.c | 2 +- drivers/spi/bfin_spi.c | 2 + include/configs/bct-brettl2.h | 3 +- include/configs/bf506f-ezkit.h | 106 ++ include/configs/bf518f-ezbrd.h | 1 + include/configs/bf525-ucr2.h | 102 ++ include/configs/bf526-ezbrd.h | 1 + include/configs/bf527-ad7160-eval.h | 1 + include/configs/bf527-ezkit.h | 1 + include/configs/bf527-sdp.h | 1 + include/configs/bf533-ezkit.h | 1 + include/configs/bf533-stamp.h | 1 + include/configs/bf537-minotaur.h | 2 + include/configs/bf537-pnav.h | 1 + include/configs/bf537-srv1.h | 2 + include/configs/bf537-stamp.h | 1 + include/configs/bf538f-ezkit.h | 1 + include/configs/bf548-ezkit.h | 1 + include/configs/bf561-acvilon.h | 3 +- include/configs/bf561-ezkit.h | 5 +- include/configs/bfin_adi_common.h | 2 +- include/configs/blackstamp.h | 1 + include/configs/blackvme.h | 3 +- include/configs/cm-bf527.h | 1 + include/configs/cm-bf533.h | 1 + include/configs/cm-bf537e.h | 1 + include/configs/cm-bf537u.h | 1 + include/configs/cm-bf548.h | 1 + include/configs/cm-bf561.h | 1 + include/configs/dnp5370.h | 128 ++ include/configs/ibf-dsp561.h | 5 +- include/configs/ip04.h | 1 + include/configs/tcm-bf518.h | 1 + include/configs/tcm-bf537.h | 1 + 113 files changed, 8257 insertions(+), 4981 deletions(-) create mode 100644 arch/blackfin/include/asm/mach-bf506/BF504_cdef.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF504_def.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF506_cdef.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF506_def.h create mode 100644 arch/blackfin/include/asm/mach-bf506/anomaly.h create mode 100644 arch/blackfin/include/asm/mach-bf506/def_local.h create mode 100644 arch/blackfin/include/asm/mach-bf506/gpio.h create mode 100644 arch/blackfin/include/asm/mach-bf506/portmux.h create mode 100644 arch/blackfin/include/asm/mach-bf506/ports.h delete mode 100644 arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h delete mode 100644 arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h delete mode 100644 arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h delete mode 100644 arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 board/bf525-ucr2/Makefile create mode 100644 board/bf525-ucr2/bf525-ucr2.c delete mode 100644 board/bf537-pnav/config.mk delete mode 100644 board/blackstamp/config.mk delete mode 100644 board/blackvme/config.mk create mode 100644 board/dnp5370/Makefile create mode 100644 board/dnp5370/dnp5370.c create mode 100644 common/cmd_ldrinfo.c create mode 100644 doc/README.dnp5370 create mode 100644 include/configs/bf506f-ezkit.h create mode 100644 include/configs/bf525-ucr2.h create mode 100644 include/configs/dnp5370.h
Signature · 1 line
1.7.3.4
PATCH 1/28 MAINTAINERS: sort Blackfin entries
--- MAINTAINERS | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-)
MAINTAINERS +22 -27
@@ -1033,6 +1033,7 @@ Blackfin Team <[email protected]> BF518F-EZBRD BF518 BF526-EZBRD BF526 + BF527-AD7160-EVAL BF527 BF527-EZKIT BF527 BF527-EZKIT-V2 BF527 BF527-SDP BF527
@@ -1044,52 +1045,46 @@ Blackfin Team <[email protected]> BF548-EZKIT BF548 BF561-EZKIT BF561 - BF527-AD7160-EVAL BF527 +Brent Kandetzki <[email protected]> -Bluetechnix Tinyboards <[email protected]> -Blackfin Team <[email protected]> + IP04 BF532 - CM-BF527 BF527 - CM-BF533 BF533 - CM-BF537E BF537 - CM-BF537U BF537 - CM-BF548 BF548 - CM-BF561 BF561 - TCM-BF518 BF518 - TCM-BF537 BF537 +Peter Meerwald <[email protected]> -Martin Strubel <[email protected]> -Blackfin Team <[email protected]> + bct-brettl2 BF536 - BF537-minotaur BF537 - BF537-srv1 BF537 +I-SYST Micromodule <[email protected]> + + IBF-DSP561 BF561 Wojtek Skulski <[email protected]> Wojtek Skulski <[email protected]> -Blackfin Team <[email protected]> Benjamin Matthews <[email protected]> BlackStamp BF533 BlackVME BF561 -I-SYST Micromodule <[email protected]> -Blackfin Team <[email protected]> +Martin Strubel <[email protected]> - IBF-DSP561 BF561 + BF537-minotaur BF537 + BF537-srv1 BF537 + +Bluetechnix Tinyboards <[email protected]> + + CM-BF527 BF527 + CM-BF533 BF533 + CM-BF537E BF537 + CM-BF537U BF537 + CM-BF548 BF548 + CM-BF561 BF561 + TCM-BF518 BF518 + TCM-BF537 BF537 Valentin Yakovenkov <[email protected]> Anton Shurpin <[email protected]> BF561-ACVILON BF561 -Brent Kandetzki <[email protected]> - - IP04 BF532 - -Peter Meerwald <[email protected]> - - bct-brettl2 BF536 - ######################################################################### # End of MAINTAINERS list # #########################################################################
Signature · 1 line
1.7.3.4
PATCH 1/28 MAINTAINERS: sort Blackfin entries
Dear Mike Frysinger,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>--- MAINTAINERS | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-)
Already applied.
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 most difficult thing in the world is to know how to do a thing
and to watch someone else doing it wrong, without commenting.
-- T.H. WhitePATCH 2/28 Blackfin: bf518f-ezbrd: don't require SPI logic all the time
In reply to Mike FrysingerOnly the first run of boards had a ksz switch on it, so if building for a newer silicon rev or SPI is disabled, don't bother checking for the ksz.
--- board/bf518f-ezbrd/bf518f-ezbrd.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-)
board/bf518f-ezbrd/bf518f-ezbrd.c +21 -9
@@ -57,6 +57,13 @@ static void board_init_enetaddr(uchar *mac_addr)eth_setenv_enetaddr ("ethaddr" , mac_addr); } +/* Only the first run of boards had a KSZ switch */ +#if defined(CONFIG_BFIN_SPI ) && __SILICON_REVISION__ ==0 +# define KSZ_POSSIBLE 1 +#else +# define KSZ_POSSIBLE 0 +#endif +#define KSZ_MAX_HZ 5000000#define KSZ_WRITE 0x02
@@ -109,17 +116,16 @@ static int ksz8893m_reset(struct spi_slave *slave)return ret; } -int board_eth_init (bd_t *bis) +static bool board_ksz_init (void ) { -static bool switch_is_alive = false, phy_is_ksz = true; -int ret; +static bool switch_is_alive = false;if (!switch_is_alive) {struct spi_slave *slave =spi_setup_slave (0 ,1 ,KSZ_MAX_HZ ,SPI_MODE_3 );if (slave) {if (!spi_claim_bus (slave)) { - phy_is_ksz = (ksz8893m_reg_read (slave,KSZ_REG_CHID ) ==0x88 ); - ret = phy_is_ksz ?ksz8893m_reset (slave) :0 ; +bool phy_is_ksz = (ksz8893m_reg_read (slave,KSZ_REG_CHID ) ==0x88 ); +int ret = phy_is_ksz ?ksz8893m_reset (slave) :0 ; switch_is_alive = (ret ==0 );spi_release_bus (slave); }
@@ -127,10 +133,16 @@ int board_eth_init(bd_t *bis) } } -if (switch_is_alive) -return bfin_EMAC_initialize (bis); -else -return -1 ; +return switch_is_alive; +} + +int board_eth_init (bd_t *bis) +{ +if (KSZ_POSSIBLE ) { +if (!board_ksz_init ()) +return 0 ; + } +return bfin_EMAC_initialize (bis); }#endif
Signature · 1 line
1.7.3.4
PATCH 3/28 Blackfin: skip RAM display for 0 mem systems
In reply to Mike Frysinger--- arch/blackfin/lib/board.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
arch/blackfin/lib/board.c +5 -2
@@ -283,8 +283,11 @@ void board_init_f(ulong bootflag)printf ("Core: %s MHz, " ,strmhz (buf,get_cclk ()));printf ("System: %s MHz\n" ,strmhz (buf,get_sclk ())); -printf ("RAM: " ); -print_size (bd->bi_memsize,"\n" ); +if (CONFIG_MEM_SIZE ) { +printf ("RAM: " ); +print_size (bd->bi_memsize,"\n" ); + } +#if defined(CONFIG_POST )post_init_f ();post_bootmode_init ();
Signature · 1 line
1.7.3.4
PATCH 4/28 Blackfin: drop CONFIG_SYS_TEXT_BASE from boards
In reply to Mike FrysingerWe don't want/use this value for Blackfin boards, so punt it and have the common code error out when people try to use it.
--- arch/blackfin/config.mk | 4 ++++ board/bct-brettl2/config.mk | 3 --- board/bf518f-ezbrd/config.mk | 3 --- board/bf526-ezbrd/config.mk | 3 --- board/bf527-ad7160-eval/config.mk | 3 --- board/bf527-ezkit/config.mk | 3 --- board/bf527-sdp/config.mk | 3 --- board/bf533-ezkit/config.mk | 3 --- board/bf533-stamp/config.mk | 3 --- board/bf537-minotaur/config.mk | 3 --- board/bf537-pnav/config.mk | 3 --- board/bf537-srv1/config.mk | 3 --- board/bf537-stamp/config.mk | 3 --- board/bf538f-ezkit/config.mk | 3 --- board/bf548-ezkit/config.mk | 3 --- board/bf561-acvilon/config.mk | 3 --- board/bf561-ezkit/config.mk | 3 --- board/blackstamp/config.mk | 3 --- board/blackvme/config.mk | 3 --- board/cm-bf527/config.mk | 3 --- board/cm-bf533/config.mk | 3 --- board/cm-bf537e/config.mk | 3 --- board/cm-bf537u/config.mk | 3 --- board/cm-bf548/config.mk | 3 --- board/cm-bf561/config.mk | 3 --- board/ibf-dsp561/config.mk | 3 --- board/ip04/config.mk | 3 --- board/tcm-bf518/config.mk | 3 --- board/tcm-bf537/config.mk | 3 --- 29 files changed, 4 insertions(+), 84 deletions(-)
arch/blackfin/config.mk +4 -0
@@ -69,3 +69,7 @@ LDR_FLAGS += $(LDR_FLAGS-y) ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),) LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S endif + +ifneq ($(CONFIG_SYS_TEXT_BASE),) +$(error do not set CONFIG_SYS_TEXT_BASE for Blackfin boards) +endif
board/bct-brettl2/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf536-0.3 CFLAGS_lib += -O2
board/bf518f-ezbrd/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf518-0.0 CFLAGS_lib += -O2
board/bf526-ezbrd/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf526-0.0 CFLAGS_lib += -O2
board/bf527-ad7160-eval/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf527-0.2 CFLAGS_lib += -O2
board/bf527-ezkit/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf527-0.0 CFLAGS_lib += -O2
board/bf527-sdp/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf527-0.2 CFLAGS_lib_generic += -O2
board/bf533-ezkit/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf533-0.3 CFLAGS_lib += -O2
board/bf533-stamp/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf533-0.3 CFLAGS_lib += -O2
board/bf537-minotaur/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 # Set some default LDR flags based on boot mode.
board/bf537-pnav/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 # Set some default LDR flags based on boot mode.
board/bf537-srv1/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 # Set some default LDR flags based on boot mode.
board/bf537-stamp/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 CFLAGS_lib += -O2
board/bf538f-ezkit/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf538-0.4 CFLAGS_lib += -O2
board/bf548-ezkit/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf548-0.0 CFLAGS_lib += -O2
board/bf561-acvilon/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf561-0.5 CFLAGS_lib += -O2
board/bf561-ezkit/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf561-0.3 CFLAGS_lib += -O2
board/blackstamp/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf532-0.5 # Set some default LDR flags based on boot mode.
board/blackvme/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf561-0.5 # Set some default LDR flags based on boot mode.
board/cm-bf527/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf527-0.0 CFLAGS_lib += -O2
board/cm-bf533/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf533-0.3 CFLAGS_lib += -O2
board/cm-bf537e/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 CFLAGS_lib += -O2
board/cm-bf537u/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 CFLAGS_lib += -O2
board/cm-bf548/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf548-0.0 CFLAGS_lib += -O2
board/cm-bf561/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf561-0.3 CFLAGS_lib += -O2
board/ibf-dsp561/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf561-0.5 # Set some default LDR flags based on boot mode.
board/ip04/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf532-0.5 CFLAGS_lib += -O2
board/tcm-bf518/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf518-0.0 CFLAGS_lib += -O2
board/tcm-bf537/config.mk +0 -3
@@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# This is not actually used for Blackfin boards so do not change it -#CONFIG_SYS_TEXT_BASE = do-not-use-me - CONFIG_BFIN_CPU = bf537-0.2 CFLAGS_lib += -O2
Signature · 1 line
1.7.3.4
PATCH 5/28 Blackfin: unify bootmode based LDR_FLAGS setup
In reply to Mike FrysingerUnify this convention for all Blackfin boards.
--- arch/blackfin/config.mk | 3 +++ board/bct-brettl2/config.mk | 3 --- board/bf518f-ezbrd/config.mk | 3 --- board/bf526-ezbrd/config.mk | 3 --- board/bf527-ad7160-eval/config.mk | 3 --- board/bf527-ezkit/config.mk | 3 --- board/bf527-sdp/config.mk | 1 - board/bf533-ezkit/config.mk | 1 - board/bf533-stamp/config.mk | 1 - board/bf537-minotaur/config.mk | 3 +-- board/bf537-pnav/config.mk | 3 --- board/bf537-srv1/config.mk | 3 +-- board/bf537-stamp/config.mk | 1 - board/bf538f-ezkit/config.mk | 1 - board/bf548-ezkit/config.mk | 1 - board/bf561-acvilon/config.mk | 1 - board/bf561-ezkit/config.mk | 1 - board/blackstamp/config.mk | 3 --- board/blackvme/config.mk | 3 --- board/cm-bf527/config.mk | 3 --- board/cm-bf533/config.mk | 1 - board/cm-bf537e/config.mk | 1 - board/cm-bf537u/config.mk | 1 - board/cm-bf548/config.mk | 1 - board/cm-bf561/config.mk | 1 - board/ibf-dsp561/config.mk | 1 - board/ip04/config.mk | 1 - board/tcm-bf518/config.mk | 3 --- board/tcm-bf537/config.mk | 1 - 29 files changed, 5 insertions(+), 50 deletions(-)
arch/blackfin/config.mk +3 -0
@@ -66,6 +66,9 @@ endif LDR_FLAGS += $(LDR_FLAGS-y) +# Set some default LDR flags based on boot mode. +LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) + ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),) LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S endif
board/bct-brettl2/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf536-0.3 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf518f-ezbrd/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf518-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf526-ezbrd/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf526-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf527-ad7160-eval/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf527-0.2 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf527-ezkit/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf527-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf527-sdp/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf533-ezkit/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf533-stamp/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf537-minotaur/config.mk +1 -2
@@ -26,5 +26,4 @@ CONFIG_BFIN_CPU = bf537-0.2 # 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)) +LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
board/bf537-pnav/config.mk +0 -3
@@ -24,6 +24,3 @@ # CONFIG_BFIN_CPU = bf537-0.2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf537-srv1/config.mk +1 -2
@@ -26,5 +26,4 @@ CONFIG_BFIN_CPU = bf537-0.2 # 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)) +LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
board/bf537-stamp/config.mk +0 -1
@@ -31,4 +31,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf538f-ezkit/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf548-ezkit/config.mk +0 -1
@@ -34,4 +34,3 @@ 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/bf561-acvilon/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/bf561-ezkit/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/blackstamp/config.mk +0 -3
@@ -24,6 +24,3 @@ # CONFIG_BFIN_CPU = bf532-0.5 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/blackvme/config.mk +0 -3
@@ -24,6 +24,3 @@ # CONFIG_BFIN_CPU = bf561-0.5 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf527/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf527-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf533/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf537e/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf537u/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/cm-bf548/config.mk +0 -1
@@ -33,4 +33,3 @@ 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-bf561/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/ibf-dsp561/config.mk +0 -1
@@ -27,4 +27,3 @@ CONFIG_BFIN_CPU = bf561-0.5 # 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/ip04/config.mk +0 -1
@@ -31,4 +31,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/tcm-bf518/config.mk +0 -3
@@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf518-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
board/tcm-bf537/config.mk +0 -1
@@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
Signature · 1 line
1.7.3.4
PATCH 6/28 Blackfin: move CONFIG_BFIN_CPU back to board config.h
In reply to Mike FrysingerThis is a revert of 821ad16fa9900c as Wolfgang doesn't like the new code.
--- arch/blackfin/config.mk | 8 +++++++- arch/blackfin/include/asm/config.h | 5 +++++ arch/blackfin/lib/board.c | 2 +- board/bct-brettl2/config.mk | 2 -- board/bf518f-ezbrd/config.mk | 2 -- board/bf526-ezbrd/config.mk | 2 -- board/bf527-ad7160-eval/config.mk | 2 -- board/bf527-ezkit/config.mk | 2 -- board/bf527-sdp/config.mk | 2 -- board/bf533-ezkit/config.mk | 2 -- board/bf533-stamp/config.mk | 2 -- board/bf537-minotaur/config.mk | 2 -- board/bf537-pnav/config.mk | 1 - board/bf537-srv1/config.mk | 2 -- board/bf537-stamp/config.mk | 2 -- board/bf538f-ezkit/config.mk | 2 -- board/bf548-ezkit/config.mk | 2 -- board/bf561-acvilon/config.mk | 2 -- board/bf561-ezkit/config.mk | 2 -- board/blackstamp/config.mk | 1 - board/blackvme/config.mk | 2 -- board/cm-bf527/config.mk | 2 -- board/cm-bf533/config.mk | 2 -- board/cm-bf537e/config.mk | 2 -- board/cm-bf537u/config.mk | 2 -- board/cm-bf548/config.mk | 2 -- board/cm-bf561/config.mk | 2 -- board/ibf-dsp561/config.mk | 2 -- board/ip04/config.mk | 2 -- board/tcm-bf518/config.mk | 2 -- board/tcm-bf537/config.mk | 2 -- include/configs/bct-brettl2.h | 3 ++- include/configs/bf518f-ezbrd.h | 1 + include/configs/bf526-ezbrd.h | 1 + include/configs/bf527-ad7160-eval.h | 1 + include/configs/bf527-ezkit.h | 1 + include/configs/bf527-sdp.h | 1 + include/configs/bf533-ezkit.h | 1 + include/configs/bf533-stamp.h | 1 + include/configs/bf537-minotaur.h | 1 + include/configs/bf537-pnav.h | 1 + include/configs/bf537-srv1.h | 1 + include/configs/bf537-stamp.h | 1 + include/configs/bf538f-ezkit.h | 1 + include/configs/bf548-ezkit.h | 1 + include/configs/bf561-acvilon.h | 3 ++- include/configs/bf561-ezkit.h | 1 + include/configs/blackstamp.h | 1 + include/configs/blackvme.h | 3 ++- include/configs/cm-bf527.h | 1 + include/configs/cm-bf533.h | 1 + include/configs/cm-bf537e.h | 1 + include/configs/cm-bf537u.h | 1 + include/configs/cm-bf548.h | 1 + include/configs/cm-bf561.h | 1 + include/configs/ibf-dsp561.h | 1 + include/configs/ip04.h | 1 + include/configs/tcm-bf518.h | 1 + include/configs/tcm-bf537.h | 1 + 59 files changed, 44 insertions(+), 59 deletions(-)
arch/blackfin/config.mk +7 -1
@@ -25,6 +25,13 @@ CROSS_COMPILE ?= bfin-uclinux- STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin +ifeq ($(CONFIG_BFIN_CPU),) +CONFIG_BFIN_CPU := \ + $(shell awk '$$2 == "CONFIG_BFIN_CPU" { print $$3 }' \ + $(src)include/configs/$(BOARD).h) +else +CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU))) +endif CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic
@@ -33,7 +40,6 @@ PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN LDFLAGS += --gc-sections -m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"' PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU) ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
arch/blackfin/include/asm/config.h +5 -0
@@ -12,6 +12,11 @@/* Some of our defines use this (like CONFIG_SYS_GBL_DATA_ADDR) */ #include <asm-offsets.h> +/* Sanity check CONFIG_BFIN_CPU */ +#ifndef CONFIG_BFIN_CPU +# error CONFIG_BFIN_CPU: your board config needs to define this +#endif +#ifndef CONFIG_BFIN_SCRATCH_REG # define CONFIG_BFIN_SCRATCH_REG retn#endif
arch/blackfin/lib/board.c +1 -1
@@ -254,7 +254,7 @@ void board_init_f(ulong bootflag)memset ((void *)bd,0 ,sizeof (bd_t)); bd->bi_r_version = version_string; - bd->bi_cpu =BFIN_CPU ; + bd->bi_cpu =MK_STR (CONFIG_BFIN_CPU ); bd->bi_board_name =BFIN_BOARD_NAME ; bd->bi_vco =get_vco (); bd->bi_cclk =get_cclk ();
board/bct-brettl2/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf536-0.3 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf518f-ezbrd/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf518-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf526-ezbrd/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf526-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf527-ad7160-eval/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf527-0.2 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf527-ezkit/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf527-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf527-sdp/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf527-0.2 - CFLAGS_lib_generic += -O2 CFLAGS_lzma += -O2
board/bf533-ezkit/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf533-0.3 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf533-stamp/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf533-0.3 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf537-minotaur/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2 - # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
board/bf537-pnav/config.mk +0 -1
@@ -23,4 +23,3 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2
board/bf537-srv1/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2 - # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
board/bf537-stamp/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf538f-ezkit/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf538-0.4 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf548-ezkit/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf548-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf561-acvilon/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf561-0.5 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/bf561-ezkit/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf561-0.3 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/blackstamp/config.mk +0 -1
@@ -23,4 +23,3 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf532-0.5
board/blackvme/config.mk +0 -2
@@ -22,5 +22,3 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # - -CONFIG_BFIN_CPU = bf561-0.5
board/cm-bf527/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf527-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/cm-bf533/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf533-0.3 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/cm-bf537e/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/cm-bf537u/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/cm-bf548/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf548-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/cm-bf561/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf561-0.3 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/ibf-dsp561/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf561-0.5 - # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
board/ip04/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf532-0.5 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/tcm-bf518/config.mk +0 -2
@@ -23,7 +23,5 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf518-0.0 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
board/tcm-bf537/config.mk +0 -2
@@ -23,8 +23,6 @@ # MA 02111-1307 USA # -CONFIG_BFIN_CPU = bf537-0.2 - CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2
include/configs/bct-brettl2.h +2 -1
@@ -11,7 +11,8 @@/* * Processor Settings */ -#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS +#define CONFIG_BFIN_CPU bf536-0.3 +#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS/*
include/configs/bf518f-ezbrd.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf518-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/bf526-ezbrd.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf526-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/bf527-ad7160-eval.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf527-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
include/configs/bf527-ezkit.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf527-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/bf527-sdp.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf527-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/bf533-ezkit.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf533-0.3#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/bf533-stamp.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf533-0.3#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/bf537-minotaur.h +1 -0
@@ -24,6 +24,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
include/configs/bf537-pnav.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
include/configs/bf537-srv1.h +1 -0
@@ -24,6 +24,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
include/configs/bf537-stamp.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/bf538f-ezkit.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf538-0.4#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/bf548-ezkit.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf548-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/bf561-acvilon.h +2 -1
@@ -12,7 +12,8 @@/* * Processor Settings */ -#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS +#define CONFIG_BFIN_CPU bf561-0.5 +#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS/*
include/configs/bf561-ezkit.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf561-0.3#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/blackstamp.h +1 -0
@@ -24,6 +24,7 @@/* CPU Options * Be sure to set the Silicon Revision Correctly */ +#define CONFIG_BFIN_CPU bf532-0.5#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER/*
include/configs/blackvme.h +2 -1
@@ -23,7 +23,8 @@#define CONFIG_PANIC_HANG 0/* CPU Options */ -#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER +#define CONFIG_BFIN_CPU bf561-0.5 +#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER/* * CLOCK SETTINGS CAVEAT
include/configs/cm-bf527.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf527-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/cm-bf533.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf533-0.3#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/cm-bf537e.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/cm-bf537u.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/cm-bf548.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf548-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/cm-bf561.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf561-0.3#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/ibf-dsp561.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf561-0.5#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
include/configs/ip04.h +1 -0
@@ -20,6 +20,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf532-0.5#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_NAND
include/configs/tcm-bf518.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf518-0.0#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
include/configs/tcm-bf537.h +1 -0
@@ -11,6 +11,7 @@/* * Processor Settings */ +#define CONFIG_BFIN_CPU bf537-0.2#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
Signature · 1 line
1.7.3.4
PATCH 7/28 Blackfin: bf527-sdp: update custom CFLAGS paths
In reply to Mike FrysingerLooks like the filesystem shuffling missed the SDP board.
--- board/bf527-sdp/config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
board/bf527-sdp/config.mk +2 -2
@@ -23,8 +23,8 @@ # MA 02111-1307 USA # -CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6
Signature · 1 line
1.7.3.4
PATCH 8/28 Blackfin: bf537-pnav/blackstamp/blackvme: drop empty config.mk files
In reply to Mike Frysinger--- board/bf537-pnav/config.mk | 25 ------------------------- board/blackstamp/config.mk | 25 ------------------------- board/blackvme/config.mk | 24 ------------------------ 3 files changed, 0 insertions(+), 74 deletions(-) delete mode 100644 board/bf537-pnav/config.mk delete mode 100644 board/blackstamp/config.mk delete mode 100644 board/blackvme/config.mk
board/bf537-pnav/config.mk deleted +0 -25
@@ -1,25 +0,0 @@ -# -# 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 -# -
board/blackstamp/config.mk deleted +0 -25
@@ -1,25 +0,0 @@ -# -# 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 -# -
board/blackvme/config.mk deleted +0 -24
@@ -1,24 +0,0 @@ -# -# 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 -#
Signature · 1 line
1.7.3.4
PATCH 9/28 Blackfin: dnp5370: new board port
In reply to Mike FrysingerFrom: Andreas Schallenberg <[email protected]>
Info about the hardware can be found here:
http://www.dilnetpc.com/dnp0086.htm
--- MAINTAINERS | 4 ++ board/dnp5370/Makefile | 54 +++++++++++++++++++ board/dnp5370/dnp5370.c | 104 ++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + doc/README.dnp5370 | 67 +++++++++++++++++++++++ include/configs/dnp5370.h | 128 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 358 insertions(+), 0 deletions(-) create mode 100644 board/dnp5370/Makefile create mode 100644 board/dnp5370/dnp5370.c create mode 100644 doc/README.dnp5370 create mode 100644 include/configs/dnp5370.h
MAINTAINERS +4 -0
@@ -1045,6 +1045,10 @@ Blackfin Team <[email protected]> BF548-EZKIT BF548 BF561-EZKIT BF561 +M.Hasewinkel (MHA) <[email protected]> + + dnp5370 BF537 + Brent Kandetzki <[email protected]> IP04 BF532
board/dnp5370/Makefile new file +54 -0
54 lines not on this page · raw message
board/dnp5370/dnp5370.c new file +104 -0
104 lines not on this page · raw message
boards.cfg +1 -0
@@ -190,6 +190,7 @@ cm-bf537e blackfin blackfin cm-bf537u blackfin blackfin cm-bf548 blackfin blackfin cm-bf561 blackfin blackfin +dnp5370 blackfin blackfin ibf-dsp561 blackfin blackfin ip04 blackfin blackfin tcm-bf518 blackfin blackfin
doc/README.dnp5370 new file +67 -0
67 lines not on this page · raw message
include/configs/dnp5370.h new file +128 -0
128 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 10/28 Blackfin: bf525-ucr2: new board port
In reply to Mike FrysingerFrom: Chong Huang <[email protected]>
--- MAINTAINERS | 5 ++ board/bf525-ucr2/Makefile | 54 +++++++++++++++++++++ board/bf525-ucr2/bf525-ucr2.c | 16 ++++++ boards.cfg | 1 + include/configs/bf525-ucr2.h | 102 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 178 insertions(+), 0 deletions(-) create mode 100644 board/bf525-ucr2/Makefile create mode 100644 board/bf525-ucr2/bf525-ucr2.c create mode 100644 include/configs/bf525-ucr2.h
MAINTAINERS +5 -0
@@ -1089,6 +1089,11 @@ Anton Shurpin <[email protected]> BF561-ACVILON BF561 +Haitao Zhang <[email protected]> +Chong Huang <[email protected]> + + bf525-ucr2 BF525 + ######################################################################### # End of MAINTAINERS list # #########################################################################
board/bf525-ucr2/Makefile new file +54 -0
54 lines not on this page · raw message
board/bf525-ucr2/bf525-ucr2.c new file +16 -0
@@ -0,0 +1,16 @@ +/* U-boot - bf525-ucr2.c board specific routines +* +* (C) Copyright 2000-2004 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +* +* Licensed under the GPL-2 or later. +*/ + +#include <common.h> + +int checkboard (void ) +{ +printf ("Board: bf525-ucr2\n" ); +printf ("Support: http://www.ucrobotics.com/\n" ); +return 0 ; +}
boards.cfg +1 -0
@@ -167,6 +167,7 @@ mimc200 avr32 at32ap - mimc hammerhead avr32 at32ap - miromico at32ap700x bct-brettl2 blackfin blackfin bf518f-ezbrd blackfin blackfin +bf525-ucr2 blackfin blackfin bf526-ezbrd blackfin blackfin bf527-ad7160-eval blackfin blackfin bf527-ezkit blackfin blackfin
include/configs/bf525-ucr2.h new file +102 -0
102 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 11/28 Blackfin: serial: clean up muxing a bit
In reply to Mike Frysinger--- arch/blackfin/cpu/serial.h | 51 +++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 31 deletions(-)
arch/blackfin/cpu/serial.h +20 -31
@@ -74,23 +74,19 @@ struct bfin_mmr_serial { };#undef __BFP -#ifndef UART_LSR -# if (CONFIG_UART_CONSOLE ==3 ) -# define UART_BASE UART3_DLL -# elif (CONFIG_UART_CONSOLE ==2 ) -# define UART_BASE UART2_DLL -# elif (CONFIG_UART_CONSOLE ==1 ) -# define UART_BASE UART1_DLL -# elif (CONFIG_UART_CONSOLE ==0 ) -# define UART_BASE UART0_DLL -# endif +#define __PASTE_UART (num, pfx, sfx) pfx##num##_##sfx +#define _PASTE_UART (num, pfx, sfx) __PASTE_UART(num, pfx, sfx) +#define MMR_UART (mmr) _PASTE_UART(CONFIG_UART_CONSOLE, UART, DLL) +#define P_UART (pin) _PASTE_UART(CONFIG_UART_CONSOLE, P_UART, pin) + +#ifndef UART_DLL +# define UART_DLL MMR_UART(DLL)#else # if CONFIG_UART_CONSOLE !=0 # error CONFIG_UART_CONSOLE must be 0 on parts with only one UART# endif -# define UART_BASE UART_DLL#endif -#define pUART ((volatile struct bfin_mmr_serial *)UART_BASE) +#define pUART ((volatile struct bfin_mmr_serial *)UART_DLL)#ifdef __ADSPBF54x__# define ACCESS_LATCH ()
@@ -106,18 +102,7 @@ __attribute__((always_inline))static inline void serial_do_portmux (void ) {if (!BFIN_DEBUG_EARLY_SERIAL ) { -const unsigned short pins[] = { -#if CONFIG_UART_CONSOLE == 0 -P_UART0_TX ,P_UART0_RX , -#elif CONFIG_UART_CONSOLE == 1 -P_UART1_TX ,P_UART1_RX , -#elif CONFIG_UART_CONSOLE == 2 -P_UART2_TX ,P_UART2_RX , -#elif CONFIG_UART_CONSOLE == 3 -P_UART3_TX ,P_UART3_RX , -#endif -0 , - }; +const unsigned short pins[] = {P_UART (RX ),P_UART (TX ),0 , };peripheral_request_list (pins,"bfin-uart" );return ; }
@@ -141,13 +126,11 @@ static inline void serial_do_portmux(void) }SSYNC ();#elif defined(__ADSPBF537__) || defined(__ADSPBF536__) || defined(__ADSPBF534__) -# define DO_MUX (func, tx, rx) \ - bfin_write_PORT_MUX(bfin_read_PORT_MUX() & ~(func)); \ - bfin_write_PORTF_FER(bfin_read_PORTF_FER() | PF##tx | PF##rx); -switch (CONFIG_UART_CONSOLE ) { -case 0 :DO_MUX (PFDE ,0 ,1 );break ; -case 1 :DO_MUX (PFTE ,2 ,3 );break ; - } +const uint16_t func[] = {PFDE ,PFTE , }; +bfin_write_PORT_MUX (bfin_read_PORT_MUX () & ~func[CONFIG_UART_CONSOLE ]); +bfin_write_PORTF_FER (bfin_read_PORTF_FER () | + (1 <<P_IDENT (P_UART (RX ))) | + (1 <<P_IDENT (P_UART (TX ))));SSYNC ();#elif defined(__ADSPBF54x__)# define DO_MUX (port, tx, rx) \
@@ -160,6 +143,12 @@ static inline void serial_do_portmux(void) case 3: DO_MUX(B, 6, 7); break; /* Port B; PB6 and PB7 */ }SSYNC (); +#elif defined(__ADSPBF561__) +/* UART pins could be GPIO, but they aren't pin muxed. */ +#else +# if (P_UART (RX ) &P_DEFINED ) || (P_UART (TX ) &P_DEFINED ) +# error "missing portmux logic for UART" +# endif #endif }
Signature · 1 line
1.7.3.4
PATCH 12/28 Blackfin: bf537-minotaur/bf537-srv1: undefine nfs when net is disabled
In reply to Mike FrysingerFixes a build error due to new partial linking logic.
--- include/configs/bf537-minotaur.h | 1 + include/configs/bf537-srv1.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
include/configs/bf537-minotaur.h +1 -0
@@ -156,6 +156,7 @@# define CONFIG_CMD_PING #else # undef CONFIG_CMD_NET +# undef CONFIG_CMD_NFS#endif #define CONFIG_CMD_BOOTLDR
include/configs/bf537-srv1.h +1 -0
@@ -156,6 +156,7 @@# define CONFIG_CMD_PING #else # undef CONFIG_CMD_NET +# undef CONFIG_CMD_NFS#endif #define CONFIG_CMD_BOOTLDR
Signature · 1 line
1.7.3.4
PATCH 13/28 Blackfin: bf537: fix L1 data defines
In reply to Mike FrysingerThe __BFIN_DEF_ADSP_BF537_proc__ define isn't setup anymore, so use the one coming from the compiler.
--- arch/blackfin/include/asm/mach-bf537/BF534_def.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/include/asm/mach-bf537/BF534_def.h +1 -1
@@ -10,7 +10,7 @@#include "ADSP-EDN-BF534-extended_def.h" -#if defined(__BFIN_DEF_ADSP_BF537_proc__) || !defined(__BFIN_DEF_ADSP_BF536_proc__) +#if !defined(__ADSPBF536__)#define L1_DATA_A_SRAM 0xFF800000/* 0xFF800000 -> 0xFF803FFF Data Bank A SRAM */ #define L1_DATA_A_SRAM_SIZE (0xFF803FFF - 0xFF800000 + 1)#define L1_DATA_A_SRAM_END (L1_DATA_A_SRAM + L1_DATA_A_SRAM_SIZE)
Signature · 1 line
1.7.3.4
PATCH 14/28 Blackfin: bf561-ezkit/ibf-dsp561: invert env offset/addr logic
In reply to Mike FrysingerHave CONFIG_ENV_ADDR be based on CONFIG_ENV_OFFSET rather than the other way around so that we can use CONFIG_ENV_OFFSET during build. It also avoids a little address duplication.
--- include/configs/bf561-ezkit.h | 4 ++-- include/configs/ibf-dsp561.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/bf561-ezkit.h +2 -2
@@ -80,8 +80,8 @@#define CONFIG_SYS_MAX_FLASH_SECT 135/* The BF561-EZKIT uses a top boot flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_ADDR 0x20004000 -#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE) +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)#define CONFIG_ENV_SIZE 0x2000#define CONFIG_ENV_SECT_SIZE 0x10000#if (CONFIG_BFIN_BOOT_MODE ==BFIN_BOOT_BYPASS )
include/configs/ibf-dsp561.h +2 -2
@@ -80,8 +80,8 @@#define CONFIG_SYS_MAX_FLASH_SECT 135/* max number of sectors on one chip */ /* The BF561-EZKIT uses a top boot flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_ADDR 0x20004000 -#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE) +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)#define CONFIG_ENV_SIZE 0x2000#define CONFIG_ENV_SECT_SIZE 0x10000/* Total Size of Environment Sector */ #if (CONFIG_BFIN_BOOT_MODE ==BFIN_BOOT_BYPASS )
Signature · 1 line
1.7.3.4
PATCH 15/28 Blackfin: fix bd_t handling
In reply to Mike FrysingerThe recent global data changes (making the size autogenerated) broke the board info handling on Blackfin ports as we were lying and lumping the bd_t size in with the gd_t size. So use the new dedicated bd_t size to setup its own address in memory.
--- arch/blackfin/include/asm/config.h | 5 ++++- arch/blackfin/lib/board.c | 10 ++-------- 2 files changed, 6 insertions(+), 9 deletions(-)
arch/blackfin/include/asm/config.h +4 -1
@@ -109,8 +109,11 @@#ifndef CONFIG_SYS_GBL_DATA_ADDR # define CONFIG_SYS_GBL_DATA_ADDR (CONFIG_SYS_MALLOC_BASE - GENERATED_GBL_DATA_SIZE)#endif +#ifndef CONFIG_SYS_BD_INFO_ADDR +# define CONFIG_SYS_BD_INFO_ADDR (CONFIG_SYS_GBL_DATA_ADDR - GENERATED_BD_INFO_SIZE) +#endif #ifndef CONFIG_STACKBASE -# define CONFIG_STACKBASE (CONFIG_SYS_GBL_DATA_ADDR - 4) +# define CONFIG_STACKBASE (CONFIG_SYS_BD_INFO_ADDR - 4)#endif #ifndef CONFIG_SYS_MEMTEST_START # define CONFIG_SYS_MEMTEST_START 0
arch/blackfin/lib/board.c +2 -8
@@ -207,7 +207,6 @@ extern int timer_init(void);void board_init_f (ulong bootflag) { -ulong addr;bd_t *bd;char buf[32 ];
@@ -244,14 +243,9 @@ void board_init_f(ulong bootflag) gd = (gd_t *) (CONFIG_SYS_GBL_DATA_ADDR );memset ((void *)gd,0 ,GENERATED_GBL_DATA_SIZE ); -/* Board data initialization */ - addr = (CONFIG_SYS_GBL_DATA_ADDR +sizeof (gd_t)); - -/* Align to 4 byte boundary */ - addr &= ~(4 -1 ); - bd = (bd_t *) addr; + bd = (bd_t *) (CONFIG_SYS_BD_INFO_ADDR ); gd->bd = bd; -memset ((void *)bd,0 ,sizeof (bd_t)); +memset ((void *)bd,0 ,GENERATED_BD_INFO_SIZE ); bd->bi_r_version = version_string; bd->bi_cpu =MK_STR (CONFIG_BFIN_CPU );
Signature · 1 line
1.7.3.4
PATCH 15/28 Blackfin: fix bd_t handling
Hello.
Quoted 6 lines · Mike Frysinger
The recent global data changes (making the size autogenerated) broke the board info handling on Blackfin ports as we were lying and lumping the
bd_tsize in with thegd_tsize. So use the new dedicatedbd_tsize to setup its own address in memory.Signed-off-by Mike Frysinger<[email protected]>
[...]
Quoted 4 lines
arch/blackfin/lib/board.c +0
-0
[...]
arch/blackfin/lib/board.c void board_init_f(ulong bootflag) · line 246
Quoted 11 lines
arch/blackfin/lib/board.c +1
-6@@ -244,14 +243,9 @@ void board_init_f(ulong bootflag) gd = (gd_t *) (CONFIG_SYS_GBL_DATA_ADDR );memset ((void *)gd,0 ,GENERATED_GBL_DATA_SIZE ); -/* Board data initialization */ - addr = (CONFIG_SYS_GBL_DATA_ADDR +sizeof (gd_t)); - -/* Align to 4 byte boundary */ - addr&= ~(4 -1 ); - bd = (bd_t *) addr; + bd = (bd_t *) (CONFIG_SYS_BD_INFO_ADDR );
Parens not needed around CONFIG_SYS_BD_INFO_ADDR.
WBR, Sergei
PATCH 15/28 Blackfin: fix bd_t handling
Quoted 4 lines · On Monday, December 27, 2010 06:41:47 Sergei Shtylyov wrote:
arch/blackfin/lib/board.c void board_init_f(ulong bootflag) · line 246
Quoted 1 line · Mike Frysinger
arch/blackfin/lib/board.c +1
-0+ bd = (bd_t *) (CONFIG_SYS_BD_INFO_ADDR );Parens not needed around
CONFIG_SYS_BD_INFO_ADDR.
it isnt a problem to have the parens, and it keeps things sane if someone does something like:
#define CONFIG_SYS_BD_INFO_ADDR SOME_DEFINE + 0x1000
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101227/0a4a153a/attachment.pgp
PATCH 15/28 Blackfin: fix bd_t handling
Dear Mike Frysinger,
Quoted 4 lines · In message <[email protected]> you wrote:
it isnt a problem to have the parens, and it keeps things sane if someone does something like:
#defineCONFIG_SYS_BD_INFO_ADDRSOME_DEFINE+0x1000
This would be a violation of basic rules of defensive coding.
Please drop these parens.
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
I'm a programmer: I don't buy software, I write it.
-- Tom ChristiansenPATCH 15/28 Blackfin: fix bd_t handling
Quoted 8 lines · On Monday, January 10, 2011 17:28:23 Wolfgang Denk wrote:
Quoted 3 lines · Mike Frysinger
it isnt a problem to have the parens, and it keeps things sane if someone does something like:
#defineCONFIG_SYS_BD_INFO_ADDRSOME_DEFINE+0x1000This would be a violation of basic rules of defensive coding.
Please drop these parens.
i dont see how these two statements are compatible. defensive coding would mean i keep the parens.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110110/0a5bef41/attachment.pgp
PATCH 15/28 Blackfin: fix bd_t handling
Quoted 10 lines · Mike Frysinger
Quoted 7 lines
Quoted 3 lines
it isnt a problem to have the parens, and it keeps things sane if someone does something like:
#defineCONFIG_SYS_BD_INFO_ADDRSOME_DEFINE+0x1000This would be a violation of basic rules of defensive coding.
Please drop these parens.
i dont see how these two statements are compatible. defensive coding would mean i keep the parens.
I think Wolfgang meant that defining a macro without parens would be a
violation -- which should be fixed, not worked around.
Quoted 1 line
-mike
WBR, Sergei
PATCH 17/28 Blackfin: drop duplicate system mmr and L1 scratch defines
In reply to Mike FrysingerCommon code already takes care of setting up these defines when a port hasn't specified them, so punt the duplicate values.
--- arch/blackfin/include/asm/mach-bf518/BF512_def.h | 6 ------ arch/blackfin/include/asm/mach-bf533/BF531_def.h | 6 ------ arch/blackfin/include/asm/mach-bf533/BF532_def.h | 6 ------ arch/blackfin/include/asm/mach-bf533/BF533_def.h | 6 ------ arch/blackfin/include/asm/mach-bf537/BF534_def.h | 6 ------ arch/blackfin/include/asm/mach-bf538/BF538_def.h | 6 ------ arch/blackfin/include/asm/mach-bf561/BF561_def.h | 7 +------ 7 files changed, 1 insertions(+), 42 deletions(-)
arch/blackfin/include/asm/mach-bf518/BF512_def.h +0 -6
@@ -513,11 +513,5 @@#define L1_INST_SRAM 0xFFA00000/* 0xFFA00000 -> 0xFFA07FFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA07FFF - 0xFFA00000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif /* __BFIN_DEF_ADSP_BF512_proc__ */
arch/blackfin/include/asm/mach-bf533/BF531_def.h +0 -6
@@ -438,12 +438,6 @@#define L1_INST_SRAM 0xFFA08000/* 0xFFA08000 -> 0xFFA0BFFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA0BFFF - 0xFFA08000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif #endif /* __BFIN_DEF_ADSP_BF531_proc__ */
arch/blackfin/include/asm/mach-bf533/BF532_def.h +0 -6
@@ -12,12 +12,6 @@#define L1_INST_SRAM 0xFFA08000/* 0xFFA08000 -> 0xFFA0BFFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA0BFFF - 0xFFA08000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif #endif /* __BFIN_DEF_ADSP_BF532_proc__ */
arch/blackfin/include/asm/mach-bf533/BF533_def.h +0 -6
@@ -17,11 +17,5 @@#define L1_INST_SRAM 0xFFA00000/* 0xFFA00000 -> 0xFFA07FFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA07FFF - 0xFFA00000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif /* __BFIN_DEF_ADSP_BF533_proc__ */
arch/blackfin/include/asm/mach-bf537/BF534_def.h +0 -6
@@ -21,11 +21,5 @@#define L1_INST_SRAM 0xFFA00000/* 0xFFA00000 -> 0xFFA07FFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA07FFF - 0xFFA00000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif /* __BFIN_DEF_ADSP_BF534_proc__ */
arch/blackfin/include/asm/mach-bf538/BF538_def.h +0 -6
@@ -1021,11 +1021,5 @@#define L1_INST_SRAM 0xFFA00000/* 0xFFA00000 -> 0xFFA07FFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA07FFF - 0xFFA00000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif /* __BFIN_DEF_ADSP_BF538_proc__ */
arch/blackfin/include/asm/mach-bf561/BF561_def.h +1 -6
@@ -708,14 +708,9 @@#define EBIU_SDBCTL 0xFFC00A14#define EBIU_SDRRC 0xFFC00A18#define EBIU_SDSTAT 0xFFC00A1C +#define L1_INST_SRAM 0xFFA00000/* 0xFFA00000 -> 0xFFA03FFF Instruction Bank A SRAM */ #define L1_INST_SRAM_SIZE (0xFFA03FFF - 0xFFA00000 + 1)#define L1_INST_SRAM_END (L1_INST_SRAM + L1_INST_SRAM_SIZE) -#define L1_SRAM_SCRATCH 0xFFB00000/* 0xFFB00000 -> 0xFFB00FFF Scratchpad SRAM */ -#define L1_SRAM_SCRATCH_SIZE (0xFFB00FFF - 0xFFB00000 + 1) -#define L1_SRAM_SCRATCH_END (L1_SRAM_SCRATCH + L1_SRAM_SCRATCH_SIZE) -#define SYSMMR_BASE 0xFFC00000/* 0xFFC00000 -> 0xFFFFFFFF MMR registers */ -#define SYSMMR_BASE_SIZE (0xFFFFFFFF - 0xFFC00000 + 1) -#define SYSMMR_BASE_END (SYSMMR_BASE + SYSMMR_BASE_SIZE)#endif /* __BFIN_DEF_ADSP_BF561_proc__ */
Signature · 1 line
1.7.3.4
PATCH 20/28 Blackfin: only check for os log when we have external memory
In reply to Mike FrysingerIf the part has no external memory configured, then there will be no os log for us to check, and any attempt to access that memory will trigger hardware errors.
--- arch/blackfin/lib/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/lib/board.c +1 -1
@@ -390,7 +390,7 @@ void board_init_r(gd_t * id, ulong dest_addr)post_run (NULL ,POST_RAM |post_bootmode_get (0 ));#endif -if (bfin_os_log_check ()) { +if (CONFIG_MEM_SIZE &&bfin_os_log_check ()) {puts ("\nLog buffer from operating system:\n" );bfin_os_log_dump ();puts ("\n" );
Signature · 1 line
1.7.3.4
PATCH 21/28 Blackfin: turn off caches when self initializing
In reply to Mike FrysingerWhen bootstrapping ourselves on the fly at runtime (via "go"), we need to turn off the caches to avoid taking software exceptions. Since caches need CPLBs and CPLBs need exception handlers, but we're about to rewrite the code in memory where those exception handlers live, we need to turn off caches first.
This new code also encourages a slight code optimization by storing the MMR bases in dedicated registers so we don't have to fully load up the pointer regs multiple times.
--- arch/blackfin/cpu/start.S | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-)
arch/blackfin/cpu/start.S +33 -12
@@ -52,6 +52,19 @@ ENTRY(_start) sp.l = LO(L1_SRAM_SCRATCH_END - 20); sp.h = HI(L1_SRAM_SCRATCH_END - 20); + /* Optimization register tricks: keep a base value in the + * reserved P registers so we use the load/store with an + * offset syntax. R0 = [P5 + <constant>]; + * P4 - system MMR base + * P5 - core MMR base + */ +#ifdef CONFIG_HW_WATCHDOG + p4.l = 0; + p4.h = HI(SYSMMR_BASE); +#endif + p5.l = 0; + p5.h = HI(COREMMR_BASE); + #ifdef CONFIG_HW_WATCHDOG # ifndef CONFIG_HW_WATCHDOG_TIMEOUT_START # define CONFIG_HW_WATCHDOG_TIMEOUT_START 5000
@@ -60,13 +73,11 @@ ENTRY(_start) * That should be long enough to bootstrap ourselves up and * then the common u-boot code can take over. */ - P0.L = LO(WDOG_CNT); - P0.H = HI(WDOG_CNT); - R0.L = 0; - R0.H = HI(MSEC_TO_SCLK(CONFIG_HW_WATCHDOG_TIMEOUT_START)); - [P0] = R0; + r0 = 0; + r0.h = HI(MSEC_TO_SCLK(CONFIG_HW_WATCHDOG_TIMEOUT_START)); + [p4 + (WDOG_CNT - SYSMMR_BASE)] = r0; /* fire up the watchdog - R0.L above needs to be 0x0000 */ - W[P0 + (WDOG_CTL - WDOG_CNT)] = R0; + W[p4 + (WDOG_CTL - SYSMMR_BASE)] = r0; #endif /* Turn on the serial for debugging the init process */
@@ -121,6 +132,18 @@ ENTRY(_start) if cc jump .Lnorelocate; r6 = 0 (x); + /* Turn off caches as they require CPLBs and a CPLB miss requires + * a software exception handler to process it. But we're about to + * clobber any previous executing software (like U-Boot that just + * launched a new U-Boot via 'go'), so any handler state will be + * unreliable after the memcpy below. + */ + serial_early_puts("Kill Caches"); + r0 = 0; + [p5 + (IMEM_CONTROL - COREMMR_BASE)] = r0; + [p5 + (DMEM_CONTROL - COREMMR_BASE)] = r0; + ssync; + /* In bypass mode, we don't have an LDR with an init block * so we need to explicitly call it ourselves. This will * reprogram our clocks, memory, and setup our async banks.
@@ -204,17 +227,15 @@ ENTRY(_start) serial_early_puts("Lower to 15"); r0 = r7; r1 = r6; - p0.l = LO(EVT15); - p0.h = HI(EVT15); p1.l = .Lenable_nested; p1.h = .Lenable_nested; - [p0] = p1; + [p5 + (EVT15 - COREMMR_BASE)] = p1; r7 = EVT_IVG15 (z); sti r7; raise 15; - p4.l = .LWAIT_HERE; - p4.h = .LWAIT_HERE; - reti = p4; + p3.l = .LWAIT_HERE; + p3.h = .LWAIT_HERE; + reti = p3; rti; /* Enable nested interrupts before continuing with cpu init */
Signature · 1 line
1.7.3.4
PATCH 22/28 Blackfin: default to L1 bank A when L1 bank B does not exist
In reply to Mike FrysingerSome parts lack Bank B in L1 data, so have the linker script fall back to Bank A when that happens. This way we can still leverage L1 data.
--- arch/blackfin/lib/u-boot.lds.S | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
arch/blackfin/lib/u-boot.lds.S +7 -3
@@ -40,9 +40,13 @@ * This is here in the first place so we can quickly test building * for different CPU's which may lack non-cache L1 data. */ +#ifndef L1_DATA_A_SRAM +# define L1_DATA_A_SRAM 0 +# define L1_DATA_A_SRAM_SIZE 0 +#endif #ifndef L1_DATA_B_SRAM -# define L1_DATA_B_SRAM CONFIG_SYS_MONITOR_BASE -# define L1_DATA_B_SRAM_SIZE 0 +# define L1_DATA_B_SRAM L1_DATA_A_SRAM +# define L1_DATA_B_SRAM_SIZE L1_DATA_A_SRAM_SIZE #endif /* The 0xC offset is so we don't clobber the tiny LDR jump block. */
@@ -138,7 +142,7 @@ SECTIONS } >l1_data AT>ram_data __data_l1_lma = LOADADDR(.data_l1); __data_l1_len = SIZEOF(.data_l1); - ASSERT (__data_l1_len <= L1_DATA_B_SRAM_SIZE, "L1 data B overflow!") + ASSERT (__data_l1_len <= L1_DATA_B_SRAM_SIZE, "L1 data overflow!") .bss : {
Signature · 1 line
1.7.3.4
PATCH 23/28 Blackfin: bf506f-ezkit: new board port
In reply to Mike Frysinger--- board/bf506f-ezkit/Makefile | 54 +++++++++++++++++++ board/bf506f-ezkit/bf506f-ezkit.c | 27 +++++++++ boards.cfg | 1 + include/configs/bf506f-ezkit.h | 106 +++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 0 deletions(-) create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 include/configs/bf506f-ezkit.h
board/bf506f-ezkit/Makefile new file +54 -0
@@ -0,0 +1,54 @@ +# +# U-boot - Makefile +# +# Copyright (c) 2005-2008 Analog Device Inc. +# +# (C) Copyright 2000-2006 +# 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 +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y := $(BOARD).o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################
board/bf506f-ezkit/bf506f-ezkit.c new file +27 -0
@@ -0,0 +1,27 @@ +/* +* U-boot - main board file +* +* Copyright (c) 2008-2010 Analog Devices Inc. +* +* Licensed under the GPL-2 or later. +*/ + +#include <common.h> +#include <asm/blackfin.h> + +int checkboard (void ) +{ +printf ("Board: ADI BF506F EZ-Kit board\n" ); +printf (" Support: http://blackfin.uclinux.org/\n" ); +return 0 ; +} + +int board_early_init_f (void ) +{ +bfin_write_EBIU_MODE (1 ); +SSYNC (); +bfin_write_FLASH_CONTROL_CLEAR (1 ); +udelay (1 ); +bfin_write_FLASH_CONTROL_SET (1 ); +return 0 ; +}
boards.cfg +1 -0
@@ -166,6 +166,7 @@ favr-32-ezkit avr32 at32ap - earthlc mimc200 avr32 at32ap - mimc at32ap700x hammerhead avr32 at32ap - miromico at32ap700x bct-brettl2 blackfin blackfin +bf506f-ezkit blackfin blackfin bf518f-ezbrd blackfin blackfin bf525-ucr2 blackfin blackfin bf526-ezbrd blackfin blackfin
include/configs/bf506f-ezkit.h new file +106 -0
106 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 23/28 Blackfin: bf506f-ezkit: new board port
Dear Mike Frysinger,
Quoted 10 lines · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>--- board/bf506f-ezkit/Makefile | 54 +++++++++++++++++++ board/bf506f-ezkit/bf506f-ezkit.c | 27 +++++++++ boards.cfg | 1 + include/configs/bf506f-ezkit.h | 106 +++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 0 deletions(-) create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 include/configs/bf506f-ezkit.h
Entry to MAINTAINERS missing.
...
include/configs/bf506f-ezkit.h line 52
Quoted 5 lines
include/configs/bf506f-ezkit.h new file +5
-0+#define CONFIG_EBIU_SDGCTL_VAL (SCTLE | CL_3 | PASR_ALL | TRAS_6 | TRP_3 | TRCD_3 | TWR_2 | PSS) + +#define CONFIG_EBIU_AMGCTL_VAL (AMCKEN | AMBEN_ALL) +#define CONFIG_EBIU_AMBCTL0_VAL (B1WAT_15 | B1RAT_15 | B1HT_3 | B1RDYPOL | B0WAT_15 | B0RAT_15 | B0HT_3 | B0RDYPOL) +#define CONFIG_EBIU_AMBCTL1_VAL (B3WAT_15 | B3RAT_15 | B3HT_3 | B3RDYPOL | B2WAT_15 | B2RAT_15 | B2HT_3 | B2RDYPOL)
Lines too long.
include/configs/bf506f-ezkit.h line 56
Quoted 4 lines
include/configs/bf506f-ezkit.h new file +3
-0+#define CONFIG_SYS_MONITOR_BASE (L1_DATA_A_SRAM_END) +#define CONFIG_SYS_MONITOR_LEN (4 * 1024) +#define CONFIG_SYS_MALLOC_LEN (4 * 1024)
Sure that 4 KiB is sufficient for these two?
....
include/configs/bf506f-ezkit.h line 106
Quoted 4 lines
include/configs/bf506f-ezkit.h new file +4
-0+#undef CONFIG_BOOTM_LINUX + + +#endif
Only one blank line, please.
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 The only way to learn a new programming language is by writing pro- grams in it. - Brian Kernighan
PATCH 23/28 Blackfin: bf506f-ezkit: new board port
Quoted 11 lines · On Monday, January 10, 2011 17:33:42 Wolfgang Denk wrote:
Quoted 9 lines · Mike Frysinger you
board/bf506f-ezkit/Makefile | 54 +++++++++++++++++++ board/bf506f-ezkit/bf506f-ezkit.c | 27 +++++++++ boards.cfg | 1 + include/configs/bf506f-ezkit.h | 106 +++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 0 deletions(-) create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 include/configs/bf506f-ezkit.h
Quoted 1 line
Entry to
MAINTAINERSmissing.
must of lost when rebasing
Quoted 6 lines
include/configs/bf506f-ezkit.h line 56
Quoted 4 lines
include/configs/bf506f-ezkit.h new file +3
-0+#define CONFIG_SYS_MONITOR_BASE (L1_DATA_A_SRAM_END) +#define CONFIG_SYS_MONITOR_LEN (4 * 1024) +#define CONFIG_SYS_MALLOC_LEN (4 * 1024)Sure that 4 KiB is sufficient for these two?
yes ... the port is pretty thin
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110110/0166463c/attachment.pgp
PATCH v2 23/28 Blackfin: bf506f-ezkit: new board port
In reply to Mike Frysinger--- MAINTAINERS | 1 + board/bf506f-ezkit/Makefile | 54 +++++++++++++++++++ board/bf506f-ezkit/bf506f-ezkit.c | 27 ++++++++++ boards.cfg | 1 + include/configs/bf506f-ezkit.h | 102 +++++++++++++++++++++++++++++++++++++ 5 files changed, 185 insertions(+), 0 deletions(-) create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 include/configs/bf506f-ezkit.h
MAINTAINERS +1 -0
@@ -1031,6 +1031,7 @@ Yoshihiro Shimoda <[email protected]> Mike Frysinger <[email protected]> Blackfin Team <[email protected]> + BF506F-EZKIT BF506 BF518F-EZBRD BF518 BF526-EZBRD BF526 BF527-AD7160-EVAL BF527
board/bf506f-ezkit/Makefile new file +54 -0
54 lines not on this page · raw message
board/bf506f-ezkit/bf506f-ezkit.c new file +27 -0
@@ -0,0 +1,27 @@ +/* +* U-boot - main board file +* +* Copyright (c) 2008-2010 Analog Devices Inc. +* +* Licensed under the GPL-2 or later. +*/ + +#include <common.h> +#include <asm/blackfin.h> + +int checkboard (void ) +{ +printf ("Board: ADI BF506F EZ-Kit board\n" ); +printf (" Support: http://blackfin.uclinux.org/\n" ); +return 0 ; +} + +int board_early_init_f (void ) +{ +bfin_write_EBIU_MODE (1 ); +SSYNC (); +bfin_write_FLASH_CONTROL_CLEAR (1 ); +udelay (1 ); +bfin_write_FLASH_CONTROL_SET (1 ); +return 0 ; +}
boards.cfg +1 -0
@@ -166,6 +166,7 @@ favr-32-ezkit avr32 at32ap - earthlc mimc200 avr32 at32ap - mimc at32ap700x hammerhead avr32 at32ap - miromico at32ap700x bct-brettl2 blackfin blackfin +bf506f-ezkit blackfin blackfin bf518f-ezbrd blackfin blackfin bf525-ucr2 blackfin blackfin bf526-ezbrd blackfin blackfin
include/configs/bf506f-ezkit.h new file +102 -0
102 lines not on this page · raw message
Signature · 1 line
1.7.4.rc1
PATCH v2 23/28 Blackfin: bf506f-ezkit: new board port
Dear Mike Frysinger,
Quoted 11 lines · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>--- MAINTAINERS | 1 + board/bf506f-ezkit/Makefile | 54 +++++++++++++++++++ board/bf506f-ezkit/bf506f-ezkit.c | 27 ++++++++++ boards.cfg | 1 + include/configs/bf506f-ezkit.h | 102 +++++++++++++++++++++++++++++++++++++ 5 files changed, 185 insertions(+), 0 deletions(-) create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 include/configs/bf506f-ezkit.h
NAK. Please stick to the rulse and describe what you changed in this v2 patch.
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 "I've finally learned what `upward compatible' means. It means we get to keep all our old mistakes." - Dennie van Tassel
PATCH v2 23/28 Blackfin: bf506f-ezkit: new board port
Quoted 15 lines · On Wednesday, January 12, 2011 18:10:24 Wolfgang Denk wrote:
Quoted 13 lines · Mike Frysinger
Signed-off-by Mike Frysinger <[email protected]>---
MAINTAINERS | 1 + board/bf506f-ezkit/Makefile | 54 +++++++++++++++++++ board/bf506f-ezkit/bf506f-ezkit.c | 27 ++++++++++ boards.cfg | 1 + include/configs/bf506f-ezkit.h | 102 +++++++++++++++++++++++++++++++++++++ 5 files changed, 185 insertions(+), 0 deletions(-) create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 include/configs/bf506f-ezkit.h
Quoted 2 lines
NAK. Please stick to the rulse and describe what you changed in this v2 patch.
you already wrote the changelog:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/91455/focus=92190
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110112/18677bd8/attachment.pgp
PATCH 24/28 Blackfin: adi boards: drop old ELF define
In reply to Mike FrysingerThis define isn't used anywhere anymore, so punt it.
--- include/configs/bfin_adi_common.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
include/configs/bfin_adi_common.h +0 -1
@@ -85,7 +85,6 @@# define CONFIG_CMD_CACHE # define CONFIG_CMD_CPLBINFO # define CONFIG_CMD_ELF -# define CONFIG_ELF_SIMPLE_LOAD # define CONFIG_CMD_GPIO # define CONFIG_CMD_KGDB # define CONFIG_CMD_REGINFO
Signature · 1 line
1.7.3.4
PATCH 25/28 Blackfin: bootrom.h: sync with toolchain
In reply to Mike FrysingerWe need the updated LDR bit defines for our LDR utils.
--- .../include/asm/mach-common/bits/bootrom.h | 86 +++++++++++++------ 1 files changed, 59 insertions(+), 27 deletions(-)
arch/blackfin/include/asm/mach-common/bits/bootrom.h +59 -27
@@ -229,33 +229,65 @@ static uint32_t (* const bfrom_NandBoot)(int32_t dNandAddress, int32_t dFlags, i#endif /* __ASSEMBLY__ */ +/* Bit defines for BF53x block flags */ +#define BFLAG_53X_ZEROFILL 0x0001 +#define BFLAG_53X_RESVECT 0x0002 +#define BFLAG_53X_INIT 0x0008 +#define BFLAG_53X_IGNORE 0x0010 +#define BFLAG_53X_PFLAG_MASK 0x01E0 +#define BFLAG_53X_PFLAG_SHIFT 5 +#define BFLAG_53X_PPORT_MASK 0x0600 +#define BFLAG_53X_PPORT_SHIFT 9 +#define BFLAG_53X_COMPRESSED 0x2000 +#define BFLAG_53X_FINAL 0x8000 + +/* Bit defines for BF56x global header */ +#define GFLAG_56X_16BIT_FLASH 0x00000001 +#define GFLAG_56X_WAIT_MASK 0x0000001E +#define GFLAG_56X_WAIT_SHIFT 1 +#define GFLAG_56X_HOLD_MASK 0x000000C0 +#define GFLAG_56X_HOLD_SHIFT 6 +#define GFLAG_56X_SPI_MASK 0x00000700 +#define GFLAG_56X_SPI_SHIFT 8 +#define GFLAG_56X_SPI_500K 0x0 +#define GFLAG_56X_SPI_1M 0x1 +#define GFLAG_56X_SPI_2M 0x2 +#define GFLAG_56X_SIGN_MASK 0xFF000000 +#define GFLAG_56X_SIGN_SHIFT 28 +#define GFLAG_56X_SIGN_MAGIC 0xA +/* Bit defines for ADI_BOOT_DATA->dFlags */ -#define BFLAG_DMACODE_MASK 0x0000000F -#define BFLAG_SAFE 0x00000010 -#define BFLAG_AUX 0x00000020 -#define BFLAG_FILL 0x00000100 -#define BFLAG_QUICKBOOT 0x00000200 -#define BFLAG_CALLBACK 0x00000400 -#define BFLAG_INIT 0x00000800 -#define BFLAG_IGNORE 0x00001000 -#define BFLAG_INDIRECT 0x00002000 -#define BFLAG_FIRST 0x00004000 -#define BFLAG_FINAL 0x00008000 -#define BFLAG_HOOK 0x00400000 -#define BFLAG_HDRINDIRECT 0x00800000 -#define BFLAG_TYPE_MASK 0x00300000 -#define BFLAG_TYPE_1 0x00000000 -#define BFLAG_TYPE_2 0x00100000 -#define BFLAG_TYPE_3 0x00200000 -#define BFLAG_TYPE_4 0x00300000 -#define BFLAG_FASTREAD 0x00400000 -#define BFLAG_NOAUTO 0x01000000 -#define BFLAG_PERIPHERAL 0x02000000 -#define BFLAG_SLAVE 0x04000000 -#define BFLAG_WAKEUP 0x08000000 -#define BFLAG_NEXTDXE 0x10000000 -#define BFLAG_RETURN 0x20000000 -#define BFLAG_RESET 0x40000000 -#define BFLAG_NONRESTORE 0x80000000 +#define BFLAG_DMACODE_MASK 0x0000000F +#define BFLAG_SAFE 0x00000010 +#define BFLAG_AUX 0x00000020 +#define BFLAG_FILL 0x00000100 +#define BFLAG_QUICKBOOT 0x00000200 +#define BFLAG_CALLBACK 0x00000400 +#define BFLAG_INIT 0x00000800 +#define BFLAG_IGNORE 0x00001000 +#define BFLAG_INDIRECT 0x00002000 +#define BFLAG_FIRST 0x00004000 +#define BFLAG_FINAL 0x00008000 +#define BFLAG_HDRSIGN_MASK 0xFF000000 +#define BFLAG_HDRSIGN_SHIFT 24 +#define BFLAG_HDRSIGN_MAGIC 0xAD +#define BFLAG_HDRCHK_MASK 0x00FF0000 +#define BFLAG_HDRCHK_SHIFT 16 +#define BFLAG_HOOK 0x00400000 +#define BFLAG_HDRINDIRECT 0x00800000 +#define BFLAG_TYPE_MASK 0x00300000 +#define BFLAG_TYPE_1 0x00000000 +#define BFLAG_TYPE_2 0x00100000 +#define BFLAG_TYPE_3 0x00200000 +#define BFLAG_TYPE_4 0x00300000 +#define BFLAG_FASTREAD 0x00400000 +#define BFLAG_NOAUTO 0x01000000 +#define BFLAG_PERIPHERAL 0x02000000 +#define BFLAG_SLAVE 0x04000000 +#define BFLAG_WAKEUP 0x08000000 +#define BFLAG_NEXTDXE 0x10000000 +#define BFLAG_RETURN 0x20000000 +#define BFLAG_RESET 0x40000000 +#define BFLAG_NONRESTORE 0x80000000#endif
Signature · 1 line
1.7.3.4
PATCH 26/28 Blackfin: bootldr: use common defines
In reply to Mike FrysingerNow that the common bootrom.h sets up defines for us, switch to them rather than our own local set.
--- common/cmd_bootldr.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-)
common/cmd_bootldr.c +8 -13
@@ -24,7 +24,7 @@ static bool ldr_valid_signature(uint8_t *data)#if defined(__ADSPBF561__)/* BF56x has a 4 byte global header */ -if (data[3 ] ==0xA0 ) +if (data[3 ] == (GFLAG_56X_SIGN_MAGIC << (GFLAG_56X_SIGN_SHIFT -24 )))return true; #elif defined(__ADSPBF531__) || defined(__ADSPBF532__) || defined(__ADSPBF533__) || \
@@ -53,11 +53,6 @@ static bool ldr_valid_signature(uint8_t *data)* LDRs from random memory addresses. So whenever possible, use that. In * the older cases (BF53x/BF561), parse the LDR format ourselves. */ -#define ZEROFILL 0x0001 -#define RESVECT 0x0002 -#define INIT 0x0008 -#define IGNORE 0x0010 -#define FINAL 0x8000static void ldr_load (uint8_t *base_addr) { #if defined(__ADSPBF531__) || defined(__ADSPBF532__) || defined(__ADSPBF533__) || \
@@ -76,7 +71,7 @@ static void ldr_load(uint8_t *base_addr)# endif memmove (&flags, base_addr +8 ,sizeof (flags)); -bfin_write_EVT1 (flags &RESVECT ?0xFFA00000 :0xFFA08000 ); +bfin_write_EVT1 (flags &BFLAG_53X_RESVECT ?0xFFA00000 :0xFFA08000 ); do { /* block header may not be aligned */
@@ -85,24 +80,24 @@ static void ldr_load(uint8_t *base_addr)memmove (&flags, base_addr+8 ,sizeof (flags)); base_addr +=sizeof (addr) +sizeof (count) +sizeof (flags); -printf ("loading to 0x%08x (0x%x bytes) flags: 0x%04x\n" , +printf ("loading to 0x%08x (%#x bytes) flags: 0x%04x\n" , addr, count, flags); -if (!(flags &IGNORE )) { -if (flags &ZEROFILL ) +if (!(flags &BFLAG_53X_IGNORE )) { +if (flags &BFLAG_53X_ZEROFILL )memset ((void *)addr,0x00 , count);else memcpy ((void *)addr, base_addr, count); -if (flags &INIT ) { +if (flags &BFLAG_53X_INIT ) {void (*init)(void ) = (void *)addr;init (); } } -if (!(flags &ZEROFILL )) +if (!(flags &BFLAG_53X_ZEROFILL )) base_addr += count; - }while (!(flags &FINAL )); + }while (!(flags &BFLAG_53X_FINAL ));#endif }
Signature · 1 line
1.7.3.4
PATCH 27/28 Blackfin: ldrinfo: new command
In reply to Mike FrysingerSimple command to decode/check an LDR image before we try to boot it.
--- common/Makefile | 1 + common/cmd_ldrinfo.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 0 deletions(-) create mode 100644 common/cmd_ldrinfo.c
common/Makefile +1 -0
@@ -105,6 +105,7 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +COBJS-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
common/cmd_ldrinfo.c new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 27/28 Blackfin: ldrinfo: new command
Dear Mike Frysinger,
Quoted 14 lines · In message <[email protected]> you wrote:
Simple command to decode/check an LDR image before we try to boot it.
Signed-off-by Mike Frysinger <[email protected]>--- common/Makefile | 1 + common/cmd_ldrinfo.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 0 deletions(-) create mode 100644 common/cmd_ldrinfo.ccommon/Makefile +0
-0
common/Makefile COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o · line 111
Quoted 7 lines
common/Makefile +1
-0@@ -105,6 +105,7 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +COBJS-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
Please add documentation for the new CONFIG_CMD_LDRINFO option.
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 Life is a process, not a principle, a mystery to be lived, not a problem to be solved. - Gerard Straub, television producer and author (stolen from Frank Herbert??)
PATCH v2 27/28 Blackfin: ldrinfo: new command
Simple command to decode/check an LDR image before we try to boot it.
---
v2
- add README note
README | 1 + common/Makefile | 1 + common/cmd_ldrinfo.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 194 insertions(+), 0 deletions(-) create mode 100644 common/cmd_ldrinfo.c
README +1 -0
@@ -648,6 +648,7 @@ The following options need to be configured: CONFIG_CMD_ITEST Integer/string test of 2 values CONFIG_CMD_JFFS2 * JFFS2 Support CONFIG_CMD_KGDB * kgdb + CONFIG_CMD_LDRINFO ldrinfo (display Blackfin loader) CONFIG_CMD_LOADB loadb CONFIG_CMD_LOADS loads CONFIG_CMD_MD5SUM print md5 message digest
common/Makefile +1 -0
@@ -105,6 +105,7 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +COBJS-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
common/cmd_ldrinfo.c new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
1.7.4.rc1
PATCH 28/28 Blackfin: adi boards: enable ldrinfo
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
@@ -87,6 +87,7 @@# define CONFIG_CMD_ELF # define CONFIG_CMD_GPIO # define CONFIG_CMD_KGDB +# define CONFIG_CMD_LDRINFO # define CONFIG_CMD_REGINFO # define CONFIG_CMD_STRINGS # if defined(__ADSPBF51x__) || defined(__ADSPBF52x__) || defined(__ADSPBF54x__)
Signature · 1 line
1.7.3.4