diff options
| author | Tom Rini <trini@ti.com> | 2014-12-08 16:35:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 16:35:05 -0500 |
| commit | 0fffbd26d55d89ec5241f8e1ce4c5bc77892678b (patch) | |
| tree | e483ead53c177a3e8ad3d6563a893623859c40e3 /configs | |
| parent | 1a9c8f12f2f2824a047ebeb3ae342109677b48cc (diff) | |
| parent | 7a3620b24649663857d99e8ab73ec0b3bd60e50e (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/ph1_ld4_defconfig | 1 | ||||
| -rw-r--r-- | configs/ph1_pro4_defconfig | 1 | ||||
| -rw-r--r-- | configs/ph1_sld8_defconfig | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index de068e9c59c..315534065d6 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_UNIPHIER=y +S:CONFIG_MACH_PH1_LD4=y ++S:CONFIG_DCC_MICRO_SUPPORT_CARD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index f4ddf5f2781..7ea4e6e879b 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_UNIPHIER=y +S:CONFIG_MACH_PH1_PRO4=y ++S:CONFIG_DCC_MICRO_SUPPORT_CARD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index ee143828040..ddf210cc0d8 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_UNIPHIER=y +S:CONFIG_MACH_PH1_SLD8=y ++S:CONFIG_DCC_MICRO_SUPPORT_CARD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y |