[U-Boot-Users] [PATCH 6/6] AT572D940HF-EB Support

[Ben Warren <biggerbadderben@gmail.com>]

Hi Antonio,

Antonio R. Costa wrote:
> Logic unit: Configuration files
> Purpose:    Added AT572D940HF-EB to Makefile and mach-types, added config file
> Author:     Antnoio R. Costa <antonio.costa <at> atmel.com>
> Date  :     11 Jun 2008
>
> Status:
>   - USB,MACB,MCI,DBGU,USARTS working
>   - Introduced interrput handling on reset to work around
>     a bug on SDRAM controller
>   - Introduced a function to compute system frequency at run-time
>   - Flashes initialised but not recognised
>   - Environment is built-in and temporarly stored in SDRAM
>
>   
Having all this stuff in every patch is confusing.  Please only include 
information about the particular patch.
> Signed-off-by: Antonio R. Costa <antonio.costa@atmel.com>
>
> diff --git a/Makefile b/Makefile
> index 7e68b23..1cb5ac7 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2370,6 +2370,17 @@ at91sam9260ek_config	:	unconfig
>  	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91sam9
>  
>  ########################################################################
> +
> +########################################################################
> +# AT572D940HF
> +########################################################################
> +#
> +at572d940hfeb_config	:	unconfig
> +	@$(MKCONFIG) $(@:_config=) arm arm926ejs at572d940hfeb atmel at572d940hf
> +
> +########################################################################
> +
> +
>  ## ARM Integrator boards - see doc/README-integrator for more info.
>  integratorap_config	\
>  ap_config		\
> diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
> index aaf2ea2..b053b7a 100644
> --- a/include/asm-arm/mach-types.h
> +++ b/include/asm-arm/mach-types.h
> @@ -1595,6 +1595,7 @@ extern unsigned int __machine_arch_type;
>  #define MACH_TYPE_P300                 1602
>  #define MACH_TYPE_XDACOMET             1603
>  #define MACH_TYPE_DEXFLEX2             1604
> +#define MACH_TYPE_AT572D940HFEB        1783
>  
>  #ifdef CONFIG_ARCH_EBSA110
>  # ifdef machine_arch_type
> diff --git a/include/configs/at572d940hfeb.h b/include/configs/at572d940hfeb.h
> new file mode 100644
> index 0000000..7e89aa8
> --- /dev/null
> +++ b/include/configs/at572d940hfeb.h
> @@ -0,0 +1,270 @@
> +/*
> + * (C) Copyright 2008
> + * Antonio R. Costa <antonio.costa <at> atmel.com>
> + * ATMEL CORP <www.atmel.com>
> + *
> + * Configuation settings for the AT572D940HFEB board.
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef __CONFIG_H
> +#define __CONFIG_H
> +
> +/* ARM asynchronous clock */
> +/* Miniloader */
> +#define AT91_MAIN_CLOCK		160000000	/* from 12 MHz crystal   */
>   
I can't say for sure without applying it, but this looks like a long line.
> +#define AT91_MASTER_CLOCK	 80000000	/* peripheral = main / 2 */
> +
> +/* ROM Boot */
> +//#define AT91_MAIN_CLOCK        96000000       /* from 18.432 MHz crystal 
C++ style comments are not allowed
> */
> +//#define AT91_MASTER_CLOCK      48000000       /* peripheral = main / 2   */
> +
> +#define CFG_HZ				1000000	/* 1us resolution */
> +
> +#define AT91_CLK_DELAY_CYCLES		256
> +#define AT91_SLOW_CLOCK			32768	/* slow clock */
> +#define CFG_SLOW_CLK			AT91_SLOW_CLOCK
> +
> +#define CONFIG_ARM926EJS		1	/* This is an ARM926EJS Core    */
> +#define CONFIG_AT572D940HF		1	/* It's an Atmel AT572D940HF SoC  */
> +#define CONFIG_AT572D940HFEB		1	/* on an AT572D940HFEB Board    */
> +#define CONFIG_MACH_AT572D940HFEB	1
> +#define CONFIG_USE_IRQ			1
> +
> +#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs      */
> +#define CONFIG_SETUP_MEMORY_TAGS 	1
> +#define CONFIG_INITRD_TAG		1
> +
> +#define CONFIG_SKIP_LOWLEVEL_INIT	1
> +#define CONFIG_SKIP_RELOCATE_UBOOT	1
> +
> +/*
> + * Hardware drivers
> + */
> +#define CONFIG_ATMEL_USART	1
> +#undef CONFIG_USART0
> +#undef CONFIG_USART1
> +#undef CONFIG_USART2
> +#define CONFIG_USART3		1	/* USART 3 is DBGU */
> +
> +#define CONFIG_BOOTDELAY	3
> +/*
> + * #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
> + * 				"root=/dev/mtdblock0 rw rootfstype=jffs2"
> + */
> +
> +#undef	CONFIG_HWFLOW		/* don't include RTS/CTS flow control support   */
> +
> +#define CONFIG_ENV_OVERWRITE		1
> +
> +/*
> + * BOOTP options
> + */
> +#define CONFIG_BOOTP_BOOTFILESIZE	1
> +#define CONFIG_BOOTP_BOOTPATH		1
> +#define CONFIG_BOOTP_GATEWAY		1
> +#define CONFIG_BOOTP_HOSTNAME		1
> +
> +/*
> + * Command line configuration.
> + */
> +#include <config_cmd_default.h>
> +//#undef CONFIG_CMD_BDI
> +//#undef CONFIG_CMD_IMI
> +//#undef CONFIG_CMD_NET
> +//#undef CONFIG_CMD_PING
> +
> +#define CONFIG_AUTO_COMPLETE		1
> +#define CONFIG_CMDLINE_EDITING		1
> +
> +#undef CONFIG_CMD_FPGA
> +#undef CONFIG_CMD_LOADS
> +#undef CONFIG_CMD_IMLS
> +
> +#define CONFIG_CMD_PING		1
> +#define CONFIG_CMD_DHCP		1
> +#define CONFIG_CMD_NAND		1
> +#define CONFIG_CMD_USB		1
> +#define CONFIG_CMD_MMC		1
> +// #undef CONFIG_CMD_I2C
> +// #undef CONFIG_CMD_SPI                
> +// #define CONFIG_CMD_AT91_SPIMUX  1
> +#define CONFIG_CMD_FAT		1
> +#define CONFIG_CMD_EXT2		1
> +#define CONFIG_CMD_JFFS2	1
> +
> +/* SDRAM */
> +#define CONFIG_NR_DRAM_BANKS		1
> +#define PHYS_SDRAM			0x20000000
> +#define PHYS_SDRAM_SIZE			0x04000000	/* 64 megs */
> +
> +/* DataFlash */
> +#define CONFIG_HAS_DATAFLASH		1
> +#define CFG_SPI_WRITE_TOUT		(5*CFG_HZ)
> +#define CFG_MAX_DATAFLASH_BANKS		2
> +#define CFG_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
> +#define CFG_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
> +#define AT91_SPI_CLK			33000000
> +#define DATAFLASH_TCSS			(0x1a << 16)
> +#define DATAFLASH_TCHS			(0x01 << 24)
> +
> +/* NAND flash */
> +#define NAND_MAX_CHIPS			1
> +#define CFG_MAX_NAND_DEVICE		1
> +#define CFG_NAND_BASE			0x40000000
> +
> +#define CFG_FLASH_BASE			0x10000000
> +#define CFG_BOOT_SIZE			(7 * 0x1000)	/* 7 4K sectors */
> +#define CFG_ENV_ADDR			0x10007000
> +#define CFG_ENV_SIZE			0x1000	/* 4K */
> +
> +#define CFG_U_BOOT_BASE			0x10008000
> +#define CFG_U_BOOT_SIZE			(10 * 0x1000)	/* 10 4K sectors */
> +
> +#define CFG_MAX_FLASH_SECT		135
> +#define CFG_MAX_FLASH_BANKS		1
> +#define CFG_FLASH_ERASE_TOUT		120000
> +#define CFG_FLASH_WRITE_TOUT		500
> +#define CFG_USE_BUFFER_WRITE		1
> +
> +#undef CFG_ENV_IS_IN_NVRAM
> +#undef CFG_ENV_IS_IN_EEPROM
> +#undef CFG_ENV_IS_IN_FLASH
> +#undef CFG_ENV_IS_IN_DATAFLASH
> +#undef CFG_ENV_IS_IN_NAND
> +#undef CFG_ENV_IS_IN_ONENAND
> +
> +#define CFG_ENV_IS_NOWHERE		1
> +
> +#define PHYS_FLASH_1 			CFG_FLASH_BASE
> +
> +/* NOR flash - no real flash on this board */
> +// #define CFG_NO_FLASH                 1
> +
> +/* Ethernet */
> +
> +#define CONFIG_MACB			1
> +#define CONFIG_RMII			1
> +#define CONFIG_NET_MULTI		1
> +#define CONFIG_NET_RETRY_COUNT		20
> +#define CONFIG_RESET_PHY_R		1
> +#define CONFIG_ETHADDR			00:11:22:33:AA:BB
> +#define CONFIG_IPADDR			172.16.1.187
> +#define CONFIG_NETMASK			255.255.0.0
> +#define CONFIG_HOSTNAME			D940DEB
> +#define CONFIG_SERVERIP			172.16.1.30
> +#define CONFIG_BOOTFILE			d940deb.bin
>   
Please remove all of the default network configurations (from ETHADDR to 
BOOTFILE)
> +
> +/* USB */
> +#define CONFIG_USBH			1
> +#define CONFIG_USB_OHCI_NEW		1
> +#define LITTLEENDIAN			1
> +#define CONFIG_DOS_PARTITION		1
> +#define CFG_USB_OHCI_CPU_INIT		1
> +#define CFG_USB_OHCI_REGS_BASE		0x00500000	/* AT572D940_UHP_BASE */
> +#define CFG_USB_OHCI_SLOT_NAME		"at572d940"
> +#define CFG_USB_OHCI_MAX_ROOT_PORTS	2
> +#define CONFIG_USB_STORAGE		1
> +
> +#define CFG_LOAD_ADDR			0x22000000	/* load address */
> +
> +#define CFG_MEMTEST_START		PHYS_SDRAM
> +#define CFG_MEMTEST_END			0x23e00000
> +
> +#undef CFG_USE_DATAFLASH_CS0
> +#undef CFG_USE_DATAFLASH_CS1
> +#undef CFG_USE_NANDFLASH
> +#define CFG_USE_SD			1
> +
> +#ifdef CFG_USE_DATAFLASH_CS0
> +
> +/* bootstrap + u-boot + env + linux in dataflash on CS0 */
> +#define CFG_ENV_IS_IN_DATAFLASH	1
> +#define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
> +#define CFG_ENV_OFFSET		0x4200
> +#define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
> +#define CFG_ENV_SIZE		0x4200
> +#define CONFIG_BOOTCOMMAND	"cp.b 0xC003DE00 0x22000000 0x200040; bootm"
> +
> +#elif CFG_USE_DATAFLASH_CS1
> +
> +/* bootstrap + u-boot + env + linux in dataflash on CS1 */
> +#define CFG_ENV_IS_IN_DATAFLASH	1
> +#define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
> +#define CFG_ENV_OFFSET		0x4200
> +#define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
> +#define CFG_ENV_SIZE		0x4200
> +#define CONFIG_BOOTCOMMAND	"cp.b 0xD003DE00 0x22000000 0x200040; bootm"
> +
> +#elif CFG_USE_NANDFLASH
> +
> +/* bootstrap + u-boot + env + linux in nandflash */
> +#define CFG_ENV_IS_IN_NAND	1
> +#define CFG_ENV_OFFSET		0x60000
> +#define CFG_ENV_OFFSET_REDUND	0x80000
> +#define CFG_ENV_SIZE		0x20000	/* 1 sector = 128 kB */
> +#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm"
> +
> +#elif CFG_USE_SD
> +//#define CFG_ENV_IS_IN_DATAFLASH       1
> +#define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
> +//#define CFG_ENV_OFFSET                0x4200
> +//#define CFG_ENV_ADDR          (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
> +//#define CFG_ENV_SIZE          0x4200
> +
> +#define CONFIG_MMC		1
> +#define CFG_SD_CARD_BOOT	1
> +
> +//#define CFG_MMC_CLK_OD                1500000
> +//#define CFG_MMC_CLK_PP                1500000
> +#define CFG_MMC_CLK_OD		20000000
> +#define CFG_MMC_CLK_PP		20000000
> +#define CFG_MMC_OP_COND		(0x401f8000)	/* SDHC + voltage rage 2.7-3.3 */
> +
> +#define CONFIG_BOOTCOMMAND    	"mmcinit; fatload mmc 0:1 0x21400000 uLinux.img; fatload mmc 0:1 0x21100000 initrd.img; bootm 0x21400000"
>   
Seriously long line.  Please break it up.  I believe the limit is < 78 
characters, but you can look that up.
> +
> +#endif
> +
> +#define CONFIG_BAUDRATE		115200
> +#define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
> +
> +#define CFG_PROMPT		"Diopsis U-Boot> "
> +#define CFG_CBSIZE		256
> +#define CFG_MAXARGS		16
> +#define CFG_PBSIZE		(CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
> +#define CFG_LONGHELP		1
> +#define CONFIG_CMDLINE_EDITING	1
> +
> +#define ROUND(A, B)		(((A) + (B)) & ~((B) - 1))
> +/*
> + * Size of malloc() pool
> + */
> +#define CFG_MALLOC_LEN		ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
> +#define CFG_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
> +
> +#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
> +
> +#ifdef CONFIG_USE_IRQ
> +#define CONFIG_STACKSIZE_IRQ 	4096
> +#define CONFIG_STACKSIZE_FIQ 	4096
> +//#error CONFIG_USE_IRQ not supported
> +#endif
> +
> +#endif
>   
regards,
Ben