Merge branch 'master' of git://git.denx.de/u-boot-atmel

This commit is contained in:
Tom Rini
2016-02-20 17:32:48 -05:00
80 changed files with 1572 additions and 601 deletions

255
include/configs/ma5d4evk.h Normal file
View File

@@ -0,0 +1,255 @@
/*
* DENX MA5D4 configuration
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MA5D4EVK_CONFIG_H__
#define __MA5D4EVK_CONFIG_H__
#define CONFIG_SYS_NO_FLASH
#define CONFIG_FIT
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#include "at91-sama5_common.h"
#undef CONFIG_BOOTARGS
#define CONFIG_SYS_USE_SERIALFLASH 1
/*
* U-Boot Commands
*/
#define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
/*#define CONFIG_LCD*/
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
#define CONFIG_CMD_FS_GENERIC
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_PING
#define CONFIG_CMD_SF
#define CONFIG_CMD_USB
/*
* Memory configurations
*/
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS
#define CONFIG_SYS_SDRAM_SIZE 0x10000000
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_INIT_SP_ADDR 0x210000
#else
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
#endif
/*
* Environment
*/
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x4000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_SECT_SIZE 0x1000
/*
* U-Boot general configurations
*/
#define CONFIG_VERSION_VARIABLE /* U-BOOT version */
/*
* Serial Driver
*/
#define CONFIG_ATMEL_USART
#define CONFIG_USART_BASE ATMEL_BASE_USART0
#define CONFIG_USART_ID ATMEL_ID_USART0
/*
* Ethernet
*/
#ifdef CONFIG_CMD_NET
#define CONFIG_MACB
#define CONFIG_RMII
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_MACB_SEARCH_PHY
#define CONFIG_ARP_TIMEOUT 200UL
#define CONFIG_IP_DEFRAG
#endif
/*
* LCD
*/
#ifdef CONFIG_LCD
#define CONFIG_CMD_BMP
#define CONFIG_BMP_16BPP
#define CONFIG_BMP_24BPP
#define CONFIG_BMP_32BPP
#define LCD_BPP LCD_COLOR16
#define LCD_OUTPUT_BPP 24
#define CONFIG_ATMEL_HLCD
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#endif
/*
* SD/MMC
*/
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
/*
* SPI NOR (boot memory)
*/
#ifdef CONFIG_CMD_SF
#define CONFIG_ATMEL_SPI
#define CONFIG_ATMEL_SPI0
#define CONFIG_SPI_FLASH_ATMEL
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 30000000
#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
/* USB device */
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_ATMEL_USBA
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "DENX"
#endif
/*
* Boot Linux
*/
#define CONFIG_CMDLINE_TAG
#define CONFIG_INITRD_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyS3,115200"
#define CONFIG_LOADADDR 0x20800000
#define CONFIG_BOOTCOMMAND "run mmc_mmc"
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_OF_LIBFDT
/*
* Extra Environments
*/
#define CONFIG_PREBOOT "run try_bootscript"
#define CONFIG_HOSTNAME ma5d4evk
#define CONFIG_EXTRA_ENV_SETTINGS \
"consdev=ttyS3\0" \
"baudrate=115200\0" \
"bootscript=boot.scr\0" \
"bootdev=/dev/mmcblk1p1\0" \
"bootpart=1:1\0" \
"rootdev=/dev/mmcblk1p2\0" \
"netdev=eth0\0" \
"kernel_addr_r=0x22000000\0" \
"update_spi_firmware_spl_addr=0x21000000\0" \
"update_spi_firmware_spl_filename=boot.bin\0" \
"update_spi_firmware_addr=0x22000000\0" \
"update_spi_firmware_filename=u-boot.img\0" \
"update_spi_firmware=" /* Update the SPI flash firmware */ \
"if sf probe ; then " \
"if tftp ${update_spi_firmware_spl_addr} " \
"${update_spi_firmware_spl_filename} ; then " \
"setenv update_spi_firmware_spl_filesize ${filesize} ; "\
"if tftp ${update_spi_firmware_addr} " \
"${update_spi_firmware_filename} ; then " \
"setenv update_spi_firmware_filesize ${filesize} ; " \
"sf update ${update_spi_firmware_spl_addr} 0x0 " \
"${update_spi_firmware_spl_filesize} ; " \
"sf update ${update_spi_firmware_addr} 0x10000 " \
"${update_spi_firmware_filesize} ; " \
"fi ; " \
"fi ; " \
"fi\0" \
"addcons=" \
"setenv bootargs ${bootargs} " \
"console=${consdev},${baudrate}\0" \
"addip=" \
"setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:${netdev}:off\0" \
"addmisc=" \
"setenv bootargs ${bootargs} ${miscargs}\0" \
"addargs=run addcons addmisc\0" \
"mmcload=" \
"mmc rescan ; " \
"load mmc ${bootpart} ${kernel_addr_r} ${bootfile}\0" \
"netload=" \
"tftp ${kernel_addr_r} ${hostname}/${bootfile}\0" \
"miscargs=nohlt panic=1\0" \
"mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \
"nfsargs=" \
"setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath},v3,tcp\0" \
"mmc_mmc=" \
"run mmcload mmcargs addargs ; " \
"bootm ${kernel_addr_r}\0" \
"mmc_nfs=" \
"run mmcload nfsargs addip addargs ; " \
"bootm ${kernel_addr_r}\0" \
"net_mmc=" \
"run netload mmcargs addargs ; " \
"bootm ${kernel_addr_r}\0" \
"net_nfs=" \
"run netload nfsargs addip addargs ; " \
"bootm ${kernel_addr_r}\0" \
"try_bootscript=" \
"mmc rescan;" \
"if test -e mmc ${bootpart} ${bootscript} ; then " \
"if load mmc ${bootpart} ${kernel_addr_r} ${bootscript};"\
"then ; " \
"echo Running bootscript... ; " \
"source ${kernel_addr_r} ; " \
"fi ; " \
"fi\0"
/* SPL */
#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE 0x200000
#define CONFIG_SPL_MAX_SIZE 0x10000
#define CONFIG_SPL_BSS_START_ADDR 0x20000000
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10)
#define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
#endif /* __MA5D4EVK_CONFIG_H__ */

