diff options
author | Wolfgang Denk <wd@denx.de> | 2012-03-03 14:13:41 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-03-03 14:13:41 (GMT) |
commit | 8a1239e74cdf4d94738eb71928769d6e78bcc78c (patch) | |
tree | 09894015fe34a93ad6cd7c7f79ef592ab2cf6179 | |
parent | 2271e7c6e8eef883b834fb7d07911848a54fde13 (diff) | |
parent | 4ef806794a165252d69c519d868a746e4cfa9729 (diff) | |
download | u-boot-8a1239e74cdf4d94738eb71928769d6e78bcc78c.tar.xz |
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
-rw-r--r-- | arch/nds32/cpu/n1213/ag101/watchdog.S | 5 | ||||
-rw-r--r-- | arch/nds32/include/asm/linkage.h | 28 | ||||
-rw-r--r-- | arch/nds32/lib/board.c | 1 |
3 files changed, 32 insertions, 2 deletions
diff --git a/arch/nds32/cpu/n1213/ag101/watchdog.S b/arch/nds32/cpu/n1213/ag101/watchdog.S index fc39f3f..18f0b66 100644 --- 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 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 66e4537..074aabf 100644 --- 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 |