Merge branch 'master' of git://git.denx.de/u-boot-nds32

* 'master' of git://git.denx.de/u-boot-nds32:
  nds32/board.c: add PCI prompt at boot up
  nds32/ag101/watchdog.S: add linkage support
  nds32: add linkage support

diff --git a/arch/nds32/cpu/n1213/ag101/watchdog.S b/arch/nds32/cpu/n1213/ag101/watchdog.S
index fc39f3f30877d7b5ec644d02ee86820ccaf5f333..18f0b664c246bc27638b6d07130dfed21ec98036 100644 (file)
--- a/arch/nds32/cpu/n1213/ag101/watchdog.S
+++ b/arch/nds32/cpu/n1213/ag101/watchdog.S
@@ -22,12 +22,12 @@
  */
 
 #include <asm/arch-ag101/ag101.h>
+#include <linux/linkage.h>
 
 .text
 
 #ifndef CONFIG_SKIP_TRUNOFF_WATCHDOG
-.globl turnoff_watchdog
-turnoff_watchdog:
+ENTRY(turnoff_watchdog)
 
 #define WD_CR          0xC
 #define WD_ENABLE      0x1
@@ -45,4 +45,5 @@ turnoff_watchdog:
 
        ret
 
+ENDPROC(turnoff_watchdog)
 #endif

diff --git a/arch/nds32/include/asm/linkage.h b/arch/nds32/include/asm/linkage.h
new file mode 100644 (file)
index 0000000..6d4493a
--- /dev/null
+++ b/arch/nds32/include/asm/linkage.h
@@ -0,0 +1,28 @@
+/*
+ * U-boot - linkage.h
+ *
+ * Copyright (c) 2005-2007 Analog Devices Inc.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+#endif

diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c
index 66e45370ccb464cc12fac015e162cceb7d7d123c..074aabf1e41e85171a7327c8dfc5fa95f402060f 100644 (file)
--- a/arch/nds32/lib/board.c
+++ b/arch/nds32/lib/board.c
@@ -365,6 +365,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
        env_relocate();
 
 #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
+       puts("PCI:   ");
        nds32_pci_init();
 #endif