smdkc100: change the base address from 0x20000000 to 0x30000000

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/Makefile b/Makefile
index 1f5d021..e737758 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3095,6 +3095,7 @@ smdkc100_config:  unconfig
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
+       @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk
 
 #########################################################################
 ## XScale Systems

diff --git a/board/samsung/smdkc100/config.mk b/board/samsung/smdkc100/config.mk
index 51c8149..ebab420 100644 (file)
--- a/board/samsung/smdkc100/config.mk
+++ b/board/samsung/smdkc100/config.mk
@@ -1,24 +1,16 @@
 #
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
-# David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
+# Copyright (C) 2008 # Samsung Elecgtronics
+# Kyungmin Park <kyungmin.park@samsung.com>
 #
-# (C) Copyright 2008
-# Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
-#
-# SAMSUNG SMDK6400 board with mDirac3 (ARM1176) cpu
-#
-# see http://www.samsung.com/ for more information on SAMSUNG
 
-# On SMDK6400 we use the 64 MB SDRAM bank at
+# On S5PC100 we use the 128 MiB OneDRAM bank at
 #
-# 0x50000000 to 0x58000000
+# 0x30000000 to 0x35000000 (80MiB)
+# 0x38000000 to 0x40000000 (128MiB)
 #
-# Linux-Kernel is expected to be at 0x50008000, entry 0x50008000
+# On S5PC110 we use the 128 MiB OneDRAM bank at
 #
-# we load ourselves to 0x57e00000 without MMU
-# with MMU, load address is changed to 0xc7e00000
+# 0x30000000 to 0x35000000 (80MiB)
+# 0x40000000 to 0x48000000 (128MiB)
 #
-# download area is 0x5000c000
-
-TEXT_BASE = 0x24800000
+TEXT_BASE = 0x34800000

diff --git a/board/samsung/smdkc100/mem_setup.S b/board/samsung/smdkc100/mem_setup.S
index f6e82fa..a3e692f 100644 (file)
--- a/board/samsung/smdkc100/mem_setup.S
+++ b/board/samsung/smdkc100/mem_setup.S
@@ -77,14 +77,14 @@ mem_ctrl_asm_init:
 swap_memory:
        /*
         * Bank0
-        * 0x20 -> 0x20000000
-        * 0xf8 -> 0x27FFFFFF
+        * 0x30 -> 0x30000000
+        * 0xf8 -> 0x37FFFFFF
         * [15:12] 0: Linear
         * [11:8 ] 2: 9 bits
         * [ 7:4 ] 2: 14 bits
         * [ 3:0 ] 2: 4 banks
         */
-       ldr     r1, =0x20f80222
+       ldr     r1, =0x30f80222
        /* if r4 is 1, swap the bank */
        cmp     r4, #0x1
        orreq   r1, r1, #0x08000000
@@ -92,14 +92,14 @@ swap_memory:
 
        /*
         * Bank1
-        * 0x28 -> 0x28000000
-        * 0xf8 -> 0x2fFFFFFF
+        * 0x38 -> 0x38000000
+        * 0xf8 -> 0x3fFFFFFF
         * [15:12] 0: Linear
         * [11:8 ] 2: 9 bits
         * [ 7:4 ] 2: 14 bits
         * [ 3:0 ] 2: 4 banks
         */
-       ldr     r1, =0x28f80222
+       ldr     r1, =0x38f80222
        /* if r4 is 1, swap the bank */
        cmp     r4, #0x1
        biceq   r1, r1, #0x08000000
@@ -185,7 +185,7 @@ swap_memory:
        beq     1f
 
        mov     r4, #0x1
