X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fs5pc210_universal.h;h=a38093769c1572fb1019f786d0b08189cbc4101f;hb=278b90ce786f73faf29aa522d5d101e1da006378;hp=6c75626e8249ba127bcda9b1df4d2fc7b2474609;hpb=983b103f1cb1d2d6da039dbdcf1a85d3d2cc0cf4;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 6c75626..a380937 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -29,9 +29,8 @@ /* Console configuration */ -#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run mmcboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) @@ -45,27 +44,12 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) -#define CONFIG_SYS_TEXT_BASE 0x44800000 - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ -#define MTDIDS_DEFAULT "onenand0=samsung-onenand" - -#define MTDPARTS_DEFAULT "mtdparts=samsung-onenand:"\ - "128k(s-boot)"\ - ",896k(bootloader)"\ - ",256k(params)"\ - ",2816k(config)"\ - ",8m(csa)"\ - ",7m(kernel)"\ - ",1m(log)"\ - ",12m(modem)"\ - ",60m(qboot)"\ - ",-(UBI)\0" - -#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT + +#define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT #define MBRPARTS_DEFAULT "20M(permanent)"\ ",20M(boot)"\ @@ -77,7 +61,6 @@ #define CONFIG_BOOTBLOCK "10" #define CONFIG_UBIBLOCK "9" -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ @@ -134,8 +117,8 @@ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ - "mtdparts=" MTDPARTS_DEFAULT \ + "console=" CONFIG_DEFAULT_CONSOLE "\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "mbrparts=" MBRPARTS_DEFAULT \ "meminfo=crashkernel=32M@0x50000000\0" \ "nfsroot=/nfsroot/arm\0" \ @@ -172,11 +155,9 @@ int universal_spi_read(void); /* Download menu - Samsung common */ #define CONFIG_LCD_MENU -#define CONFIG_LCD_MENU_BOARD /* Download menu - definitions for check keys */ #ifndef __ASSEMBLY__ -#include #define KEY_PWR_PMIC_NAME "MAX8998_PMIC" #define KEY_PWR_STATUS_REG MAX8998_REG_STATUS1