diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-31 19:15:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-31 19:15:59 -0400 |
| commit | 10697704ca579850b0edc0e772671c32586d76ee (patch) | |
| tree | f21e248ad0a081d56f96c16d524be5761a46091e /configs | |
| parent | 482cbd553daf3d9cd21e564702bac84a6bd43f2f (diff) | |
| parent | b2d387bcebba352ca64b781486507800964d7ffd (diff) | |
| download | u-boot-imx-10697704ca579850b0edc0e772671c32586d76ee.zip u-boot-imx-10697704ca579850b0edc0e772671c32586d76ee.tar.gz u-boot-imx-10697704ca579850b0edc0e772671c32586d76ee.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/at91sam9m10g45ek_mmc_defconfig | 1 | ||||
| -rw-r--r-- | configs/at91sam9m10g45ek_nandflash_defconfig | 1 | ||||
| -rw-r--r-- | configs/at91sam9n12ek_nandflash_defconfig | 1 | ||||
| -rw-r--r-- | configs/at91sam9n12ek_spiflash_defconfig | 1 | ||||
| -rw-r--r-- | configs/at91sam9x5ek_nandflash_defconfig | 1 | ||||
| -rw-r--r-- | configs/at91sam9x5ek_spiflash_defconfig | 1 | ||||
| -rw-r--r-- | configs/corvus_defconfig | 2 |
7 files changed, 7 insertions, 1 deletions
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index 6949d3a..f3e1ebe 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC" CONFIG_ARM=y CONFIG_ARCH_AT91=y diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index 30967e3..5e0b16e 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index f908246..11b42d4 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index d106b5a..5426bcd 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index c2ebb00..6eea1af 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 76f68a6..7ef1534 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 266a2ab..0427e9e 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_CORVUS=y |