Merge remote-tracking branch 'origin/master' into 2016.11+fslc

* origin/master: (49 commits)
  pci: Move CONFIG_PCI_PNP to Kconfig
  drivers/pci/Kconfig: Add PCI
  i2c: designware: Avoid overwriting the cmd_data register
  travis-ci: Add test.py for various qemu platforms
  travis-ci: Drop 'TEST_CMD'
  travis-ci: Add more architectures
  travis-ci: Update toolchain and buildman usage
  travis-ci: Do not make buildman warnings fatal
  travis-ci: Use a git URI for dtc.git
  travis-ci: Switch to Ubuntu 14.04 'Trusty Tahr'
  api: storage: Avoid enumeration for non-configured subsystem
  tools: moveconfig: support wildcards in --defconfigs file
  Fix codying style broken by recent libfdt sync
  libfdt: fix fdt_stringlist_search()
  libfdt: fix fdt_stringlist_count()
  power: twl6030: fix code refactoring
  ext4: Only write journal entries for modified blocks in unlink_filename
  ext4: Fix handling of direntlen in unlink_filename
  ext4: cleanup unlink_filename function
  Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
  ...

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --cc include/configs/embestmx6boards.h
Simple merge

diff --cc include/configs/mx6cuboxi.h
index 9a43b4e9b949b7dd5e548ec16d3f46f5f662fee0,446b3bc17b55ba64324db7c4f5869a6d8277901d..86726818e23fe43fe9112b3f630c2885dabc2319
--- 1/include/configs/mx6cuboxi.h
--- 2/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@@ -95,10 -86,9 +89,10 @@@
        "initrd_high=0xffffffff\0" \
        "fdt_high=0xffffffff\0" \
        "ip_dyn=yes\0" \
-       "console=" CONFIG_CONSOLE_DEV "\0" \
+       "console=" CONSOLE_DEV "\0" \
        "bootm_size=0x10000000\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
 +      "finduuid=part uuid mmc 0:1 uuid\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
                        "setenv get_cmd dhcp; " \

diff --cc include/configs/mx6qsabreauto.h
index 00f9ed2b039373faa505891f37ad11983210675b,f849f3420a5e08ba402a5b30c0ea35699bdd9e3b..d0dffea8fe0f96328dde133b887ca419b9872b16
--- 1/include/configs/mx6qsabreauto.h
--- 2/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@@ -11,8 -11,8 +11,8 @@@
  
  #define CONFIG_MACH_TYPE      3529
  #define CONFIG_MXC_UART_BASE  UART4_BASE
- #define CONFIG_CONSOLE_DEV            "ttymxc3"
+ #define CONSOLE_DEV           "ttymxc3"
 -#define CONFIG_MMCROOT                        "/dev/mmcblk0p2"
 +#define CONFIG_MMCROOT                        "/dev/mmcblk2p2"
  
  /* USB Configs */
  #define CONFIG_USB_EHCI

diff --cc include/configs/mx6sabre_common.h
Simple merge

diff --cc include/configs/mx6sabresd.h
index c1c9cd69de4c44566a944d5cd4b661e58089db3d,417eae125864498128e8d9f24a79183757c024de..c05f76ea3b2fd117abf05968b03f79b784416b01
--- 1/include/configs/mx6sabresd.h
--- 2/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@@ -15,8 -15,8 +15,8 @@@
  
  #define CONFIG_MACH_TYPE      3980
  #define CONFIG_MXC_UART_BASE  UART1_BASE
- #define CONFIG_CONSOLE_DEV            "ttymxc0"
+ #define CONSOLE_DEV           "ttymxc0"
 -#define CONFIG_MMCROOT                        "/dev/mmcblk1p2"
 +#define CONFIG_MMCROOT                        "/dev/mmcblk2p2"
  
  #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
  

diff --cc include/configs/mx6sxsabresd.h
Simple merge

diff --cc include/configs/wandboard.h
Simple merge