diff options
author | Tom Rini <trini@konsulko.com> | 2015-08-24 16:06:03 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-24 16:06:03 -0400 |
commit | 7d31c6ab83d8a5875875eda041c0a1e756189917 (patch) | |
tree | 4294f1ed6c6dc162940d8a1b79f834879ffbe53a /include | |
parent | a31a415803b8850f52d78395103fca3bdd1d37af (diff) | |
parent | 3664fa1beec3921dcfed605a9b37f63dee28ce6a (diff) | |
download | u-boot-imx-7d31c6ab83d8a5875875eda041c0a1e756189917.zip u-boot-imx-7d31c6ab83d8a5875875eda041c0a1e756189917.tar.gz u-boot-imx-7d31c6ab83d8a5875875eda041c0a1e756189917.tar.bz2 |
Merge git://git.denx.de/u-boot-pxa
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/colibri_pxa270.h | 26 | ||||
-rw-r--r-- | include/configs/palmtreo680.h | 1 |
2 files changed, 26 insertions, 1 deletions
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index a1b64c6..4efc9c5 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -19,6 +19,9 @@ /* Avoid overwriting factory configuration block */ #define CONFIG_BOARD_SIZE_LIMIT 0x40000 +/* We will never enable dcache because we have to setup MMU first */ +#define CONFIG_SYS_DCACHE_OFF + /* * Environment settings */ @@ -56,6 +59,25 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_USB +/* I2C support */ +#ifdef CONFIG_SYS_I2C +#define CONFIG_CMD_I2C +#define CONFIG_SYS_I2C_PXA +#define CONFIG_PXA_STD_I2C +#define CONFIG_PXA_PWR_I2C +#define CONFIG_SYS_I2C_SPEED 100000 +#endif + +/* LCD support */ +#ifdef CONFIG_LCD +#define CONFIG_PXA_LCD +#define CONFIG_PXA_VGA +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_CONSOLE_SCROLL_LINES 10 +#define CONFIG_CMD_BMP +#define CONFIG_LCD_LOGO +#endif + /* * Networking Configuration */ @@ -122,16 +144,20 @@ */ #ifdef CONFIG_CMD_FLASH #define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */ +#define PHYS_FLASH_SIZE 0x02000000 /* 32 MB */ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 #define CONFIG_SYS_FLASH_CFI #define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT #define CONFIG_SYS_MAX_FLASH_SECT (4 + 255) #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_ERASE_TOUT (25 * CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_WRITE_TOUT (25 * CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_LOCK_TOUT (25 * CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_UNLOCK_TOUT (25 * CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 #define CONFIG_SYS_FLASH_PROTECTION 1 diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h index ffb0d1e..5ffed82 100644 --- a/include/configs/palmtreo680.h +++ b/include/configs/palmtreo680.h @@ -67,7 +67,6 @@ #define CONFIG_PXA_LCD #define CONFIG_ACX544AKN #define CONFIG_LCD_LOGO -#define CONFIG_SYS_LCD_PXA_NO_L_BIAS /* don't configure GPIO77 as L_BIAS */ #define LCD_BPP LCD_COLOR16 #define CONFIG_FB_ADDR 0x5c000000 /* internal SRAM */ #define CONFIG_CMD_BMP |