From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri, 20 Aug 2010 04:20:01 +0000 (+0900)
Subject: s5pc110: universal: OneNAND boot success
X-Git-Tag: JH02_20100820~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ba66e9e7db6800495ab2a545d3b6083734904ed;p=kernel%2Fu-boot.git

s5pc110: universal: OneNAND boot success

OneNAND IPL code should be below 2KiB

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---

diff --git a/board/samsung/universal_c210/lowlevel_init.S b/board/samsung/universal_c210/lowlevel_init.S
index 7085407..4974602 100644
--- a/board/samsung/universal_c210/lowlevel_init.S
+++ b/board/samsung/universal_c210/lowlevel_init.S
@@ -33,6 +33,7 @@
  * Register usages:
  *
  * r5 has zero always
+ * r6 is used at memory configuration
  * r7 has GPIO part1 base 0x11400000
  * r8 has GPIO part2 base 0x11000000
  */
@@ -50,6 +51,7 @@ lowlevel_init:
 	ldr	r7, =S5PC210_GPIO_PART1_BASE
 	ldr	r8, =S5PC210_GPIO_PART2_BASE
 
+#if 0
 	/* IO retension release */
 	ldr	r0, =0x10020000
 	ldr	r2, =(1 << 28)
@@ -74,6 +76,7 @@ lowlevel_init:
 	ldr	r3, =0x31A8
 	add	r1, r0, r3
 	str	r2, [r1]
+#endif
 
 #ifdef CONFIG_PRELOADER
 	bl	mem_ctrl_asm_init
@@ -123,7 +126,7 @@ uart_asm_init:
 	orr	r1, r1, #(1 << 7)		@ 7 = 7 * 1-bit
 	str	r1, [r0, #0x4]
 
-#if 1
+#if 0
 	ldr	r0, =0x13800000                 @ S5PC210_PA_UART
 	orr     r0, r0, #0x20000		@ UART2
 	mov     r1, #0x3
diff --git a/onenand_ipl/board/samsung/universal_c210/Makefile b/onenand_ipl/board/samsung/universal_c210/Makefile
index 57ed058..8abb95a 100644
--- a/onenand_ipl/board/samsung/universal_c210/Makefile
+++ b/onenand_ipl/board/samsung/universal_c210/Makefile
@@ -15,8 +15,8 @@ include $(TOPDIR)/config.mk
 # S5PC210 loads at 0x02020000 (EVT0)
 # S5PC210 loads at 0xxxxxxxxx (EVT1)
 # Header (16 bytes) are added after more
-TEXT_BASE		= 0x02028000
-TEXT_BASE16K_EVT0	= 0x0202c000
+TEXT_BASE		= 0x02022000
+TEXT_BASE16K_EVT0	= 0x02026000
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot-onenand.lds
 LDFLAGS	= -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
@@ -26,7 +26,6 @@ OBJCFLAGS += --gap-fill=0x00
 
 SOBJS	:= lowlevel_init.o mem_setup.o
 SOBJS	+= start.o _memcpy32.o
-#SOBJS	+= cache.o
 COBJS	+= onenand_read.o
 COBJS	+= onenand_boot.o
 
@@ -66,9 +65,6 @@ $(obj)start.S:
 	ln -s $(SRCTREE)/$(CPUDIR)/start.S $@
 
 # from SoC directory
-#$(obj)cache.S:
-#	@rm -f $@
-#	ln -s $(SRCTREE)/$(CPUDIR)/$(SOC)/cache.S $@
 
 $(obj)mem_setup.S:
 	ln -sf $(SRCTREE)/board/$(BOARDDIR)/mem_setup.S $@