diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 9 | ||||
| -rw-r--r-- | include/configs/am3517_evm.h | 14 | ||||
| -rw-r--r-- | include/configs/cm_t335.h | 182 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 11 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 3 | ||||
| -rw-r--r-- | include/configs/omap4_panda.h | 3 | ||||
| -rw-r--r-- | include/configs/omap5_uevm.h | 10 | ||||
| -rw-r--r-- | include/configs/siemens-am33x-common.h | 5 | ||||
| -rw-r--r-- | include/twl6030.h | 38 | 
9 files changed, 262 insertions, 13 deletions
| diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 90159278f..e8a6ca15b 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -42,12 +42,11 @@  	"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \  	"nandroot=ubi0:rootfs rw ubi.mtd=7,2048\0" \  	"nandrootfstype=ubifs rootwait=1\0" \ -	"nandsrcaddr=0x280000\0" \ -		"nandboot=echo Booting from nand ...; " \ +	"nandboot=echo Booting from nand ...; " \  		"run nandargs; " \ -		"nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \ -		"bootz ${loadaddr}\0" \ -	"nandimgsize=0x500000\0" +		"nand read ${fdtaddr} u-boot-spl-os; " \ +		"nand read ${loadaddr} kernel; " \ +		"bootz ${loadaddr} - ${fdtaddr}\0"  #else  #define NANDARGS ""  #endif diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 5ff65c6d5..5e259f5c4 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -141,8 +141,18 @@  #define CONFIG_SYS_I2C_SLAVE		1  #define CONFIG_DRIVER_OMAP34XX_I2C	1 -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_NFS +/* + * Ethernet + */ +#define CONFIG_DRIVER_TI_EMAC +#define CONFIG_DRIVER_TI_EMAC_USE_RMII +#define CONFIG_MII +#define CONFIG_BOOTP_DEFAULT +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_NET_RETRY_COUNT		10 +  /*   * Board NAND Info.   */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h new file mode 100644 index 000000000..56e9a8e0e --- /dev/null +++ b/include/configs/cm_t335.h @@ -0,0 +1,182 @@ +/* + * Config file for Compulab CM-T335 board + * + * Copyright (C) 2013, Compulab Ltd - http://compulab.co.il/ + * + * Author: Ilya Ledvich <ilya@compulab.co.il> + * + * SPDX-License-Identifier:	GPL-2.0+ + */ + +#ifndef __CONFIG_CM_T335_H +#define __CONFIG_CM_T335_H + +#define CONFIG_CM_T335 +#define CONFIG_NAND + +#include <configs/ti_am335x_common.h> + +#undef CONFIG_BOARD_LATE_INIT +#undef CONFIG_SPI +#undef CONFIG_OMAP3_SPI +#undef CONFIG_CMD_SPI +#undef CONFIG_SPL_OS_BOOT +#undef CONFIG_BOOTCOUNT_LIMIT +#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC + +#undef CONFIG_MAX_RAM_BANK_SIZE +#define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 512MB */ + +#undef CONFIG_SYS_PROMPT +#define CONFIG_SYS_PROMPT		"CM-T335 # " + +#define CONFIG_OMAP_COMMON + +#define MACH_TYPE_CM_T335		4586	/* Until the next sync */ +#define CONFIG_MACH_TYPE		MACH_TYPE_CM_T335 + +/* Clock Defines */ +#define V_OSCK				25000000  /* Clock output from T2 */ +#define V_SCLK				(V_OSCK) + +#define CONFIG_ENV_SIZE			(16 << 10)	/* 16 KiB */ + +#ifndef CONFIG_SPL_BUILD +#define MMCARGS \ +	"mmcdev=0\0" \ +	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ +	"mmcrootfstype=ext4\0" \ +	"mmcargs=setenv bootargs console=${console} " \ +		"root=${mmcroot} " \ +		"rootfstype=${mmcrootfstype}\0" \ +	"mmcboot=echo Booting from mmc ...; " \ +		"run mmcargs; " \ +		"bootm ${loadaddr}\0" + +#define NANDARGS \ +	"mtdids=" MTDIDS_DEFAULT "\0" \ +	"mtdparts=" MTDPARTS_DEFAULT "\0" \ +	"nandroot=ubi0:rootfs rw\0" \ +	"nandrootfstype=ubifs\0" \ +	"nandargs=setenv bootargs console=${console} " \ +		"root=${nandroot} " \ +		"rootfstype=${nandrootfstype} " \ +		"ubi.mtd=${rootfs_name}\0" \ +	"nandboot=echo Booting from nand ...; " \ +		"run nandargs; " \ +		"nboot ${loadaddr} nand0 900000; " \ +		"bootm ${loadaddr}\0" + + +#define CONFIG_EXTRA_ENV_SETTINGS \ +	"loadaddr=82000000\0" \ +	"console=ttyO0,115200n8\0" \ +	"rootfs_name=rootfs\0" \ +	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ +	"bootscript=echo Running bootscript from mmc ...; " \ +		"source ${loadaddr}\0" \ +	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ +	MMCARGS \ +	NANDARGS + +#define CONFIG_BOOTCOMMAND \ +	"mmc dev ${mmcdev}; if mmc rescan; then " \ +		"if run loadbootscript; then " \ +			"run bootscript; " \ +		"else " \ +			"if run loaduimage; then " \ +				"run mmcboot; " \ +			"else run nandboot; " \ +			"fi; " \ +		"fi; " \ +	"else run nandboot; fi" +#endif /* CONFIG_SPL_BUILD */ + +#define CONFIG_TIMESTAMP +#define CONFIG_SYS_AUTOLOAD		"no" + +/* Serial console configuration */ +#define CONFIG_CONS_INDEX		1 +#define CONFIG_SERIAL1			1	/* UART0 */ + +/* NS16550 Configuration */ +#define CONFIG_SYS_NS16550_COM1		0x44e09000	/* UART0 */ +#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */ +#define CONFIG_BAUDRATE			115200 + +/* I2C Configuration */ +#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1 + +/* SPL */ +#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds" + +/* Network. */ +#define CONFIG_PHY_GIGE +#define CONFIG_PHYLIB +#define CONFIG_PHY_ADDR			0 +#define CONFIG_PHY_ATHEROS + +/* NAND support */ +#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \ +					 CONFIG_SYS_NAND_PAGE_SIZE) +#define CONFIG_SYS_NAND_PAGE_SIZE	2048 +#define CONFIG_SYS_NAND_OOBSIZE		64 +#define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024) +#define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS +#define CONFIG_SYS_NAND_ECCPOS		{ 2, 3, 4, 5, 6, 7, 8, 9, \ +					 10, 11, 12, 13, 14, 15, 16, 17, \ +					 18, 19, 20, 21, 22, 23, 24, 25, \ +					 26, 27, 28, 29, 30, 31, 32, 33, \ +					 34, 35, 36, 37, 38, 39, 40, 41, \ +					 42, 43, 44, 45, 46, 47, 48, 49, \ +					 50, 51, 52, 53, 54, 55, 56, 57, } + +#define CONFIG_SYS_NAND_ECCSIZE		512 +#define CONFIG_SYS_NAND_ECCBYTES	14 + +#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE + +#undef CONFIG_SYS_NAND_U_BOOT_OFFS +#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x200000 + +#define CONFIG_CMD_NAND +#define GPMC_NAND_ECC_LP_x8_LAYOUT +#define MTDIDS_DEFAULT			"nand0=nand" +#define MTDPARTS_DEFAULT		"mtdparts=nand:2m(spl)," \ +					"1m(u-boot),1m(u-boot-env)," \ +					"1m(dtb),4m(splash)," \ +					"6m(kernel),-(rootfs)" +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET		0x300000 /* environment starts here */ +#define CONFIG_SYS_ENV_SECT_SIZE	(128 << 10)	/* 128 KiB */ +#define CONFIG_SYS_NAND_ONFI_DETECTION + +/* GPIO pin + bank to pin ID mapping */ +#define GPIO_PIN(_bank, _pin)		((_bank << 5) + _pin) + +/* Status LED */ +#define CONFIG_STATUS_LED +#define CONFIG_GPIO_LED +#define CONFIG_BOARD_SPECIFIC_LED +#define STATUS_LED_BIT			GPIO_PIN(2, 0) +/* Status LED polarity is inversed, so init it in the "off" state */ +#define STATUS_LED_STATE		STATUS_LED_OFF +#define STATUS_LED_PERIOD		(CONFIG_SYS_HZ / 2) +#define STATUS_LED_BOOT			0 + +#ifndef CONFIG_SPL_BUILD +/* + * Enable PCA9555 at I2C0-0x26. + * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. + */ +#define CONFIG_PCA953X +#define CONFIG_CMD_PCA953X +#define CONFIG_CMD_PCA953X_INFO +#define CONFIG_SYS_I2C_PCA953X_ADDR	0x26 +#define CONFIG_SYS_I2C_PCA953X_WIDTH	{ {0x26, 16} } +#endif /* CONFIG_SPL_BUILD */ + +#endif	/* __CONFIG_CM_T335_H */ + diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 8a69c7d0a..48b47cbd0 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -83,4 +83,15 @@  #define CONFIG_OMAP_USB_PHY  #define CONFIG_OMAP_USB2PHY2_HOST +/* SATA */ +#define CONFIG_BOARD_LATE_INIT +#define CONFIG_CMD_SCSI +#define CONFIG_LIBATA +#define CONFIG_SCSI_AHCI +#define CONFIG_SCSI_AHCI_PLAT +#define CONFIG_SYS_SCSI_MAX_SCSI_ID	1 +#define CONFIG_SYS_SCSI_MAX_LUN		1 +#define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \ +						CONFIG_SYS_SCSI_MAX_LUN) +  #endif /* __CONFIG_DRA7XX_EVM_H */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 47d990208..c662cc03d 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -118,9 +118,6 @@  #define CONFIG_USB_EHCI_OMAP  #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	147 -#define CONFIG_USB_ULPI -#define CONFIG_USB_ULPI_VIEWPORT_OMAP -  #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3  #define CONFIG_USB_HOST_ETHER  #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 6820e424d..73dc08859 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -36,9 +36,6 @@  #define CONFIG_CMD_PING  #define CONFIG_CMD_DHCP -#define CONFIG_USB_ULPI -#define CONFIG_USB_ULPI_VIEWPORT_OMAP -  #include <configs/omap4_common.h>  #define CONFIG_CMD_NET diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 4d3a80029..2f128b8a6 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -69,4 +69,14 @@  /* Max time to hold reset on this board, see doc/README.omap-reset-time */  #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296 +#define CONFIG_BOARD_LATE_INIT +#define CONFIG_CMD_SCSI +#define CONFIG_LIBATA +#define CONFIG_SCSI_AHCI +#define CONFIG_SCSI_AHCI_PLAT +#define CONFIG_SYS_SCSI_MAX_SCSI_ID	1 +#define CONFIG_SYS_SCSI_MAX_LUN		1 +#define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \ +						CONFIG_SYS_SCSI_MAX_LUN) +  #endif /* __CONFIG_OMAP5_EVM_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 9296de09b..7db0eb8cb 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -487,4 +487,9 @@  #define CONFIG_BOOTCOUNT_LIMIT  #define CONFIG_BOOTCOUNT_ENV + +/* Enable Device-Tree (FDT) support */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_FDT +  #endif	/* ! __CONFIG_SIEMENS_AM33X_COMMON_H */ diff --git a/include/twl6030.h b/include/twl6030.h index b4035ba4f..7898699ea 100644 --- a/include/twl6030.h +++ b/include/twl6030.h @@ -110,9 +110,47 @@  #define CTRL_P2_EOCP2	(1 << 1)  #define CTRL_P2_BUSY	(1 << 0) +#define TWL6032_CTRL_P1	0x36 +#define CTRL_P1_SP1	(1 << 3) +  #define GPCH0_LSB	0x57  #define GPCH0_MSB	0x58 +#define TWL6032_GPCH0_LSB	0x3b + +#define TWL6032_GPSELECT_ISB	0x35 + +#define USB_PRODUCT_ID_LSB	0x02 + +#define TWL6030_GPADC_VBAT_CHNL	0x07 +#define TWL6032_GPADC_VBAT_CHNL	0x12 + +#define TWL6030_GPADC_CTRL	0x2e +#define TWL6032_GPADC_CTRL2	0x2f +#define GPADC_CTRL2_CH18_SCALER_EN	(1 << 2) +#define GPADC_CTRL_SCALER_DIV4		(1 << 3) + +#define TWL6030_VBAT_MULT	40 * 1000 +#define TWL6032_VBAT_MULT	25 * 1000 + +#define TWL6030_VBAT_SHIFT	(10 + 3) +#define TWL6032_VBAT_SHIFT	(12 + 2) + +enum twl603x_chip_type{ +	chip_TWL6030, +	chip_TWL6032, +	chip_TWL603X_cnt +}; + +struct twl6030_data{ +	u8 chip_type; +	u8 adc_rbase; +	u8 adc_ctrl; +	u8 adc_enable; +	int vbat_mult; +	int vbat_shift; +}; +  /* Functions to read and write from TWL6030 */  static inline int twl6030_i2c_write_u8(u8 chip_no, u8 reg, u8 val)  { |