-       ldr     r1, =0x27ffff00
+       ldr     r1, =0x37ffff00
        str     r4, [r1]
        str     r4, [r1, #0x4]                          @ dummy write
        ldr     r0, [r1]

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index c63f78f..bf45cdc 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -55,7 +55,7 @@
 #define CONFIG_SYS_CLK_FREQ    12000000
 
 /* DRAM Base */
-#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CONFIG_SYS_SDRAM_BASE  0x30000000
 
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
@@ -111,8 +111,8 @@
 #define MTDIDS_DEFAULT "onenand0=s3c-onenand"
 #define MTDPARTS_DEFAULT       "mtdparts=s3c-onenand:256k(bootloader)"\
                                ",128k@0x40000(params)"\
-                               ",2m@0x60000(kernel)"\
-                               ",16m@0x260000(test)"\
+                               ",3m@0x60000(kernel)"\
+                               ",16m@0x360000(test)"\
                                ",-(UBI)"
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
@@ -120,7 +120,7 @@
 #if 1
 #define CONFIG_BOOTCOMMAND     "run ubifsboot"
 #else
-#define CONFIG_BOOTCOMMAND     "bootm 0x21008000"
+#define CONFIG_BOOTCOMMAND     "bootm 0x31008000"
 #endif
 
 #define CONFIG_RAMDISK_BOOT    "root=/dev/ram0 rw rootfstype=ext2" \
@@ -137,22 +137,22 @@
 #define CONFIG_USE_BIG_UBOOT
 #ifdef CONFIG_USE_BIG_UBOOT
 #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
-                       " onenand write 0x22008000 0x0 0x40000\0"
+                       " onenand write 0x32008000 0x0 0x40000\0"
 #else
 #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
-                       " onenand write 0x22008000 0x0 0x20000;" \
-                       " onenand write 0x22008000 0x20000 0x20000\0"
+                       " onenand write 0x32008000 0x0 0x20000;" \
+                       " onenand write 0x32008000 0x20000 0x20000\0"
 #endif
 
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        CONFIG_UPDATEB \
-       "updatek=onenand erase 0x60000 0x200000;" \
-       " onenand write 0x21008000 0x60000 0x200000\0" \
+       "updatek=onenand erase 0x60000 0x300000;" \
+       " onenand write 0x31008000 0x60000 0x300000\0" \
        "updateu=onenand erase block 147-4095;" \
-       " onenand write 0x22000000 0x1260000 0x8C0000\0" \
-       "bootk=onenand read 0x20007FC0 0x60000 0x200000;" \
-       " bootm 0x20007FC0\0" \
+       " onenand write 0x32000000 0x1260000 0x8C0000\0" \
+       "bootk=onenand read 0x30007FC0 0x60000 0x300000;" \
+       " bootm 0x30007FC0\0" \
        "flashboot=set bootargs root=/dev/mtdblock${bootblock}" \
         " rootfstype=${rootfstype}" \
         " ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; run bootk\0" \
@@ -165,7 +165,7 @@
         " nfsroot=${nfsroot},nolock ip=${ipaddr}:${serverip}:${gatewayip}:" \
         "${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; run bootk\0" \
        "ramboot=set bootargs " CONFIG_RAMDISK_BOOT \
-        " initrd=0x23000000,8M ramdisk=8192\0" \
+        " initrd=0x33000000,8M ramdisk=8192\0" \
        "rootfstype=cramfs\0" \
        "mtdparts=" MTDPARTS_DEFAULT "\0" \
        "meminfo=mem=128M\0" \
@@ -246,7 +246,7 @@
 #define CONFIG_SAMSUNG_USB
 #define CONFIG_OTG_CLK_OSCC
 #define CONFIG_SYS_DOWN_ADDR   CONFIG_SYS_SDRAM_BASE
-#define CONFIG_RAMDISK_ADDR    0x23000000
+#define CONFIG_RAMDISK_ADDR    0x33000000
 
 
 #endif /* __CONFIG_H */

diff --git a/onenand_ipl/board/samsung/smdkc100/Makefile b/onenand_ipl/board/samsung/smdkc100/Makefile
index 4301938..efd02ad 100644 (file)
--- a/onenand_ipl/board/samsung/smdkc100/Makefile
+++ b/onenand_ipl/board/samsung/smdkc100/Makefile
@@ -14,6 +14,7 @@ include $(TOPDIR)/config.mk
 TEXT_BASE = 0xD0034000
 TEXT_BASE2K = 0xD0034800
 TEXT_BASE4K = 0xD0035000
+TEXT_BASE16K = 0xD0038000
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot-onenand.lds
 LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
@@ -33,7 +34,7 @@ LNDIR := $(OBJTREE)/onenand_ipl/board/$(BOARDDIR)
 
 onenandobj     := $(OBJTREE)/onenand_ipl/
 
-ALL    = $(onenandobj)onenand-ipl $(onenandobj)onenand-ipl.bin $(onenandobj)onenand-ipl-2k.bin $(onenandobj)onenand-ipl-4k.bin
+ALL    = $(onenandobj)onenand-ipl $(onenandobj)onenand-ipl.bin $(onenandobj)onenand-ipl-2k.bin $(onenandobj)onenand-ipl-4k.bin $(onenandobj)onenand-ipl-16k.bin
 
 all:   $(obj).depend $(ALL)
 
@@ -43,6 +44,9 @@ $(onenandobj)onenand-ipl-2k.bin:      $(onenandobj)onenand-ipl
 $(onenandobj)onenand-ipl-4k.bin:       $(onenandobj)onenand-ipl
        $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(TEXT_BASE4K) -O binary $< $@
 
+$(onenandobj)onenand-ipl-16k.bin:      $(onenandobj)onenand-ipl
+       $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(TEXT_BASE16K) -O binary $< $@
+
 $(onenandobj)onenand-ipl.bin:  $(onenandobj)onenand-ipl
        $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@