diff options
author | Tom Rini <trini@konsulko.com> | 2015-03-20 07:01:00 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-03-20 07:01:00 -0400 |
commit | e6f4042a04195be258f79e33abe3b71af9162862 (patch) | |
tree | c386524124d1c95eb75e478ff271735454a04029 /configs | |
parent | a538ae997ae4cb375ba5362b50ba3f5b35f9519b (diff) | |
parent | 8e7a96364bc29073e5246d331a11ce8602d5d6a3 (diff) | |
download | u-boot-imx-e6f4042a04195be258f79e33abe3b71af9162862.zip u-boot-imx-e6f4042a04195be258f79e33abe3b71af9162862.tar.gz u-boot-imx-e6f4042a04195be258f79e33abe3b71af9162862.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'configs')
-rw-r--r-- | configs/at91sam9rlek_dataflash_defconfig | 1 | ||||
-rw-r--r-- | configs/at91sam9rlek_mmc_defconfig | 4 | ||||
-rw-r--r-- | configs/at91sam9rlek_nandflash_defconfig | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index ee632d1..174bcc4 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9RLEK=y +CONFIG_HUSH_PARSER=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig new file mode 100644 index 0000000..8704140 --- /dev/null +++ b/configs/at91sam9rlek_mmc_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC" +CONFIG_ARM=y +CONFIG_TARGET_AT91SAM9RLEK=y +CONFIG_HUSH_PARSER=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index 6465f57..fdb2d6b 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH" CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9RLEK=y +CONFIG_HUSH_PARSER=y |