Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Allow to disable SPL (mainly for ATF)
- Refactor SoC init code
- Update DRAM settings
- Add PXs3 SoC support (DT, pinctrl driver, SoC code)
diff --git a/.travis.yml b/.travis.yml
index 6c4ea59..8024765 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,7 +190,9 @@
- env:
- BUILDMAN="t208xrdb t4qds t102*"
- env:
- - BUILDMAN="p1_p2_rdb_pc p1010rdb"
+ - BUILDMAN="p1_p2_rdb_pc"
+ - env:
+ - BUILDMAN="p1010rdb"
- env:
- BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*"
- env: