summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2007-12-07 00:42:32 +0100
committerWolfgang Denk <wd@denx.de>2008-02-04 00:17:20 +0100
commit4fedfddf97461b88668b9aec774dfb7a0c6dc368 (patch)
treea57b38064eb6c796263e8a1f6c6778df8b1f22cc /board
parent2c5260f711168d5ee91c70ddbb7d897013eefc46 (diff)
ARM: Board voiceblue update
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Diffstat (limited to 'board')
-rw-r--r--board/voiceblue/Makefile2
-rw-r--r--board/voiceblue/config.mk15
-rw-r--r--board/voiceblue/setup.S2
3 files changed, 2 insertions, 17 deletions
diff --git a/board/voiceblue/Makefile b/board/voiceblue/Makefile
index 5f340b47f0..9386bb0e7a 100644
--- a/board/voiceblue/Makefile
+++ b/board/voiceblue/Makefile
@@ -62,7 +62,7 @@ clean:
distclean: clean
- rm -f $(LIB) core config.tmp *.bak .depend
+ rm -f $(LIB) core *.bak .depend
#########################################################################
diff --git a/board/voiceblue/config.mk b/board/voiceblue/config.mk
index d55daa41d9..2cfc56ada5 100644
--- a/board/voiceblue/config.mk
+++ b/board/voiceblue/config.mk
@@ -1,16 +1 @@
-#
-# Linux-Kernel is expected to be at 1000'8000,
-# entry 1000'8000 (mem base + reserved)
-#
-
-sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-
-ifeq ($(VOICEBLUE_SMALL_FLASH),y)
-# We load ourself to internal SRAM at 2001'2000
-# Check map file when changing TEXT_BASE.
-# Everything has fit into 192kB internal SRAM!
-TEXT_BASE = 0x20012000
-else
-# Running in SDRAM...
TEXT_BASE = 0x13FD0000
-endif
diff --git a/board/voiceblue/setup.S b/board/voiceblue/setup.S
index dcf37b5dce..78cd2b6bfe 100644
--- a/board/voiceblue/setup.S
+++ b/board/voiceblue/setup.S
@@ -77,7 +77,7 @@ MUX_CONFIG_VALUES:
.word 0x00000000 @ FUNC_MUX_CTRL_3
.word 0x00000000 @ FUNC_MUX_CTRL_4
.word 0x12082480 @ FUNC_MUX_CTRL_5
- .word 0x00000004 @ FUNC_MUX_CTRL_6
+ .word 0x0000001c @ FUNC_MUX_CTRL_6
.word 0x00000003 @ FUNC_MUX_CTRL_7
.word 0x10001200 @ FUNC_MUX_CTRL_8
.word 0x01201012 @ FUNC_MUX_CTRL_9