X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fvinco.h;h=0084051ba167d7079a1a9bae0cc98221c9b02088;hb=38d2831d3b1bc618c36fcba855368e9ac239f3cc;hp=35fe9de146ac8fbfdfdc8f00ddff433d6e817243;hpb=f4c6f9335c1e867862dcebcfa9c05b2e3dd05636;p=u-boot diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 35fe9de146..0084051ba1 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -13,9 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should be put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" /* The value in the common file is too far away for the VInCo platform */ @@ -26,12 +23,15 @@ /* serial console */ #define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE ATMEL_BASE_USART3 -#define CONFIG_USART_ID ATMEL_ID_USART3 +#define CONFIG_USART_BASE 0xfc00c000 +#define CONFIG_USART_ID 30 + +/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xfc06863c /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x4000000 #define CONFIG_SYS_INIT_SP_ADDR \ @@ -57,37 +57,15 @@ #ifdef CONFIG_CMD_MMC #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI -#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 +#define ATMEL_BASE_MMCI 0xfc000000 #define CONFIG_SYS_MMC_CLK_OD 500000 /* For generating MMC partitions */ -#define CONFIG_PARTITION_UUIDS -#define CONFIG_RANDOM_UUID -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT - -#endif - -/* USB */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_ATMEL -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE #endif /* USB device */ -#define CONFIG_USB_ETHER -#define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_MANUFACTURER "L+G VInCo" - -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif /* Ethernet Hardware */ #define CONFIG_PHY_SMSC @@ -96,11 +74,7 @@ #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_RNDIS - -#ifdef CONFIG_SYS_USE_SERIALFLASH +#ifdef CONFIG_SPI_BOOT /* bootstrap + u-boot + env + linux in serial flash */ #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS @@ -118,9 +92,6 @@ "mmc read ${oftaddr} ${dtb_offset} ${dtb_blksize};" \ "bootz ${loadaddr} - ${oftaddr}" -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS "console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656" - #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_start=0x20000\0" \ "kernel_size=0x800000\0" \ @@ -150,6 +121,5 @@ "bootdelay=0\0" #endif -#define CONFIG_ZERO_BOOTDELAY_CHECK #endif