Merge branch 'master' of git://git.denx.de/u-boot-avr32
This commit is contained in:
commit
1cc619be8b
|
@ -130,7 +130,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
#define CONFIG_ATMEL_SPI
|
||||
|
||||
#define CONFIG_SPI_FLASH
|
||||
|
|
|
@ -154,7 +154,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
#define CONFIG_ATMEL_SPI
|
||||
|
||||
#define CONFIG_SPI_FLASH
|
||||
|
|
|
@ -153,7 +153,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#define CONFIG_SYS_DCACHE_LINESZ 32
|
||||
#define CONFIG_SYS_ICACHE_LINESZ 32
|
||||
|
|
|
@ -137,7 +137,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#define CONFIG_SYS_DCACHE_LINESZ 32
|
||||
#define CONFIG_SYS_ICACHE_LINESZ 32
|
||||
|
|
|
@ -137,7 +137,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#define CONFIG_SYS_DCACHE_LINESZ 32
|
||||
#define CONFIG_SYS_ICACHE_LINESZ 32
|
||||
|
|
|
@ -153,7 +153,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#define CONFIG_SYS_DCACHE_LINESZ 32
|
||||
#define CONFIG_SYS_ICACHE_LINESZ 32
|
||||
|
|
|
@ -152,7 +152,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#define CONFIG_SYS_DCACHE_LINESZ 32
|
||||
#define CONFIG_SYS_ICACHE_LINESZ 32
|
||||
|
|
|
@ -126,7 +126,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#define CONFIG_SYS_DCACHE_LINESZ 32
|
||||
#define CONFIG_SYS_ICACHE_LINESZ 32
|
||||
|
|
|
@ -131,7 +131,6 @@
|
|||
#define CONFIG_MMC
|
||||
#define CONFIG_GENERIC_ATMEL_MCI
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
|
||||
|
||||
#if defined(CONFIG_LCD)
|
||||
#define CONFIG_CMD_BMP
|
||||
|
|
Loading…
Reference in New Issue