projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[oweals/u-boot.git]
/
board
/
samsung
/
smdk6400
/
lowlevel_init.S
diff --git
a/board/samsung/smdk6400/lowlevel_init.S
b/board/samsung/smdk6400/lowlevel_init.S
index e0119a771c55c703b909789c2092d724b59cc585..f7ce176945a85440962ef6d6f0ee49f35296b8f0 100644
(file)
--- a/
board/samsung/smdk6400/lowlevel_init.S
+++ b/
board/samsung/smdk6400/lowlevel_init.S
@@
-34,7
+34,7
@@
#include <config.h>
#include <version.h>
#include <config.h>
#include <version.h>
-#include <s3c6400.h>
+#include <
asm/arch/
s3c6400.h>
#ifdef CONFIG_SERIAL1
#define ELFIN_UART_CONSOLE_BASE (ELFIN_UART_BASE + ELFIN_UART0_OFFSET)
#ifdef CONFIG_SERIAL1
#define ELFIN_UART_CONSOLE_BASE (ELFIN_UART_BASE + ELFIN_UART0_OFFSET)
@@
-45,7
+45,7
@@
#endif
_TEXT_BASE:
#endif
_TEXT_BASE:
- .word TEXT_BASE
+ .word
CONFIG_SYS_
TEXT_BASE
.globl lowlevel_init
lowlevel_init:
.globl lowlevel_init
lowlevel_init:
@@
-104,6
+104,13
@@
lowlevel_init:
bl nand_asm_init
#endif
bl nand_asm_init
#endif
+ /* Memory subsystem address 0x7e00f120 */
+ ldr r0, =ELFIN_MEM_SYS_CFG
+
+ /* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */
+ mov r1, #S3C64XX_MEM_SYS_CFG_NAND
+ str r1, [r0]
+
bl mem_ctrl_asm_init
/* Wakeup support. Don't know if it's going to be used, untested. */
bl mem_ctrl_asm_init
/* Wakeup support. Don't know if it's going to be used, untested. */