diff options
author | Tom Rini <trini@ti.com> | 2015-01-26 06:42:40 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-01-26 06:42:40 -0500 |
commit | aed03faa064cca56847571b13cbd4c849c6116aa (patch) | |
tree | cb136b3bd51851e1fd107c16a5744c8a775df29f /configs | |
parent | 306df2c8241bd363c71a99841630fb5e85d81fae (diff) | |
parent | 52305a829cd927aca2eb4a15985c567e98f562b9 (diff) | |
download | u-boot-imx-aed03faa064cca56847571b13cbd4c849c6116aa.zip u-boot-imx-aed03faa064cca56847571b13cbd4c849c6116aa.tar.gz u-boot-imx-aed03faa064cca56847571b13cbd4c849c6116aa.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'configs')
-rw-r--r-- | configs/axm_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configs/axm_defconfig b/configs/axm_defconfig index c0e8da2..076ad0f 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -1,3 +1,4 @@ +CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM" -CONFIG_ARM=y -CONFIG_TARGET_TAURUS=y ++S:CONFIG_ARM=y ++S:CONFIG_TARGET_TAURUS=y |