X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fgw_ventana.h;h=a470bd8f4c60cc4927742acc1865dcd5d699ec57;hb=a61f9d1fbbca3c5e59b907ad3071db70ef174872;hp=a93172ace1f7e90c3895d1db9cfdf24d9300fbd0;hpb=74d90d17eebfeeefd91776e3deb7901c122bef7f;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index a93172a..a470bd8 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -24,7 +24,6 @@ #include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */ @@ -54,7 +53,6 @@ /* SPI */ #ifdef CONFIG_CMD_SF - #define CONFIG_MXC_SPI #define CONFIG_SPI_FLASH_MTD #define CONFIG_SPI_FLASH_BAR #define CONFIG_SF_DEFAULT_BUS 0 @@ -67,16 +65,12 @@ #elif defined(CONFIG_SPL_NAND_SUPPORT) /* Enable NAND support */ #ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_BURST - #define CONFIG_APBH_DMA_BURST8 #endif #endif /* CONFIG_SPI_FLASH */ @@ -102,12 +96,10 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA - #define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 - #define CONFIG_LIBATA #endif /* @@ -148,9 +140,6 @@ #define CONFIG_USBD_HS #define CONFIG_NETCONSOLE -/* USB Mass Storage Gadget */ -#define CONFIG_USB_FUNCTION_MASS_STORAGE - /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_LOGO @@ -186,14 +175,6 @@ */ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#ifdef CONFIG_SPI_FLASH -#define MTDIDS_DEFAULT "nor0=nor" -#define MTDPARTS_DEFAULT \ - "mtdparts=nor:512k(uboot),64k(env),2m(kernel),-(rootfs)" -#else -#define MTDIDS_DEFAULT "nand0=nand" -#define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)" -#endif /* Persistent Environment Config */ #if defined(CONFIG_ENV_IS_IN_MMC) @@ -231,8 +212,8 @@ "hwconfig=_UNKNOWN_\0" \ "video=\0" \ \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ - "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "disk=0\0" \ "part=1\0" \ \