X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fs5pc210_universal.h;h=b0bcc56a1b5ff3689ddf16579908c95a812fb5d6;hb=38d2831d3b1bc618c36fcba855368e9ac239f3cc;hp=35fef2b244a0e05b2423bd504cb231ab5bb784f9;hpb=fcd78fa604d994477fd209b9faab4a974b103250;p=u-boot diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 35fef2b244..b0bcc56a1b 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -26,15 +26,11 @@ /* select serial console configuration */ #define CONFIG_SERIAL2 -#define CONFIG_BAUDRATE 115200 /* Console configuration */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET -#define CONFIG_SYS_CONSOLE_IS_IN_ENV -#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) @@ -54,21 +50,8 @@ #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)"\ @@ -80,7 +63,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 */ @@ -137,8 +119,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" \ @@ -155,31 +137,7 @@ #define CONFIG_SAMSUNG_ONENAND #define CONFIG_SYS_ONENAND_BASE 0x0C000000 -#include -/* - * I2C Settings - */ -#define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_B7 -#define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_B6 - -#define CONFIG_CMD_I2C - -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ -#define CONFIG_SYS_I2C_SOFT_SPEED 50000 -#define CONFIG_SYS_I2C_SOFT_SLAVE 0 -#define CONFIG_SOFT_I2C_READ_REPEATED_START -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_SYS_MAX_I2C_BUS 7 - -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_MAX8998 - -#define CONFIG_USB_GADGET -#define CONFIG_USB_GADGET_S3C_UDC_OTG -#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY -#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_DWC2_OTG_PHY /* * SPI Settings @@ -199,11 +157,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 @@ -217,14 +173,10 @@ int universal_spi_read(void); /* LCD console */ #define LCD_BPP LCD_COLOR16 -#define CONFIG_SYS_WHITE_ON_BLACK /* * LCD Settings */ -#define CONFIG_EXYNOS_FB -#define CONFIG_LCD -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_LD9040 #define CONFIG_VIDEO_BMP_GZIP