diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 93 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 18 | ||||
| -rw-r--r-- | include/configs/dxr2.h | 94 | ||||
| -rw-r--r-- | include/configs/igep00x0.h | 1 | ||||
| -rw-r--r-- | include/configs/omap4_sdp4430.h | 1 | ||||
| -rw-r--r-- | include/configs/omap5_common.h | 19 | ||||
| -rw-r--r-- | include/configs/omap5_uevm.h | 3 | ||||
| -rw-r--r-- | include/configs/pxm2.h | 153 | ||||
| -rw-r--r-- | include/configs/rut.h | 156 | ||||
| -rw-r--r-- | include/configs/siemens-am33x-common.h | 461 | ||||
| -rw-r--r-- | include/configs/ti_am335x_common.h | 22 | ||||
| -rw-r--r-- | include/configs/ti_armv7_common.h | 26 | ||||
| -rw-r--r-- | include/video.h | 4 | 
13 files changed, 974 insertions, 77 deletions
| diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index e0a87f8bc..eae5a19f2 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -171,44 +171,6 @@  	"run mmcboot;" \  	"run nandboot;" -/* USB Composite download gadget - g_dnl */ -#define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET - -/* USB TI's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0403 -#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" - -/* USB Device Firmware Update support */ -#define CONFIG_DFU_FUNCTION -#define CONFIG_DFU_MMC -#define CONFIG_CMD_DFU -#define DFU_ALT_INFO_MMC \ -	"boot part 0 1;" \ -	"rootfs part 0 2;" \ -	"MLO fat 0 1;" \ -	"MLO.raw mmc 100 100;" \ -	"u-boot.img.raw mmc 300 400;" \ -	"spl-os-args.raw mmc 80 80;" \ -	"spl-os-image.raw mmc 900 2000;" \ -	"spl-os-args fat 0 1;" \ -	"spl-os-image fat 0 1;" \ -	"u-boot.img fat 0 1;" \ -	"uEnv.txt fat 0 1" -#ifdef CONFIG_NAND -#define CONFIG_DFU_NAND -#define DFU_ALT_INFO_NAND \ -	"SPL part 0 1;" \ -	"SPL.backup1 part 0 2;" \ -	"SPL.backup2 part 0 3;" \ -	"SPL.backup3 part 0 4;" \ -	"u-boot part 0 5;" \ -	"u-boot-spl-os part 0 6;" \ -	"kernel part 0 8;" \ -	"rootfs part 0 9" -#endif -  /* NS16550 Configuration */  #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */  #define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */ @@ -228,17 +190,26 @@  /* SPL */  #ifndef CONFIG_NOR_BOOT  #define CONFIG_SPL_YMODEM_SUPPORT + +/* CPSW support */ +#define CONFIG_SPL_ETH_SUPPORT + +/* USB gadget RNDIS */ +#define CONFIG_SPL_MUSB_NEW_SUPPORT + +/* General network SPL, both CPSW and USB gadget RNDIS */  #define CONFIG_SPL_NET_SUPPORT  #define CONFIG_SPL_ENV_SUPPORT  #define CONFIG_SPL_NET_VCI_STRING	"AM335x U-Boot SPL" -#define CONFIG_SPL_ETH_SUPPORT + +/* SPI flash. */  #define CONFIG_SPL_SPI_SUPPORT  #define CONFIG_SPL_SPI_FLASH_SUPPORT  #define CONFIG_SPL_SPI_LOAD  #define CONFIG_SPL_SPI_BUS		0  #define CONFIG_SPL_SPI_CS		0  #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000 -#define CONFIG_SPL_MUSB_NEW_SUPPORT +  #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"  #ifdef CONFIG_NAND @@ -274,13 +245,19 @@  #endif  /* - * USB configuration + * USB configuration.  We enable MUSB support, both for host and for + * gadget.  We set USB0 as peripheral and USB1 as host, based on the + * board schematic and physical port wired to each.  Then for host we + * add mass storage support and for gadget we add both RNDIS ethernet + * and DFU.   */  #define CONFIG_USB_MUSB_DSPS  #define CONFIG_ARCH_MISC_INIT  #define CONFIG_MUSB_GADGET  #define CONFIG_MUSB_PIO_ONLY  #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_GADGET +#define CONFIG_USBDOWNLOAD_GADGET  #define CONFIG_USB_GADGET_DUALSPEED  #define CONFIG_USB_GADGET_VBUS_DRAW	2  #define CONFIG_MUSB_HOST @@ -298,6 +275,11 @@  #define CONFIG_USB_ETHER  #define CONFIG_USB_ETH_RNDIS  #define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00" + +/* USB TI's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x0403 +#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"  #endif /* CONFIG_MUSB_GADGET */  #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) @@ -309,6 +291,35 @@  #undef CONFIG_SPL_ETH_SUPPORT  #endif +/* USB Device Firmware Update support */ +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_CMD_DFU +#define DFU_ALT_INFO_MMC \ +	"boot part 0 1;" \ +	"rootfs part 0 2;" \ +	"MLO fat 0 1;" \ +	"MLO.raw mmc 100 100;" \ +	"u-boot.img.raw mmc 300 400;" \ +	"spl-os-args.raw mmc 80 80;" \ +	"spl-os-image.raw mmc 900 2000;" \ +	"spl-os-args fat 0 1;" \ +	"spl-os-image fat 0 1;" \ +	"u-boot.img fat 0 1;" \ +	"uEnv.txt fat 0 1" +#ifdef CONFIG_NAND +#define CONFIG_DFU_NAND +#define DFU_ALT_INFO_NAND \ +	"SPL part 0 1;" \ +	"SPL.backup1 part 0 2;" \ +	"SPL.backup2 part 0 3;" \ +	"SPL.backup3 part 0 4;" \ +	"u-boot part 0 5;" \ +	"u-boot-spl-os part 0 6;" \ +	"kernel part 0 8;" \ +	"rootfs part 0 9" +#endif +  /*   * Default to using SPI for environment, etc.   * 0x000000 - 0x020000 : SPL (128KiB) diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 58786ffa9..4fbe768cb 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -26,21 +26,19 @@  #include <configs/omap5_common.h>  /* CPSW Ethernet */ -#define CONFIG_CMD_NET +#define CONFIG_CMD_NET			/* 'bootp' and 'tftp' */  #define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_CMD_MII -#define CONFIG_DRIVER_TI_CPSW -#define CONFIG_MII -#define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS		/* Configurable parts of CMD_DHCP */  #define CONFIG_BOOTP_DNS2  #define CONFIG_BOOTP_SEND_HOSTNAME  #define CONFIG_BOOTP_GATEWAY  #define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_NET_RETRY_COUNT         10 -#define CONFIG_NET_MULTI -#define CONFIG_PHY_GIGE +#define CONFIG_NET_RETRY_COUNT		10 +#define CONFIG_CMD_PING +#define CONFIG_CMD_MII +#define CONFIG_DRIVER_TI_CPSW		/* Driver for IP block */ +#define CONFIG_MII			/* Required in net/eth.c */ +#define CONFIG_PHY_GIGE			/* per-board part of CPSW */  #define CONFIG_PHYLIB  #define CONFIG_PHY_ADDR			2 diff --git a/include/configs/dxr2.h b/include/configs/dxr2.h new file mode 100644 index 000000000..cd553ec55 --- /dev/null +++ b/include/configs/dxr2.h @@ -0,0 +1,94 @@ +/* + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * U-Boot file:/include/configs/am335x_evm.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier:	GPL-2.0+ + */ + +#ifndef __CONFIG_DXR2_H +#define __CONFIG_DXR2_H + +#define CONFIG_SIEMENS_DXR2 +#define MACH_TYPE_DXR2			4315 +#define CONFIG_SIEMENS_MACH_TYPE	MACH_TYPE_DXR2 + +#include "siemens-am33x-common.h" + +#define CONFIG_SYS_MPUCLK	275 +#define DXR2_IOCTRL_VAL	0x18b +#define DDR_PLL_FREQ	266 +#define CONFIG_SPL_AM33XX_DO_NOT_ENABLE_RTC32K + +#define BOARD_DFU_BUTTON_GPIO	27 +#define BOARD_DFU_BUTTON_LED	64 + +#undef CONFIG_DOS_PARTITION +#undef CONFIG_CMD_FAT + + + /* Physical Memory Map */ +#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */ + +/* I2C Configuration */ +#define CONFIG_SYS_I2C_SPEED		100000 + +#define CONFIG_SYS_I2C_EEPROM_ADDR              0x50 +#define EEPROM_ADDR_DDR3 0x90 +#define EEPROM_ADDR_CHIP 0x120 + +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x300 + +#undef CONFIG_SPL_NET_SUPPORT +#undef CONFIG_SPL_NET_VCI_STRING +#undef CONFIG_SPL_ETH_SUPPORT + +#undef CONFIG_MII +#undef CONFIG_PHY_GIGE +#define CONFIG_PHY_ADDR			0 +#define CONFIG_PHY_SMSC + +#define CONFIG_FACTORYSET + +/* Watchdog */ +#define CONFIG_OMAP_WATCHDOG + +#ifndef CONFIG_SPL_BUILD + +/* Default env settings */ +#define CONFIG_EXTRA_ENV_SETTINGS \ +	"hostname=dxr2\0" \ +	"nand_img_size=0x300000\0" \ +	"optargs=\0" \ +	CONFIG_COMMON_ENV_SETTINGS + +#ifndef CONFIG_RESTORE_FLASH +/* set to negative value for no autoboot */ +#define CONFIG_BOOTDELAY		3 + +#define CONFIG_BOOTCOMMAND \ +"if dfubutton; then " \ +	"run dfu_start; " \ +	"reset; " \ +"fi;" \ +"if ping ${serverip}; then " \ +	"run net_nfs; " \ +"fi;" \ +"run nand_boot;" + +#else +#define CONFIG_BOOTDELAY		0 + +#define CONFIG_BOOTCOMMAND			\ +	"setenv autoload no; "			\ +	"dhcp; "				\ +	"if tftp 80000000 debrick.scr; then "	\ +		"source 80000000; "		\ +	"fi" +#endif +#endif	/* CONFIG_SPL_BUILD */ +#endif	/* ! __CONFIG_DXR2_H */ diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 722c56652..9982cf6e9 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -45,6 +45,7 @@  #define CONFIG_OF_LIBFDT  #define CONFIG_CMD_BOOTZ +#define CONFIG_SUPPORT_RAW_INITRD  /*   * NS16550 Configuration diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 3da78b657..f40e0b718 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -17,6 +17,7 @@   * High Level Configuration Options   */  #define CONFIG_4430SDP		1	/* working with SDP */ +#define CONFIG_MACH_TYPE	MACH_TYPE_OMAP_4430SDP  #include <configs/omap4_common.h> diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index 8e82fed23..98ba559c8 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -28,9 +28,12 @@  /* Use General purpose timer 1 */  #define CONFIG_SYS_TIMERBASE		GPT2_BASE +/* + * For the DDR timing information we can either dynamically determine + * the timings to use or use pre-determined timings (based on using the + * dynamic method.  Default to the static timing infomation. + */  #define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS - -/* Defines for SDRAM init */  #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS  #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION  #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS @@ -127,9 +130,15 @@  	"fi" -/* Defines for SPL */ -#define CONFIG_SPL_TEXT_BASE		0x40300350 -#define CONFIG_SPL_MAX_SIZE		0x19000	/* 100K */ +/* + * SPL related defines.  The Public RAM memory map the ROM defines the + * area between 0x40300000 and 0x4031E000 as a download area for OMAP5 + * (dra7xx is larger, but we do not need to be larger at this time).  We + * set CONFIG_SPL_DISPLAY_PRINT to have omap_rev_string() called and + * print some information. + */ +#define CONFIG_SPL_TEXT_BASE		0x40300000 +#define CONFIG_SPL_MAX_SIZE		(0x4031E000 - CONFIG_SPL_TEXT_BASE)  #define CONFIG_SPL_DISPLAY_PRINT  #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 3c4249bdd..0d1c43c2e 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -37,6 +37,7 @@  #define CONFIG_PARTITION_UUIDS  #define CONFIG_CMD_PART +/* Required support for the TCA642X GPIO we have on the uEVM */  #define CONFIG_TCA642X  #define CONFIG_CMD_TCA642X  #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 @@ -64,6 +65,8 @@  #define CONFIG_USB_ETHER_SMSC95XX  #define CONSOLEDEV		"ttyO2" + +/* Max time to hold reset on this board, see doc/README.omap-reset-time */  #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296  #endif /* __CONFIG_OMAP5_EVM_H */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h new file mode 100644 index 000000000..20b0f9ab4 --- /dev/null +++ b/include/configs/pxm2.h @@ -0,0 +1,153 @@ +/* + * siemens pxm2 + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * U-Boot file:/include/configs/am335x_evm.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier:	GPL-2.0+ + */ + +#ifndef __CONFIG_PXM2_H +#define __CONFIG_PXM2_H + +#define CONFIG_SIEMENS_PXM2 +#define MACH_TYPE_PXM2			4309 +#define CONFIG_SIEMENS_MACH_TYPE	MACH_TYPE_PXM2 + +#include "siemens-am33x-common.h" + +#define CONFIG_SYS_MPUCLK	720 +#define DXR2_IOCTRL_VAL		0x18b +#define DDR_PLL_FREQ		266 + +#define BOARD_DFU_BUTTON_GPIO	59 +#define BOARD_DFU_BUTTON_LED	117 +#define BOARD_LCD_POWER		111 +#define BOARD_BACK_LIGHT	112 +#define BOARD_TOUCH_POWER	57 + + /* Physical Memory Map */ +#define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 1GB */ + +/* I2C Configuration */ +#define CONFIG_SYS_I2C_SPEED		400000 +#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50 + + +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x300 + +#undef CONFIG_SPL_NET_SUPPORT +#undef CONFIG_SPL_NET_VCI_STRING +#undef CONFIG_SPL_ETH_SUPPORT + +#define CONFIG_PHY_ADDR			0 +#define CONFIG_PHY_ATHEROS + +#define CONFIG_FACTORYSET + +/* UBI Support */ +#ifndef CONFIG_SPL_BUILD +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE +#define CONFIG_RBTREE +#define CONFIG_LZO +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#endif + +/* Watchdog */ +#define CONFIG_OMAP_WATCHDOG + +#ifndef CONFIG_SPL_BUILD + +/* Default env settings */ +#define CONFIG_EXTRA_ENV_SETTINGS \ +	"hostname=pxm2\0" \ +	"nand_img_size=0x500000\0" \ +	"optargs=\0" \ +	CONFIG_COMMON_ENV_SETTINGS \ +	"mmc_dev=0\0" \ +	"mmc_root=/dev/mmcblk0p2 rw\0" \ +	"mmc_root_fs_type=ext4 rootwait\0" \ +	"mmc_load_uimage=" \ +		"mmc rescan; " \ +		"setenv bootfile uImage;" \ +		"fatload mmc ${mmc_dev} ${kloadaddr} ${bootfile}\0" \ +	"loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \ +	"importbootenv=echo Importing environment from mmc ...; " \ +		"env import -t $loadaddr $filesize\0" \ +	"mmc_args=run bootargs_defaults;" \ +		"mtdparts default;" \ +		"setenv bootargs ${bootargs} " \ +		"root=${mmc_root} ${mtdparts}" \ +		"rootfstype=${mmc_root_fs_type} ip=${ip_method} " \ +		"eth=${ethaddr} " \ +		"\0" \ +	"mmc_boot=run mmc_args; " \ +		"run mmc_load_uimage; " \ +		"bootm ${kloadaddr}\0" \ +	"" + +#ifndef CONFIG_RESTORE_FLASH +/* set to negative value for no autoboot */ +#define CONFIG_BOOTDELAY		3 + +#define CONFIG_BOOTCOMMAND \ +	"if dfubutton; then " \ +		"run dfu_start; " \ +		"reset; " \ +	"fi; " \ +	"if mmc rescan; then " \ +		"echo SD/MMC found on device ${mmc_dev};" \ +		"if run loadbootenv; then " \ +			"echo Loaded environment from ${bootenv};" \ +			"run importbootenv;" \ +		"fi;" \ +		"if test -n $uenvcmd; then " \ +			"echo Running uenvcmd ...;" \ +			"run uenvcmd;" \ +		"fi;" \ +		"if run mmc_load_uimage; then " \ +			"run mmc_args;" \ +			"bootm ${kloadaddr};" \ +		"fi;" \ +	"fi;" \ +	"run nand_boot;" \ +	"if ping ${serverip}; then " \ +		"run net_nfs; " \ +	"fi; " + +#else +#define CONFIG_BOOTDELAY		0 + +#define CONFIG_BOOTCOMMAND			\ +	"setenv autoload no; "			\ +	"dhcp; "				\ +	"if tftp 80000000 debrick.scr; then "	\ +		"source 80000000; "		\ +	"fi" +#endif +#endif	/* CONFIG_SPL_BUILD */ + +#define CONFIG_VIDEO +#if defined(CONFIG_VIDEO) +#define CONFIG_VIDEO_DA8XX +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_LOGO +#define CONFIG_CMD_BMP +#define DA8XX_LCD_CNTL_BASE	LCD_CNTL_BASE +#define PWM_TICKS	0x1388 +#define PWM_DUTY	0x200 +#endif + +#endif	/* ! __CONFIG_PXM2_H */ diff --git a/include/configs/rut.h b/include/configs/rut.h new file mode 100644 index 000000000..7c94644de --- /dev/null +++ b/include/configs/rut.h @@ -0,0 +1,156 @@ +/* + * siemens rut + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * U-Boot file:/include/configs/am335x_evm.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier:	GPL-2.0+ + */ + +#ifndef __CONFIG_RUT_H +#define __CONFIG_RUT_H + +#define CONFIG_SIEMENS_RUT +#define MACH_TYPE_RUT			4316 +#define CONFIG_SIEMENS_MACH_TYPE	MACH_TYPE_RUT + +#include "siemens-am33x-common.h" + +#define CONFIG_SYS_MPUCLK	600 +#define RUT_IOCTRL_VAL	0x18b +#define DDR_PLL_FREQ	303 + + /* Physical Memory Map */ +#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20) /* 256 MiB */ + +/* I2C Configuration */ +#define CONFIG_SYS_I2C_SPEED		100000 + +#define CONFIG_SYS_I2C_EEPROM_ADDR              0x50 +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN          2 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS       6       /* 64 byte pages */ +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS   10      /* take up to 10 msec */ + +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 + +#undef CONFIG_SPL_NET_SUPPORT +#undef CONFIG_SPL_NET_VCI_STRING +#undef CONFIG_SPL_ETH_SUPPORT + +#define CONFIG_PHY_ADDR			1 +#define CONFIG_PHY_NATSEMI + +#define CONFIG_FACTORYSET + +/* UBI Support */ +#ifndef CONFIG_SPL_BUILD +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE +#define CONFIG_RBTREE +#define CONFIG_LZO +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#endif + +/* Watchdog */ +#define WATCHDOG_TRIGGER_GPIO	14 + +#ifndef CONFIG_SPL_BUILD + +/* Default env settings */ +#define CONFIG_EXTRA_ENV_SETTINGS \ +	"hostname=rut\0" \ +	"splashpos=488,352\0" \ +	"optargs=fixrtc --no-log consoleblank=0 \0" \ +	CONFIG_COMMON_ENV_SETTINGS \ +	"mmc_dev=0\0" \ +	"mmc_root=/dev/mmcblk0p2 rw\0" \ +	"mmc_root_fs_type=ext4 rootwait\0" \ +	"mmc_load_uimage=" \ +		"mmc rescan; " \ +		"setenv bootfile uImage;" \ +		"fatload mmc ${mmc_dev} ${kloadaddr} ${bootfile}\0" \ +	"loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \ +	"importbootenv=echo Importing environment from mmc ...; " \ +		"env import -t $loadaddr $filesize\0" \ +	"mmc_args=run bootargs_defaults;" \ +		"mtdparts default;" \ +		"setenv bootargs ${bootargs} " \ +		"root=${mmc_root} ${mtdparts}" \ +		"rootfstype=${mmc_root_fs_type} ip=${ip_method} " \ +		"eth=${ethaddr} " \ +		"\0" \ +	"mmc_boot=run mmc_args; " \ +		"run mmc_load_uimage; " \ +		"bootm ${kloadaddr}\0" \ +	"" + +#ifndef CONFIG_RESTORE_FLASH +/* set to negative value for no autoboot */ +#define CONFIG_BOOTDELAY		3 + +#define CONFIG_BOOTCOMMAND \ +	"if mmc rescan; then " \ +		"echo SD/MMC found on device ${mmc_dev};" \ +		"if run loadbootenv; then " \ +			"echo Loaded environment from ${bootenv};" \ +			"run importbootenv;" \ +		"fi;" \ +		"if test -n $uenvcmd; then " \ +			"echo Running uenvcmd ...;" \ +			"run uenvcmd;" \ +		"fi;" \ +		"if run mmc_load_uimage; then " \ +			"run mmc_args;" \ +			"bootm ${kloadaddr};" \ +		"fi;" \ +	"fi;" \ +	"run nand_boot;" \ +	"if ping ${serverip}; then " \ +		"run net_nfs; " \ +	"fi; " + +#else +#define CONFIG_BOOTDELAY		0 + +#define CONFIG_BOOTCOMMAND			\ +	"setenv autoload no; "			\ +	"dhcp; "				\ +	"if tftp 80000000 debrick.scr; then "	\ +		"source 80000000; "		\ +	"fi" +#endif + +#endif /* CONFIG_SPL_BUILD */ + +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_HW_WATCHDOG +#endif + +#define CONFIG_VIDEO +#if defined(CONFIG_VIDEO) +#define CONFIG_VIDEO_DA8XX +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_LOGO +#define CONFIG_CMD_BMP +#define DA8XX_LCD_CNTL_BASE	LCD_CNTL_BASE + +#define CONFIG_SPI +#define CONFIG_OMAP3_SPI + +#define BOARD_LCD_RESET		115	/* Bank 3 pin 19 */ +#define CONFIG_ARCH_EARLY_INIT_R +#define CONFIG_FORMIKE +#endif + +#endif	/* ! __CONFIG_RUT_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h new file mode 100644 index 000000000..5426ee872 --- /dev/null +++ b/include/configs/siemens-am33x-common.h @@ -0,0 +1,461 @@ +/* + * siemens am33x common board options + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * U-Boot file:/include/configs/am335x_evm.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier:	GPL-2.0+ + */ + +#ifndef __CONFIG_SIEMENS_AM33X_COMMON_H +#define __CONFIG_SIEMENS_AM33X_COMMON_H + +#define CONFIG_AM33XX +#define CONFIG_OMAP +#define CONFIG_OMAP_COMMON + +#include <asm/arch/omap.h> + +#define CONFIG_DMA_COHERENT +#define CONFIG_DMA_COHERENT_SIZE	(1 << 20) + +#define CONFIG_ENV_SIZE			(0x2000) +#define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024) +#define CONFIG_SYS_LONGHELP		/* undef to save memory */ +#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */ +#define CONFIG_SYS_PROMPT		"U-Boot# " +#define CONFIG_SYS_PROMPT_HUSH_PS2	"> " +#define CONFIG_BOARD_LATE_INIT +#define CONFIG_SYS_NO_FLASH +#define CONFIG_MACH_TYPE		CONFIG_SIEMENS_MACH_TYPE + +#define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +#define CONFIG_SYS_CACHELINE_SIZE       64 + +/* commands to include */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_ECHO +#define CONFIG_CMD_CACHE + +#define CONFIG_ENV_VARS_UBOOT_CONFIG +#ifndef CONFIG_SPL_BUILD +#define CONFIG_ROOTPATH		"/opt/eldk" +#endif + +#define CONFIG_ENV_OVERWRITE		1 +#define CONFIG_ENV_IS_NOWHERE + +#define CONFIG_SYS_LONGHELP +#define CONFIG_CMDLINE_EDITING +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_AUTOLOAD	"yes" + +/* Clock Defines */ +#define V_OSCK				24000000  /* Clock output from T2 */ +#define V_SCLK				(V_OSCK) + +/* We set the max number of command args high to avoid HUSH bugs. */ +#define CONFIG_SYS_MAXARGS		32 + +/* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE		512 + +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \ +					+ sizeof(CONFIG_SYS_PROMPT) + 16) + +/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE + +/* + * memtest works on 8 MB in DRAM after skipping 32MB from + * start addr of ram disk + */ +#define CONFIG_SYS_MEMTEST_START	(PHYS_DRAM_1 + (64 * 1024 * 1024)) +#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START \ +					+ (8 * 1024 * 1024)) + +#define CONFIG_SYS_LOAD_ADDR		0x81000000 /* Default load address */ +#define CONFIG_SYS_HZ			1000 /* 1ms clock */ + +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_OMAP_HSMMC +#define CONFIG_CMD_MMC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT2 + +#define CONFIG_SPI +#define CONFIG_OMAP3_SPI +#define CONFIG_MTD_DEVICE +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_WINBOND +#define CONFIG_CMD_SF +#define CONFIG_SF_DEFAULT_SPEED		(75000000) + + /* Physical Memory Map */ +#define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */ +#define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */ + +#define CONFIG_SYS_SDRAM_BASE		PHYS_DRAM_1 +#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \ +						GENERATED_GBL_DATA_SIZE) + /* Platform/Board specific defs */ +#define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */ +#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */ +#define CONFIG_SYS_HZ			1000 + +/* NS16550 Configuration */ +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550_REG_SIZE	(-4) +#define CONFIG_SYS_NS16550_CLK		(48000000) +#define CONFIG_SYS_NS16550_COM1		0x44e09000 +#define CONFIG_SYS_NS16550_COM4		0x481a6000 + +#define CONFIG_BAUDRATE		115200 + +#define CONFIG_SYS_CONSOLE_INFO_QUIET +#define CONFIG_SERIAL1                  1 +#define CONFIG_CONS_INDEX               1 + +/* I2C Configuration */ +#define CONFIG_I2C +#define CONFIG_CMD_I2C +#define CONFIG_HARD_I2C +#define CONFIG_SYS_I2C_SLAVE		1 +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_DRIVER_OMAP24XX_I2C + + +/* Defines for SPL */ +#define CONFIG_SPL +#define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_TEXT_BASE		0x402F0400 +#define CONFIG_SPL_MAX_SIZE		(101 * 1024) +#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR + +#define CONFIG_SPL_BSS_START_ADDR	0x80000000 +#define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */ + +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */ +#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1 +#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img" +#define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_FS_FAT +#define CONFIG_SPL_I2C_SUPPORT + +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_LIBDISK_SUPPORT +#define CONFIG_SPL_LIBGENERIC_SUPPORT +#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_YMODEM_SUPPORT + +#define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL_WATCHDOG_SUPPORT + +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_LOAD +#define CONFIG_SPL_SPI_BUS		0 +#define CONFIG_SPL_SPI_CS		0 +#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000 + +#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds" + +#define CONFIG_SPL_BOARD_INIT +#define CONFIG_SPL_NAND_AM33XX_BCH +#define CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SPL_NAND_BASE +#define CONFIG_SPL_NAND_DRIVERS +#define CONFIG_SPL_NAND_ECC +#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_ECCSTEPS	4 +#define	CONFIG_SYS_NAND_ECCTOTAL	(CONFIG_SYS_NAND_ECCBYTES * \ +						CONFIG_SYS_NAND_ECCSTEPS) + +#define	CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE + +#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000 + +/* + * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM + * 64 bytes before this address should be set aside for u-boot.img's + * header. That is 0x800FFFC0--0x80100000 should not be used for any + * other needs. + */ +#define CONFIG_SYS_TEXT_BASE		0x80100000 +#define CONFIG_SYS_SPL_MALLOC_START	0x80208000 +#define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000 + +/* + * Since SPL did pll and ddr initialization for us, + * we don't need to do it twice. + */ +#ifndef CONFIG_SPL_BUILD +#define CONFIG_SKIP_LOWLEVEL_INIT +#endif + +#ifndef CONFIG_SPL_BUILD +/* + * USB configuration + */ +#define CONFIG_USB_MUSB_DSPS +#define CONFIG_ARCH_MISC_INIT +#define CONFIG_MUSB_GADGET +#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW	2 +#define CONFIG_MUSB_HOST + +#define CONFIG_AM335X_USB0 +#define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL +#define CONFIG_AM335X_USB1 +#define CONFIG_AM335X_USB1_MODE MUSB_HOST +#ifdef CONFIG_MUSB_HOST +#define CONFIG_CMD_USB +#define CONFIG_USB_STORAGE +#endif + +#ifdef CONFIG_MUSB_GADGET +#define CONFIG_USB_ETHER +#define CONFIG_USB_ETH_RNDIS +#define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00" +#endif /* CONFIG_MUSB_GADGET */ + +#define CONFIG_USB_GADGET +#define CONFIG_USBDOWNLOAD_GADGET + +/* USB TI's IDs */ +#define CONFIG_USBD_HS +#define CONFIG_G_DNL_VENDOR_NUM 0x0525 +#define CONFIG_G_DNL_PRODUCT_NUM 0x4a47 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" + +/* USB Device Firmware Update support */ +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_NAND +#define CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE	(1 << 20) + +#endif /* CONFIG_SPL_BUILD */ + +/* + * Default to using SPI for environment, etc.  We have multiple copies + * of SPL as the ROM will check these locations. + * 0x0 - 0x20000 : First copy of SPL + * 0x20000 - 0x40000 : Second copy of SPL + * 0x40000 - 0x60000 : Third copy of SPL + * 0x60000 - 0x80000 : Fourth copy of SPL + * 0x80000 - 0xDF000 : U-Boot + * 0xDF000 - 0xE0000 : U-Boot Environment + * 0xE0000 - 0x442000 : Linux Kernel + * 0x442000 - 0x800000 : Userland + */ +#if defined(CONFIG_SPI_BOOT) +# undef CONFIG_ENV_IS_NOWHERE +# define CONFIG_ENV_IS_IN_SPI_FLASH +# define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED +# define CONFIG_ENV_OFFSET		(892 << 10) /* 892 KiB in */ +# define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */ +#endif /* SPI support */ + +/* Unsupported features */ +#undef CONFIG_USE_IRQ + +#define CONFIG_CMD_NET +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_DRIVER_TI_CPSW +#define CONFIG_MII +#define CONFIG_PHY_GIGE +#define CONFIG_PHYLIB +#define CONFIG_CMD_MII +#define CONFIG_BOOTP_DEFAULT +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_NET_RETRY_COUNT         10 +#define CONFIG_NET_MULTI + +#define CONFIG_NAND +/* NAND support */ +#ifdef CONFIG_NAND +#define CONFIG_CMD_NAND +#define CONFIG_CMD_MTDPARTS + +#define MTDIDS_NAME_STR		"omap2-nand.0" +#define MTDIDS_DEFAULT		"nand0=" MTDIDS_NAME_STR +#define MTDPARTS_DEFAULT	"mtdparts=" MTDIDS_NAME_STR ":" \ +					"128k(spl),"		\ +					"128k(spl.backup1),"	\ +					"128k(spl.backup2),"	\ +					"128k(spl.backup3),"	\ +					"1920k(u-boot),"	\ +					"128k(uboot.env),"	\ +					"5120k(kernel_a),"	\ +					"5120k(kernel_b),"	\ +					"8192k(mtdoops),"	\ +					"-(rootfs)" +/* + * chip-size = 256MiB + *|         name |        size |           address area | + *------------------------------------------------------- + *|          spl | 128.000 KiB | 0x       0..0x   1ffff | + *|  spl.backup1 | 128.000 KiB | 0x   20000..0x   3ffff | + *|  spl.backup2 | 128.000 KiB | 0x   40000..0x   5ffff | + *|  spl.backup3 | 128.000 KiB | 0x   60000..0x   7ffff | + *|       u-boot |   1.875 MiB | 0x   80000..0x  25ffff | + *|    uboot.env | 128.000 KiB | 0x  260000..0x  27ffff | + *|     kernel_a |   5.000 MiB | 0x  280000..0x  77ffff | + *|     kernel_b |   5.000 MiB | 0x  780000..0x  c7ffff | + *|      mtdoops |   8.000 MiB | 0x  c80000..0x 147ffff | + *|       rootfs | 235.500 MiB | 0x 1480000..0x fffffff | + *------------------------------------------------------- + */ + +#define DFU_ALT_INFO_NAND \ +	"spl part 0 1;" \ +	"spl.backup1 part 0 2;" \ +	"spl.backup2 part 0 3;" \ +	"spl.backup3 part 0 4;" \ +	"u-boot part 0 5;" \ +	"u-boot.env part 0 6;" \ +	"kernel_a part 0 7;" \ +	"kernel_b part 0 8;" \ +	"rootfs partubi 0 10" + +#define CONFIG_COMMON_ENV_SETTINGS \ +	"verify=no \0" \ +	"project_dir=systemone\0" \ +	"loadaddr=0x82000000\0" \ +	"kloadaddr=0x81000000\0" \ +	"script_addr=0x81900000\0" \ +	"console=console=ttyMTD,mtdoops console=ttyO0,115200n8\0" \ +	"active_set=a\0" \ +	"nand_active_ubi_vol=rootfs_a\0" \ +	"nand_root_fs_type=ubifs rootwait=1\0" \ +	"nand_src_addr=0x280000\0" \ +	"nand_src_addr_a=0x280000\0" \ +	"nand_src_addr_b=0x780000\0" \ +	"nfsopts=nolock rw mem=128M\0" \ +	"ip_method=none\0" \ +	"bootenv=uEnv.txt\0" \ +	"bootargs_defaults=setenv bootargs " \ +		"console=${console} " \ +		"${optargs}\0" \ +	"nand_args=run bootargs_defaults;" \ +		"mtdparts default;" \ +		"setenv nand_active_ubi_vol rootfs_${active_set};" \ +		"setenv ${active_set} true;" \ +		"if test -n ${a}; then " \ +			"setenv nand_src_addr ${nand_src_addr_a};" \ +		"fi;" \ +		"if test -n ${b}; then " \ +			"setenv nand_src_addr ${nand_src_addr_b};" \ +		"fi;" \ +		"setenv nand_root ubi0:${nand_active_ubi_vol} rw " \ +		"ubi.mtd=9,2048;" \ +		"setenv bootargs ${bootargs} " \ +		"root=${nand_root} noinitrd ${mtdparts} " \ +		"rootfstype=${nand_root_fs_type} ip=${ip_method} " \ +		"console=ttyMTD,mtdoops console=ttyO0,115200n8 mtdoops.mtddev" \ +		"=mtdoops\0" \ +	"dfu_args=run bootargs_defaults;" \ +		"setenv bootargs ${bootargs} ;" \ +		"mtdparts default; " \ +		"dfu nand 0; \0" \ +		"dfu_alt_info=" DFU_ALT_INFO_NAND "\0" \ +	"net_args=run bootargs_defaults;" \ +		"mtdparts default;" \ +		"setenv bootfile ${project_dir}/kernel/uImage;" \ +		"setenv rootpath /home/projects/${project_dir}/rootfs;" \ +		"setenv bootargs ${bootargs} " \ +		"root=/dev/nfs ${mtdparts} " \ +		"nfsroot=${serverip}:${rootpath},${nfsopts} " \ +		"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ +		"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \ +	"nand_boot=echo Booting from nand, active set ${active_set} ...; " \ +		"run nand_args; " \ +		"nand read.i ${kloadaddr} ${nand_src_addr} " \ +		"${nand_img_size}; bootm ${kloadaddr}\0" \ +	"net_nfs=echo Booting from network ...; " \ +		"run net_args; " \ +		"tftpboot ${kloadaddr} ${serverip}:${bootfile}; " \ +		"bootm ${kloadaddr}\0" \ +	"flash_self=run nand_boot\0" \ +	"flash_self_test=setenv bootargs_defaults ${bootargs_defaults} test; " \ +		"run nand_boot\0" \ +	"dfu_start=echo Preparing for dfu mode ...; " \ +		"run dfu_args; \0" \ +	"preboot=echo; "\ +		"echo Type 'run flash_self' to use kernel and root " \ +		"filesystem on memory; echo Type 'run flash_self_test' to " \ +		"use kernel and root filesystem on memory, boot in test " \ +		"mode; echo Not ready yet: 'run flash_nfs' to use kernel " \ +		"from memory and root filesystem over NFS; echo Type " \ +		"'run net_nfs' to get Kernel over TFTP and mount root " \ +		"filesystem over NFS; echo Set active_set variable to 'a' " \ +		"or 'b' to select kernel and rootfs partition; " \ +		"echo" \ +		"\0" + +#define CONFIG_NAND_OMAP_GPMC +#define GPMC_NAND_ECC_LP_x16_LAYOUT	1 +#define CONFIG_SYS_NAND_BASE		(0x08000000)	/* physical address */ +							/* to access nand at */ +							/* CS0 */ +#define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND +							   devices */ +#if !defined(CONFIG_SPI_BOOT) +#undef CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET		0x260000 /* environment starts here */ +#define CONFIG_SYS_ENV_SECT_SIZE	(128 << 10)	/* 128 KiB */ +#endif +#endif + +#define CONFIG_OMAP_GPIO + +/* Watchdog */ +#define CONFIG_HW_WATCHDOG + +/* Stop autoboot with ESC ESC key detected */ +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_STOP_STR	"\x1b\x1b" +#define CONFIG_AUTOBOOT_PROMPT	"Autobooting in %d seconds, "		\ +				"press \"<Esc><Esc>\" to stop\n", bootdelay + +#endif	/* ! __CONFIG_SIEMENS_AM33X_COMMON_H */ diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index fd3ffab01..d2e34aeed 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -28,23 +28,27 @@  #define CONFIG_SYS_NS16550_CLK		48000000  /* Network defines. */ -#define CONFIG_CMD_NET +#define CONFIG_CMD_NET			/* 'bootp' and 'tftp' */  #define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_DRIVER_TI_CPSW -#define CONFIG_MII -#define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS		/* Configurable parts of CMD_DHCP */  #define CONFIG_BOOTP_DNS2  #define CONFIG_BOOTP_SEND_HOSTNAME  #define CONFIG_BOOTP_GATEWAY  #define CONFIG_BOOTP_SUBNETMASK  #define CONFIG_NET_RETRY_COUNT         10 +#define CONFIG_CMD_PING +#define CONFIG_DRIVER_TI_CPSW		/* Driver for IP block */ +#define CONFIG_MII			/* Required in net/eth.c */ -/* SPL defines. */ +/* + * SPL related defines.  The Public RAM memory map the ROM defines the + * area between 0x402F0400 and 0x4030B800 as a download area and + * 0x4030B800 to 0x4030CE00 as a public stack area.  The ROM also + * supports X-MODEM loading via UART, and we leverage this and then use + * Y-MODEM to load u-boot.img, when booted over UART. + */  #define CONFIG_SPL_TEXT_BASE		0x402F0400 -#define CONFIG_SPL_MAX_SIZE		(0x4030C000 - CONFIG_SPL_TEXT_BASE) -#define CONFIG_SPL_YMODEM_SUPPORT +#define CONFIG_SPL_MAX_SIZE		(0x4030B800 - CONFIG_SPL_TEXT_BASE)  /*   * Since SPL did pll and ddr initialization for us, diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index e0ab6912b..e89e8744d 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -60,12 +60,12 @@  /* I2C IP block */  #define CONFIG_I2C -#define CONFIG_CMD_I2C  #define CONFIG_HARD_I2C  #define CONFIG_SYS_I2C_SPEED		100000  #define CONFIG_SYS_I2C_SLAVE		1  #define CONFIG_I2C_MULTI_BUS  #define CONFIG_DRIVER_OMAP24XX_I2C +#define CONFIG_CMD_I2C  /* MMC/SD IP block */  #define CONFIG_MMC @@ -87,10 +87,10 @@   * access CS0 at is 0x8000000.   */  #ifdef CONFIG_NAND -#define CONFIG_CMD_NAND  #define CONFIG_NAND_OMAP_GPMC  #define CONFIG_SYS_NAND_BASE		0x8000000  #define CONFIG_SYS_MAX_NAND_DEVICE	1 +#define CONFIG_CMD_NAND  #endif  /* @@ -103,14 +103,18 @@   * console baudrate of 115200 and use the default baud rate table.   */  #define CONFIG_SYS_MALLOC_LEN		(1024 << 10) -#define CONFIG_SYS_LONGHELP  #define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT		"U-Boot# " +#define CONFIG_SYS_CONSOLE_INFO_QUIET +#define CONFIG_BAUDRATE			115200 +#define CONFIG_ENV_VARS_UBOOT_CONFIG	/* Strongly encouraged */ +#define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */ + +/* As stated above, the following choices are optional. */ +#define CONFIG_SYS_LONGHELP  #define CONFIG_AUTO_COMPLETE  #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_PROMPT		"U-Boot# "  #define CONFIG_VERSION_VARIABLE -#define CONFIG_ENV_VARS_UBOOT_CONFIG -#define CONFIG_BAUDRATE			115200  /* We set the max number of command args high to avoid HUSH bugs. */  #define CONFIG_SYS_MAXARGS		64 @@ -123,9 +127,6 @@  /* Boot Argument Buffer Size */  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE -#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_CONSOLE_INFO_QUIET -  /*   * When we have SPI, NOR or NAND flash we expect to be making use of   * mtdparts, both for ease of use in U-Boot and for passing information @@ -141,7 +142,8 @@   * useful commands.  Note that we must have set CONFIG_SYS_NO_FLASH   * prior to this include, in order to skip a few commands.  When we do   * have flash, if we expect these commands they must be enabled in that - * config. + * config.  If desired, a specific list of desired commands can be used + * instead.   */  #include <config_cmd_default.h>  #define CONFIG_CMD_ASKENV @@ -223,14 +225,14 @@  #endif  #ifdef CONFIG_MMC +#define CONFIG_SPL_LIBDISK_SUPPORT  #define CONFIG_SPL_MMC_SUPPORT  #define CONFIG_SPL_FAT_SUPPORT  #endif -/* General parts of the framework. */ +/* General parts of the framework, required. */  #define CONFIG_SPL_I2C_SUPPORT  #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBDISK_SUPPORT  #define CONFIG_SPL_LIBGENERIC_SUPPORT  #define CONFIG_SPL_SERIAL_SUPPORT  #define CONFIG_SPL_GPIO_SUPPORT diff --git a/include/video.h b/include/video.h index f7e27f847..0ff857bc9 100644 --- a/include/video.h +++ b/include/video.h @@ -63,4 +63,8 @@ void video_position_cursor(unsigned col, unsigned row);  /* Clear the display */  void video_clear(void); +#if defined(CONFIG_FORMIKE) +int kwh043st20_f01_spi_startup(unsigned int bus, unsigned int cs, +	unsigned int max_hz, unsigned int spi_mode); +#endif  #endif |