diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
| commit | b79dadf846e5e140e261bbfa4decd024357702d7 (patch) | |
| tree | bbfed4207c806f34ceb4b608e62cc4fbfa98f91f /configs | |
| parent | 1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d (diff) | |
| parent | d5338c693e6a35a7108c184839d688a7377d117c (diff) | |
| download | u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.zip u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.tar.gz u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
README
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/edminiv2_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 3b1a6c1..20c1c65 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -1,3 +1,4 @@ -CONFIG_ARM=y -CONFIG_ORION5X=y -CONFIG_TARGET_EDMINIV2=y +CONFIG_SPL=y ++S:CONFIG_ARM=y ++S:CONFIG_ORION5X=y ++S:CONFIG_TARGET_EDMINIV2=y |