From: Tom Rini <trini@konsulko.com>
Date: Thu, 18 Jul 2019 15:31:37 +0000 (-0400)
Subject: Merge branch '2019-07-17-master-imports'
X-Git-Tag: v2019.10-rc1~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0de815356474912ef5bef9a69f0327a5a93bb2c2;p=oweals%2Fu-boot.git

Merge branch '2019-07-17-master-imports'

- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
---

0de815356474912ef5bef9a69f0327a5a93bb2c2
diff --cc .travis.yml
index d5866443b7,6662ca126a..f20268bde3
--- a/.travis.yml
+++ b/.travis.yml
@@@ -384,16 -382,8 +382,15 @@@ matrix
      - name: "test/py sandbox_flattree"
        env:
          - TEST_PY_BD="sandbox_flattree"
-           TEST_PY_TEST_SPEC="not pci"
            BUILDMAN="^sandbox_flattree$"
            TOOLCHAIN="i386"
 +    - name: "test/py evb-ast2500"
 +      env:
 +        - TEST_PY_BD="evb-ast2500"
 +          TEST_PY_ID="--id qemu"
 +          QEMU_TARGET="arm-softmmu"
 +          QEMU_VERSION="506179e42112be77bfd071f050b15762d3b2cd43"
 +          BUILDMAN="^evb-ast2500$"
      - name: "test/py vexpress_ca15_tc2"
        env:
          - TEST_PY_BD="vexpress_ca15_tc2"