Skip to contentSkip to conversation

Microblaze bug-fixes

PATCH New Michal Simek 3 participants 5 messages Oct 16, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Microblaze bug-fixes

Hi Tom,

I have just found that there are two problems in microblaze compilation. Also I have found that my regular testing is broken that's why I haven't found these problems earlier.
Would it be possible to add these two patches to your tree. I know it is late but still v2013.10 hasn't been tagged.

Thanks,
Michal

Michal Simek (2):
common: fsl: Fix broken SPDX-License-Identifier change
microblaze: Fix watchdog initialization

 arch/microblaze/include/asm/processor.h | 1 -
 arch/microblaze/lib/board.c             | 6 +++---
 common/cmd_mfsl.c                       | 8 ++++----
 drivers/watchdog/xilinx_tb_wdt.c        | 6 ++----
 4 files changed, 9 insertions(+), 12 deletions(-)

--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131016/d8c4467f/attachment.pgp>

#1 lore raw

PATCH 1/2 common: fsl: Fix broken SPDX-License-Identifier change

This bug was introduced by:
"Add GPL-2.0+ SPDX-License-Identifier to source files" (sha1: 1a4596601fd395f3afb8f82f3f840c5e00bdd57a)

---
Compilation error:
cmd_mfsl.c:1:1: error: unknown type name 've'
cmd_mfsl.c:1:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'a' cmd_mfsl.c:1:13: error: unknown type name 'a'
cmd_mfsl.c:2:29: error: expected identifier or '(' before 'if'

---
 common/cmd_mfsl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
common/cmd_mfsl.c +4 -4
index d735c9e..e8e8e3c 100644
@@ -1,7 +1,7 @@
-ve received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * who contributed to this
- * project.
+/*
+ * (C) Copyright 2007 Michal Simek
+ *
+ * Michal  SIMEK <[email protected]>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */

--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131016/f24b703b/attachment.pgp>

#2 lore raw

PATCH 2/2 microblaze: Fix watchdog initialization

In reply to Michal Simek

The patch:
"blackfin: Move blackfin watchdog driver out of the blackfin arch folder." (sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63)
changed hw_watchdog_init() prototype which didn't match
with Microblaze one.
This patch fixes the driver and Microblaze initialization.

---
Compilation error:
/mnt/disk/u-boot/include/asm/processor.h:19:12: error: conflicting types for 'hw_watchdog_init' /mnt/disk/u-boot/include/watchdog.h:96:7: note: previous declaration of 'hw_watchdog_init' was here

---
 arch/microblaze/include/asm/processor.h | 1 -
 arch/microblaze/lib/board.c             | 6 +++---
 drivers/watchdog/xilinx_tb_wdt.c        | 6 ++----
 3 files changed, 5 insertions(+), 8 deletions(-)
arch/microblaze/include/asm/processor.h +0 -1
index a2a5811..5afc8f9 100644
@@ -16,7 +16,6 @@ extern char __text_start[];
 void board_init(void);
 
 /* Watchdog functions */
-extern int hw_watchdog_init(void);
 extern void hw_watchdog_disable(void);
 
 #endif /* __ASM_MICROBLAZE_PROCESSOR_H */
arch/microblaze/lib/board.c +3 -3
index f7182f2..896e73a 100644
@@ -46,9 +46,6 @@ init_fnc_t *init_sequence[] = {
 	serial_init,
 	console_init_f,
 	interrupts_init,
-#ifdef CONFIG_XILINX_TB_WATCHDOG
-	hw_watchdog_init,
-#endif
 	timer_init,
 	NULL,
 };
@@ -97,6 +94,9 @@ void board_init_f(ulong not_used)
 
 	serial_initialize();
 
+#ifdef CONFIG_XILINX_TB_WATCHDOG
+	hw_watchdog_init();
+#endif
 	for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
 		WATCHDOG_RESET();
 		if ((*init_fnc_ptr) () != 0)
drivers/watchdog/xilinx_tb_wdt.c +2 -4
index 4e46e4c..6336c94 100644
@@ -54,7 +54,7 @@ static void hw_watchdog_isr(void *arg)
 	hw_watchdog_reset();
 }
 
-int hw_watchdog_init(void)
+void hw_watchdog_init(void)
 {
 	int ret;
 
@@ -65,7 +65,5 @@ int hw_watchdog_init(void)
 	ret = install_interrupt_handler(CONFIG_WATCHDOG_IRQ,
 						hw_watchdog_isr, NULL);
 	if (ret)
-		return 1;
-
-	return 0;
+		puts("Watchdog IRQ registration failed.");
 }

--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131016/cbd446a6/attachment.pgp>

#3 lore raw

cover Microblaze bug-fixes

In reply to Michal Simek
Quoted 7 lines · Michal Simek

Hi Tom,

I have just found that there are two problems in microblaze compilation. Also I have found that my regular testing is broken that's why I haven't found these problems earlier.
Would it be possible to add these two patches to your tree. I know it is late but still v2013.10 hasn't been tagged.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131016/f77a4456/attachment.pgp>
maintainer
#4 lore raw

cover Microblaze bug-fixes

Quoted 11 lines · Tom Rini
Quoted 7 lines · Michal Simek

Hi Tom,

I have just found that there are two problems in microblaze compilation. Also I have found that my regular testing is broken that's why I haven't found these problems earlier.
Would it be possible to add these two patches to your tree. I know it is late but still v2013.10 hasn't been tagged.

Applied to u-boot/master, thanks!

Thanks a lot,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131016/a6c6fbaa/attachment.pgp>