diff options
| author | Tom Rini <trini@ti.com> | 2015-02-02 12:37:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-02 12:37:34 -0500 |
| commit | 37ffffb98d78c46c840fa6e3c835d915c4247827 (patch) | |
| tree | 9ecc87c3bdb7b3c821798fee7ef64bf73a5e597f /include | |
| parent | ade8bc14ad419f698406b162c9c5dfeee7406b4c (diff) | |
| parent | f3b4bc458de3285a04c5f60df6372ad5ca79fa60 (diff) | |
| download | blackbird-obmc-uboot-37ffffb98d78c46c840fa6e3c835d915c4247827.tar.gz blackbird-obmc-uboot-37ffffb98d78c46c840fa6e3c835d915c4247827.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/nokia_rx51.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_igep00x0.h | 18 |
3 files changed, 16 insertions, 4 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 76ce7deb95..f1c270c939 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -237,6 +237,7 @@ #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ #define CONFIG_NAND_OMAP_GPMC +#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 982b689f3c..46fc91e5e1 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -28,6 +28,7 @@ #define CONFIG_OMAP3_RX51 /* working with RX51 */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ #define CONFIG_OMAP_COMMON +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MACH_TYPE MACH_TYPE_NOKIA_RX51 diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index b2b3750c1e..6295ec505f 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -29,11 +29,21 @@ #define CONFIG_REVISION_TAG 1 -/* define to enable boot progress via leds */ -#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020) || \ - (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030) -#define CONFIG_SHOW_BOOT_PROGRESS +/* Status LED */ +#define CONFIG_STATUS_LED +#define CONFIG_BOARD_SPECIFIC_LED +#define CONFIG_GPIO_LED +#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020) +#define RED_LED_GPIO 27 +#endif +#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030) +#define RED_LED_GPIO 16 #endif +#define RED_LED_DEV 0 +#define STATUS_LED_BIT RED_LED_GPIO +#define STATUS_LED_STATE STATUS_LED_ON +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) +#define STATUS_LED_BOOT RED_LED_DEV /* GPIO banks */ #define CONFIG_OMAP3_GPIO_3 /* GPIO64 .. 95 is in GPIO bank 3 */ |