View File

@@ -49,10 +49,18 @@
#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
#define CONFIG_DISPLAY_CPUINFO /* display CPU Info at startup */
/* We set the max number of command args high to avoid HUSH bugs. */
#define CONFIG_SYS_MAXARGS 32
/* setting board specific options */
# define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB
#define CONFIG_CMDLINE_EDITING
#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB
#define CONFIG_AUTO_COMPLETE
#define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_AUTOLOAD "yes"
#define CONFIG_RESET_TO_RETRY
/* The LED PINs */
#define CONFIG_RED_LED AT91_PIN_PA9
@@ -184,9 +192,7 @@
/* General Boot Parameter */
#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_BOOT_RETRY_TIME 30
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP

167
include/configs/vinco.h Normal file
View File

@@ -0,0 +1,167 @@
/*
* Configuration settings for the VInCo platform.
*
* Based on the settings for the SAMA5-EK board
* Copyright (C) 2014 Atmel
* Bo Shen <voice.shen@atmel.com>
* Copyright (C) 2015 Free Electrons
* Gregory CLEMENT gregory.clement@free-electrons.com
*
* SPDX-License-Identifier: GPL-2.0+
*/
#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 */
#ifdef CONFIG_SYS_TEXT_BASE
#undef CONFIG_SYS_TEXT_BASE
#endif
#define CONFIG_SYS_TEXT_BASE 0x20f00000
/* serial console */
#define CONFIG_ATMEL_USART
#define CONFIG_USART_BASE ATMEL_BASE_USART3
#define CONFIG_USART_ID ATMEL_ID_USART3
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS
#define CONFIG_SYS_SDRAM_SIZE 0x4000000
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
/* SerialFlash */
#define CONFIG_CMD_SF
#ifdef CONFIG_CMD_SF
#define CONFIG_ATMEL_SPI
#define CONFIG_ATMEL_SPI0
#define CONFIG_SPI_FLASH_STMICRO
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 50000000
#define CONFIG_ENV_SPI_MAX_HZ 50000000
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
#define CONFIG_ENV_SPI_MODE (SPI_MODE_0)
#endif
/* MMC */
#define CONFIG_CMD_MMC
#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 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 */
#define CONFIG_CMD_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_GADGET
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_ATMEL_USBA
#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_CMD_FAT
#define CONFIG_DOS_PARTITION
#endif
/* Ethernet Hardware */
#define CONFIG_CMD_MII
#define CONFIG_PHY_SMSC
#define CONFIG_MACB
#define CONFIG_RMII
#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
/* 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
/* Use our own mapping for the VInCo platform */
#undef CONFIG_ENV_OFFSET
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
/* Update the bootcommand according to our mapping for the VInCo platform */
#undef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND "mmc dev 0 0;" \
"mmc read ${loadaddr} ${k_offset} ${k_blksize};" \
"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" \
"mmcblksize=0x200\0" \
"oftaddr=0x21000000\0" \
"loadaddr=0x22000000\0" \
"update_uboot=tftp ${loadaddr} u-boot.bin;sf probe 0;" \
"sf erase 0x20000 0x4B000; sf write ${loadaddr} 0x20000 0x4B000\0" \
"create_partition=setexpr dtb_start ${kernel_start} + 0x400000;" \
"setexpr rootfs_start ${kernel_start} + ${kernel_size};" \
"setenv partitions 'name=kernel,size=${kernel_size}," \
"start=${kernel_start};name=rootfs,size=-';" \
"gpt write mmc 0 ${partitions} \0"\
"f2blk_size=setexpr fileblksize ${filesize} / ${mmcblksize};" \
"setexpr fileblksize ${fileblksize} + 1\0" \
"store_kernel=tftp ${loadaddr} zImage; run f2blk_size;" \
"setexpr k_blksize ${fileblksize};" \
"setexpr k_offset ${kernel_start} / ${mmcblksize};" \
"mmc write ${fileaddr} ${k_offset} ${fileblksize}\0" \
"store_dtb=tftp ${loadaddr} at91-vinco.dtb; run f2blk_size;" \
"setexpr dtb_blksize ${fileblksize};" \
"setexpr dtb_offset ${dtb_start} / ${mmcblksize};" \
"mmc write ${fileaddr} ${dtb_offset} ${fileblksize}\0" \
"store_rootfs=tftp ${loadaddr} vinco-gateway-image-vinco.ext4;" \
"setexpr rootfs_offset ${rootfs_start} / ${mmcblksize};" \
"mmc write ${fileaddr} ${rootfs_offset} ${fileblksize}\0" \
"bootdelay=0\0"
#endif
#define CONFIG_ZERO_BOOTDELAY_CHECK
#endif