diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-03-05 16:05:10 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-03-05 16:05:10 +0100 |
| commit | 9b5b60a05cb8bba2d135439419b2030764e359bd (patch) | |
| tree | 15e249ac39e9c547668327218e63a0faf54a3283 /configs/ph1_sld8_defconfig | |
| parent | 32df39c741788e8637cffe6633d73594b26d70fb (diff) | |
| parent | 7ae8350f67eea861280a4cbd2d067777a0e87153 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'configs/ph1_sld8_defconfig')
| -rw-r--r-- | configs/ph1_sld8_defconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index e66d166566..cf229aef25 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -1,9 +1,13 @@ +CONFIG_ARM=y +CONFIG_ARCH_UNIPHIER=y +CONFIG_DM=y +CONFIG_DM_SERIAL=y +CONFIG_DM_I2C=y +CONFIG_MACH_PH1_SLD8=y +CONFIG_PFC_MICRO_SUPPORT_CARD=y +CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref" CONFIG_FIT=y 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 @@ -28,15 +32,11 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_NFS=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y -CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref" -CONFIG_DM=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 -CONFIG_DM_SERIAL=y +CONFIG_SPL_NAND_DENALI=y CONFIG_UNIPHIER_SERIAL=y -CONFIG_DM_I2C=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_SPL_NAND_DENALI=y |