X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fgw_ventana.h;h=b078cc546644ee33e5f5110a347f3fb68595bf9f;hb=0cd07a90a9bc9acf6c07e5561441b212edbe901b;hp=ec5c902888ed228f4e624f6d37bc9db4579b3372;hpb=ae3584498bf81aa3be9ae6f90fbb04e07d707276;p=oweals%2Fu-boot.git diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index ec5c902888..b078cc5466 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Gateworks Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -24,7 +23,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 +52,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 +64,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 */ @@ -96,18 +89,15 @@ /* eMMC Configs */ #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_SUPPORT_EMMC_RPMB /* * 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 /* @@ -141,24 +131,16 @@ #define CONFIG_ARP_TIMEOUT 200UL /* USB Configs */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS -#define CONFIG_USB_ETHER -#define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE -/* USB Mass Storage Gadget */ -#define CONFIG_USB_FUNCTION_MASS_STORAGE - /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_LOGO -#define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_VIDEO_BMP_LOGO @@ -189,16 +171,6 @@ /* * MTD Command for mtdparts */ -#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) @@ -236,8 +208,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" \ \