s5pc100: Use only universal board & configurations
authorKyungmin Park <kyungmin.park@samsung.com>
Mon, 20 Jul 2009 08:32:02 +0000 (17:32 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Mon, 20 Jul 2009 08:32:02 +0000 (17:32 +0900)
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Makefile
board/samsung/universal [deleted symlink]
board/samsung/universal/Makefile [moved from board/samsung/tickertape/Makefile with 86% similarity]
board/samsung/universal/config.mk [moved from board/samsung/tickertape/config.mk with 100% similarity]
board/samsung/universal/lowlevel_init.S [moved from board/samsung/tickertape/lowlevel_init.S with 100% similarity]
board/samsung/universal/mem_setup.S [moved from board/samsung/tickertape/mem_setup.S with 100% similarity]
board/samsung/universal/onenand.c [moved from board/samsung/tickertape/onenand.c with 100% similarity]
board/samsung/universal/u-boot.lds [moved from board/samsung/tickertape/u-boot.lds with 100% similarity]
board/samsung/universal/universal.c [moved from board/samsung/tickertape/tickertape.c with 100% similarity]
include/configs/s5pc100_tickertape.h [deleted file]

index 0595002..03ff56c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2983,11 +2983,6 @@ omap3_pandora_config :   unconfig
 omap3_zoom1_config :   unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3
 
-s5pc100_tickertape_config:     unconfig
-       @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 tickertape samsung s5pc100
-       @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
-
 s5pc100_universal_config:      unconfig
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 universal samsung s5pc100
diff --git a/board/samsung/universal b/board/samsung/universal
deleted file mode 120000 (symlink)
index 4bcd287..0000000
+++ /dev/null
@@ -1 +0,0 @@
-tickertape
\ No newline at end of file
similarity index 86%
rename from board/samsung/tickertape/Makefile
rename to board/samsung/universal/Makefile
index 6cd2002..20e7d19 100644 (file)
@@ -1,9 +1,6 @@
 #
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2008
-# Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
+# (C) Copyright 2009
+# Kyungmin Park, Samsung Electronics
 #
 # See file CREDITS for list of people who contributed to this
 # project.
@@ -28,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS-y        := tickertape.o onenand.o
+COBJS-y        := universal.o onenand.o
 SOBJS  := lowlevel_init.o
 
 SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
diff --git a/include/configs/s5pc100_tickertape.h b/include/configs/s5pc100_tickertape.h
deleted file mode 100644 (file)
index 2236713..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- * Gary Jennejohn <gj@denx.de>
- * David Mueller <d.mueller@elsoft.ch>
- *
- * (C) Copyright 2008
- * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
- *
- * (C) Copyright 2009
- * Inki Dae, SAMSUNG Electronics, <inki.dae@samsung.com>
- * Minkyu Kang, SAMSUNG Electronics, <mk7.kang@samsung.com>
- *
- * Configuation settings for the SAMSUNG SMDK6400(mDirac-III) board.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-#include <asm/sizes.h>
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_ARMCORTEXA8     1       /* This is an ARM V7 CPU core */
-#define CONFIG_SAMSUNG         1       /* in a SAMSUNG core */
-#define CONFIG_S5PC1XX         1       /* which is in a S5PC1XX Family */
-#define CONFIG_S5PC100         1       /* which is in a S5PC100 */
-#define CONFIG_TICKERTAPE      1       /* working with TickerTape */
-
-#include <asm/arch/cpu.h>              /* get chip and board defs */
-
-/*
- * Architecture magic and machine type
- */
-#define MACH_TYPE              3001
-
-#define CONFIG_DISPLAY_CPUINFO
-
-#undef CONFIG_SKIP_RELOCATE_UBOOT
-
-/* input clock of PLL: TickerTape has 12MHz input clock */
-#define CONFIG_SYS_CLK_FREQ    12000000
-
-/* DRAM Base */
-#define CONFIG_SYS_SDRAM_BASE  0x20000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-/*
- * Size of malloc() pool
- * 1MB = 0x100000, 0x100000 = 1024 * 1024
- */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + SZ_1M)       
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes for initial data */
-
-/*
- * select serial console configuration
- */
-#define CONFIG_SERIAL2          1      /* we use SERIAL 2 on S5PC100 */
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE                115200
-#define CONFIG_L2_OFF
-
-/***********************************************************
- * Command definition
- ***********************************************************/
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_BOOTD
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_XIMG
-#undef CONFIG_CMD_NAND
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_NET
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_MTDPARTS
-
-#define CONFIG_BOOTDELAY       1
-
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-#define CONFIG_MTD_PARTITIONS
-
-#define MTDIDS_DEFAULT "onenand0=s3c-onenand"
-#define MTDPARTS_DEFAULT       "mtdparts=s3c-onenand:256k(bootloader)"\
-                               ",128k@0x40000(params)"\
-                               ",2m@0x60000(kernel)"\
-                               ",16m@0x260000(test)"\
-                               ",-(UBI)"
-
-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
-
-#if 1
-#define CONFIG_BOOTCOMMAND     "run ubifsboot"
-#else
-#define CONFIG_BOOTCOMMAND     "bootm 0x21008000"
-#endif
-
-#define CONFIG_RAMDISK_BOOT    "root=/dev/ram0 rw rootfstype=ext2" \
-               " console=ttySAC2,115200n8" \
-               " ${meminfo}"
-
-#define CONFIG_COMMON_BOOT     "console=ttySAC2,115200n8" \
-               " mem=128M " \
-               " " MTDPARTS_DEFAULT
-
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock5 ubi.mtd=4" \
-               " rootfstype=cramfs " CONFIG_COMMON_BOOT
-
-#ifdef CONFIG_USE_BIG_UBOOT
-#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
-                       " onenand write 0x22008000 0x0 0x40000\0"
-#else
-#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
-                       " onenand write 0x22008000 0x0 0x20000;" \
-                       " onenand write 0x22008000 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" \
-       "updateu=onenand erase block 147-4095;" \
-       " onenand write 0x22000000 0x1260000 0x8C0000\0" \
-       "bootk=onenand read 0x20007FC0 0x60000 0x200000;" \
-       " bootm 0x20007FC0\0" \
-       "flashboot=set bootargs root=/dev/mtdblock${bootblock}" \
-        " rootfstype=${rootfstype}" \
-        " ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; run bootk\0" \
-       "ubifsboot=set bootargs root=ubi0!initrd.ubifs rootfstype=ubifs" \
-        " ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; run bootk\0" \
-       "boottrace=setenv opts initcall_debug; run bootcmd\0" \
-       "android=set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock}" \
-        " rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; run bootk\0" \
-       "nfsboot=set bootargs root=/dev/nfs ubi.mtd=${ubiblock}" \
-        " 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" \
-       "rootfstype=cramfs\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
-       "meminfo=mem=128M\0" \
-       "nfsroot=/nfsroot/arm\0" \
-       "bootblock=5\0" \
-       "ubiblock=4\0" \
-       "ubi=enabled"
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP    /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER                 /* use "hush" command parser    */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#define CONFIG_SYS_PROMPT      "TickerTape # " /* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE      256     /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE      384     /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS     16      /* max number of command args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE   /* memtest works on           */
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x5e00000)
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x5e00000)
-
-#define CONFIG_SYS_HZ          2085900         /* at PCLK 66.75MHz */
-
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       SZ_256K         /* regular stack 256KB, 0x40000 */
-
-/*******************************
- Support Clock Settings(APLL)
- *******************************
- ARMCLK                HCLKD0          PCLKD0
- -------------------------------
- 667           166                     83
- 600           150                     75
- 533           133                     66
- 467           117                     59
- 400           100                     50
- *******************************/
-
-#define CONFIG_CLK_667_166_83
-/*#define CONFIG_CLK_600_150_75*/
-/*#define CONFIG_CLK_533_133_66*/
-/*#define CONFIG_CLK_467_117_59*/
-/*#define CONFIG_CLK_400_100_50*/
-
-/* TickerTape has 2 banks of DRAM */
-#define CONFIG_NR_DRAM_BANKS   2
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE   /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE      SZ_128M                 /* 128 MB in Bank #1 */
-#define PHYS_SDRAM_2           0x28000000              /* SDRAM Bank #2 */
-#define PHYS_SDRAM_2_SIZE      0x05000000              /* 80 MB in Bank #2 */
-
-#define CONFIG_SYS_MONITOR_BASE        0x00000000
-
-/*-----------------------------------------------------------------------
- * FLASH and environment organization
- */
-#define CONFIG_SYS_NO_FLASH            1
-
-#define CONFIG_SYS_MONITOR_LEN         SZ_256K /* Reserve 2 sectors */
-
-#define CONFIG_IDENT_STRING    " for TickerTape"
-
-#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000)
-#define CONFIG_ENABLE_MMU
-#endif
-
-#ifdef CONFIG_ENABLE_MMU
-#define CONFIG_SYS_MAPPED_RAM_BASE     0xc0000000
-#else
-#define CONFIG_SYS_MAPPED_RAM_BASE     CONFIG_SYS_SDRAM_BASE
-#endif
-
-/*-----------------------------------------------------------------------
- * Boot configuration (define only one of next 3)
- */
-#define CONFIG_BOOT_ONENAND
-
-#define CONFIG_ENV_IS_IN_ONENAND       1
-#define CONFIG_ENV_SIZE                        SZ_128K         /* 128KB, 0x20000 */
-#define CONFIG_ENV_ADDR                        SZ_256K         /* 256KB, 0x40000 */
-#define CONFIG_ENV_OFFSET              SZ_256K         /* 256KB, 0x40000 */
-
-#define CONFIG_USE_ONENAND_BOARD_INIT
-#define CONFIG_SYS_ONENAND_BASE                0x00000000
-
-#define CONFIG_DOS_PARTITION   1
-
-/* I2C */
-#define CONFIG_DRIVER_S5PC1XX_I2C
-#define CONFIG_HARD_I2C                1
-#define CONFIG_SYS_I2C_SPEED   50000
-#define CONFIG_SYS_I2C_SLAVE   0xFE
-#define CONFIG_SYS_I2C_0       1       
-
-/* USB Downloader */
-#define CONFIG_CMD_USBDOWN
-#define CONFIG_SAMSUNG_USB
-#define CONFIG_OTG_CLK_OSCC
-#define CONFIG_SYS_DOWN_ADDR           CONFIG_SYS_SDRAM_BASE
-#define CONFIG_RAMDISK_ADDR    0x23000000
-
-#endif /* __CONFIG_H */