diff options
| -rw-r--r-- | .azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | drivers/video/rockchip/rk_edp.c | 1 | ||||
| -rw-r--r-- | drivers/video/rockchip/rk_lvds.c | 3 | ||||
| -rw-r--r-- | drivers/video/simple_panel.c | 1 |
6 files changed, 16 insertions, 12 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d3e7b4dd02..5d9645451d 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -1,7 +1,7 @@ variables: windows_vm: vs2017-win2016 ubuntu_vm: ubuntu-18.04 - ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20200311-10Apr2020 + ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20200403-27Apr2020 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. @@ -161,7 +161,7 @@ jobs: TEST_PY_BD: "sandbox" sandbox_clang: TEST_PY_BD: "sandbox" - OVERRIDE: "-O clang-7" + OVERRIDE: "-O clang-10" sandbox_spl: TEST_PY_BD: "sandbox_spl" TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08bdf81e74..beaf9b9042 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://gitlab.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:bionic-20200311-10Apr2020 +image: trini/u-boot-gitlab-ci-runner:bionic-20200403-27Apr2020 # We run some tests in different order, to catch some failures quicker. stages: @@ -181,7 +181,7 @@ sandbox with clang test.py: tags: [ 'all' ] variables: TEST_PY_BD: "sandbox" - OVERRIDE: "-O clang-7" + OVERRIDE: "-O clang-10" <<: *buildman_and_testpy_dfn sandbox_spl test.py: diff --git a/.travis.yml b/.travis.yml index 82e3b91523..fbfaaaff25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,10 @@ language: c addons: apt: + update: true sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-bionic-7 + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' packages: - autopoint - cppcheck @@ -38,7 +39,7 @@ addons: - liblz4-tool - lzma-alone - libisl15 - - clang-7 + - clang-10 - srecord - graphviz - coreutils @@ -57,7 +58,7 @@ install: - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` # prepare buildman environment - echo -e "[toolchain]\nroot = /usr" > ~/.buildman - - echo -e "arc = /tmp/arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman + - echo -e "arc = /tmp/arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman - echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman - echo -e "x86 = i386" >> ~/.buildman; - echo -e "riscv = riscv64" >> ~/.buildman; @@ -86,8 +87,8 @@ before_script: ./tools/buildman/buildman --fetch-arch i386; fi - if [[ "${TOOLCHAIN}" == arc ]]; then - wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2018.09-release/arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz && - tar -C /tmp -xf arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz; + wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2019.09-release/arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install.tar.gz && + tar -C /tmp -xf arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install.tar.gz; fi - if [[ "${TOOLCHAIN}" == "nds32" ]]; then wget https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20180521/nds32le-linux-glibc-v3-upstream.tar.gz && @@ -499,7 +500,7 @@ matrix: - name: "test/py sandbox with clang" env: - TEST_PY_BD="sandbox" - OVERRIDE="-O clang-7" + OVERRIDE="-O clang-10" - name: "test/py sandbox_spl" env: - TEST_PY_BD="sandbox_spl" diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 8703df0ec0..cf84b886e7 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -18,6 +18,7 @@ #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/edp_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> #include <dt-bindings/clock/rk3288-cru.h> #define MAX_CR_LOOP 5 diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index cf5c0439b1..79e24baf53 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -13,8 +13,9 @@ #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/lvds_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/lvds_rk3288.h> #include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/video/rk3288.h> diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index c3c0e84732..5722811117 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -105,6 +105,7 @@ static const struct udevice_id simple_panel_ids[] = { { .compatible = "auo,b133xtn01" }, { .compatible = "auo,b116xw03" }, { .compatible = "auo,b133htn01" }, + { .compatible = "boe,nv140fhmn49" }, { .compatible = "lg,lb070wv8" }, { } }; |