diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-24 16:28:02 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-24 16:28:02 (GMT) |
| commit | 7bb839d672ed3b28c7740429df4a307482868c5b (patch) | |
| tree | 0713c473994463c67c13cd80c6206886509b98d6 /configs/ph1_sld3_defconfig | |
| parent | ce50916ca1415da2f44931d93397d36ac0d208a2 (diff) | |
| parent | a4bb44b027705f8c05fc525180cabaa3769247bb (diff) | |
| download | u-boot-fsl-qoriq-7bb839d672ed3b28c7740429df4a307482868c5b.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs/ph1_sld3_defconfig')
| -rw-r--r-- | configs/ph1_sld3_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configs/ph1_sld3_defconfig b/configs/ph1_sld3_defconfig index d495132..4b871d0 100644 --- a/configs/ph1_sld3_defconfig +++ b/configs/ph1_sld3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y -CONFIG_MACH_PH1_SLD3=y -CONFIG_PFC_MICRO_SUPPORT_CARD=y +CONFIG_ARCH_UNIPHIER_PH1_SLD3=y +CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld3-ref" CONFIG_HUSH_PARSER=y @@ -11,7 +11,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y |