From: Bob Liu <lliubbo@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V3 11/12] Blackfin: bf60x: add hw watchdog support
Date: Wed, 14 Nov 2012 18:24:45 +0800 [thread overview]
Message-ID: <1352888686-9868-12-git-send-email-lliubbo@gmail.com> (raw)
In-Reply-To: <1352888686-9868-1-git-send-email-lliubbo@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
---
arch/blackfin/cpu/initcode.c | 13 +++++++++++++
arch/blackfin/cpu/start.S | 2 ++
include/configs/bf609-ezkit.h | 1 +
3 files changed, 16 insertions(+)
diff --git a/arch/blackfin/cpu/initcode.c b/arch/blackfin/cpu/initcode.c
index 3bbdf22..6740e34 100644
--- a/arch/blackfin/cpu/initcode.c
+++ b/arch/blackfin/cpu/initcode.c
@@ -456,8 +456,21 @@ program_early_devices(ADI_BOOT_DATA *bs, uint *sdivB, uint *divB, uint *vcoB)
*/
if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_BYPASS) {
serial_putc('e');
+#ifdef __ADSPBF60x__
+ bfin_write_SEC_GCTL(0x2);
+ SSYNC();
+ bfin_write_SEC_FCTL(0xc1);
+ bfin_write_SEC_SCTL(2, bfin_read_SEC_SCTL(2) | 0x6);
+
+ bfin_write_SEC_CCTL(0x2);
+ SSYNC();
+ bfin_write_SEC_GCTL(0x1);
+ bfin_write_SEC_CCTL(0x1);
+#endif
bfin_write_WDOG_CNT(MSEC_TO_SCLK(CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE));
+#if CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART
bfin_write_WDOG_CTL(0);
+#endif
serial_putc('f');
}
#endif
diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S
index 90b4d1a..7155fc8 100644
--- a/arch/blackfin/cpu/start.S
+++ b/arch/blackfin/cpu/start.S
@@ -65,6 +65,7 @@ ENTRY(_start)
p5.h = HI(COREMMR_BASE);
#ifdef CONFIG_HW_WATCHDOG
+#ifndef __ADSPBF60x__
# ifndef CONFIG_HW_WATCHDOG_TIMEOUT_START
# define CONFIG_HW_WATCHDOG_TIMEOUT_START 5000
# endif
@@ -78,6 +79,7 @@ ENTRY(_start)
/* fire up the watchdog - R0.L above needs to be 0x0000 */
W[p4 + (WDOG_CTL - SYSMMR_BASE)] = r0;
#endif
+#endif
/* Turn on the serial for debugging the init process */
serial_early_init
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 939459a..d6f5190 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -73,6 +73,7 @@
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MALLOC_LEN (256 * 1024)
+#define CONFIG_HW_WATCHDOG
/*
* Network Settings
*/
--
1.7.9.5
next prev parent reply other threads:[~2012-11-14 10:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 10:24 [U-Boot] [PATCH V3 00/12] Blackfin: add new processor and board Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 01/12] Blackfin: Bf60x: new processor header files Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 02/12] Blackfin: bf60x: add serial support Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 03/12] Blackfin: bf60x: add dma support Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 04/12] Blackfin: bf60x: support big cplb page Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 05/12] Blackfin: bf60x: add rsi/sdh support Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 06/12] Blackfin: bf609-ezkit: implement soft switch Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 07/12] Blackfin: spi: add bf6xx spi driver Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 08/12] Blackfin: bf60x: add gpio support Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 09/12] Blackfin: bf60x: core support Bob Liu
2012-11-14 10:24 ` [U-Boot] [PATCH V3 10/12] blackfin: bf609: add board support Bob Liu
2012-11-14 10:24 ` Bob Liu [this message]
2012-11-14 10:24 ` [U-Boot] [PATCH V3 12/12] Blackfin: bf60x: add resume from hibernate Bob Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352888686-9868-12-git-send-email-lliubbo@gmail.com \
--to=lliubbo@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox