Prepare v2016.09.01

Signed-off-by: Tom Rini <trini@konsulko.com>

.azure-pipelines.yml

@@ -1,745 +0,0 @@
-variables:
-  windows_vm: windows-2022
-  ubuntu_vm: ubuntu-24.04
-  macos_vm: macOS-14
-  ci_runner_image: trini/u-boot-gitlab-ci-runner:noble-20251013-23Jan2026
-  # Ensure we do a shallow clone
-  Agent.Source.Git.ShallowFetchDepth: 1
-  # 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.
-  container_option: -u 0
-  work_dir: /u
-  # We define all of these as variables so we can easily reference them twice
-  am33xx_kirkwood: "am33xx kirkwood"
-  amd: "amd xilinx zynq"
-  amlogic_bcm: "amlogic bcm -x mips"
-  atmel: "atmel"
-  engicam_renesas: "engicam renesas"
-  k3_32b: "k3 -x aarch64,phytec,toradex"
-  k3_64b: "k3 -x armv7,phytec,toradex"
-  kirkwood_mvebu: "kirkwood mvebu"
-  layerscape_vf610: "ls1 ls2 lx2 vf610 -x phytec,toradex"
-  m68k_remaining_mx_xtensa: "m68k imxrt mx xtensa -x mx6,aarch64"
-  mips_x86: "mips x86 -x mediatek"
-  mx6: "mx6 -x engicam,phytec,toradex"
-  imx8: "imx8 -x engicam,phytec,toradex"
-  imx9_arc_nios2_socfpga: "imx9 arc nios2 socfpga -x phytec,toradex"
-  phytec_toradex: "phytec toradex"
-  powerpc: "powerpc"
-  riscv_stm32: "riscv stm32 -x engicam,xilinx"
-  rk3399: "rk3399"
-  rk352x_rk358x: "rk352 rk358"
-  rk356x_rk357x: "rk356 rk357"
-  rk3xxx_rest: "rk30 rk31 rk32 rk33 -x rk3399,phytec"
-  sandbox_tegra: "tegra sandbox -x toradex"
-  samsung_omap_mediatek: "samsung omap mediatek"
-  sun4i_5i: "sun4i sun5i"
-  sun6i_sun7i: "sun6i sun7i"
-  sun8i: "sun8i"
-  sunxi_rest: "sunxi -x sun4i,sun5i,sun6i,sun7i,sun8i"
-  arm_catch_all: "arm -x aarch64,am33xx,atmel,bcm,ls,lx,imx,k3,kirkwood,mvebu,mx,omap,renesas,rk,samsung,socfpga,stm32,sunxi,tegra,vf610,xilinx,zynq"
-  aarch64_catch_all: "aarch64 -x amd,amlogic,bcm,engicam,imx,k3,ls,lx,mediatek,mvebu,renesas,rk,samsung,socfpga,stm32,sunxi,tegra,xilinx,zynq"
-
-stages:
-- stage: testsuites
-  jobs:
-  - job: tools_only_windows
-    displayName: 'Ensure host tools build for Windows'
-    pool:
-      vmImage: $(windows_vm)
-    steps:
-      - powershell: |
-          (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2021-06-04/msys2-base-x86_64-20210604.sfx.exe", "sfx.exe")
-        displayName: 'Install MSYS2'
-      - script: |
-          sfx.exe -y -o%CD:~0,2%\
-          %CD:~0,2%\msys64\usr\bin\bash -lc " "
-          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
-          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
-        displayName: 'Update MSYS2'
-      - script: |
-          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"
-        displayName: 'Install Toolchain'
-      - script: |
-          echo make tools-only_defconfig tools-only > build-tools.sh
-          %CD:~0,2%\msys64\usr\bin\bash -lc "bash build-tools.sh"
-        displayName: 'Build Host Tools'
-        env:
-          # Tell MSYS2 we need a POSIX emulation layer
-          MSYSTEM: MSYS
-          # Tell MSYS2 not to ‘cd’ our startup directory to HOME
-          CHERE_INVOKING: yes
-
-  - job: tools_only_macOS
-    displayName: 'Ensure host tools build for macOS X'
-    pool:
-      vmImage: $(macos_vm)
-    steps:
-      - script: brew install make ossp-uuid
-        displayName: Brew install dependencies
-      - script: |
-          gmake tools-only_config tools-only \
-            HOSTCFLAGS="-I/usr/local/opt/openssl@1.1/include" \
-            HOSTLDFLAGS="-L/usr/local/opt/openssl@1.1/lib" \
-            -j$(sysctl -n hw.logicalcpu)
-        displayName: 'Perform tools-only build'
-
-  - job: check_for_new_CONFIG_symbols_outside_Kconfig
-    displayName: 'Check for new CONFIG symbols outside Kconfig'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      # If grep succeeds and finds a match the test fails as we should
-      # have no matches.
-      - script: git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_'
-                  :^doc/ :^arch/arm/dts/ :^scripts/kconfig/lkc.h
-                  :^include/linux/kconfig.h :^tools/ :^dts/upstream/
-                  :^lib/mbedtls/external :^lib/mbedtls/mbedtls_def_config.h &&
-                  exit 1 || exit 0
-
-  - job: docs
-    displayName: 'Build documentation'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          set -e
-          python3 -m venv /tmp/venvhtml
-          . /tmp/venvhtml/bin/activate
-          pip install -r doc/sphinx/requirements.txt -r test/py/requirements.txt
-          make htmldocs KDOC_WERROR=1
-          make infodocs
-
-  - job: maintainers
-    displayName: 'Ensure all configs have MAINTAINERS entries'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          ./tools/buildman/buildman --maintainer-check
-
-  - job: allyesconfig_and_tools
-    displayName: 'Ensure allyesconfig, tools-only and envtools build'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          # Allow pipefail because of how we use 'yes' here.
-          set +o pipefail;
-          yes 0 | make allyesconfig oldconfig all -j$(nproc)
-          make mrproper
-          make tools-only_config tools-only -j$(nproc)
-          make mrproper
-          make tools-only_config envtools -j$(nproc)
-
-  - job: utils
-    displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          # Configure git
-          git config --global user.name "Azure Pipelines"
-          git config --global user.email bmeng.cn@gmail.com
-          export USER=azure
-          python3 -m venv /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install -r test/py/requirements.txt \
-            -r tools/binman/requirements.txt \
-            -r tools/buildman/requirements.txt \
-            -r tools/patman/requirements.txt \
-            -r tools/u_boot_pylib/requirements.txt
-          export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only
-          export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt
-          export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}
-          ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w --board tools-only
-          set -ex
-          export TOOLPATH="--toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools --toolpath /opt/coreboot"
-          ./tools/binman/binman ${TOOLPATH} tool -f missing
-          ./tools/binman/binman ${TOOLPATH} test
-          # Avoid "Permission denied: 'cov'" error by using a temporary file
-          COVERAGE_FILE=/tmp/.coverage ./tools/binman/binman ${TOOLPATH} test -T
-          ./tools/buildman/buildman -t
-          ./tools/dtoc/dtoc -t
-          ./tools/patman/patman test
-          make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig
-
-  - job: pylint
-    displayName: Check for any pylint regressions
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          git config --global --add safe.directory $(work_dir)
-          export USER=azure
-          python3 -m venv /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install -r test/py/requirements.txt \
-            -r tools/binman/requirements.txt \
-            -r tools/buildman/requirements.txt \
-            -r tools/patman/requirements.txt \
-            -r tools/u_boot_pylib/requirements.txt \
-            asteval pylint==3.3.4 pyopenssl
-          export PATH=${PATH}:~/.local/bin
-          echo "[MASTER]" >> .pylintrc
-          echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
-          export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only
-          ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w --board tools-only
-          set -ex
-          pylint --version
-          export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt
-          make pylint_err
-
-  - job: check_packing_of_python_tools
-    displayName: 'Check we can package the Python tools'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: make pip
-
-  - job: count_built_machines
-    displayName: 'Ensure we build all possible machines'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          BMANARGS="-o /tmp --dry-run -v"
-          # First get the total number of boards
-          total=$(tools/buildman/buildman ${BMANARGS} | grep "Total boards to build for each commit" | cut -d ' ' -f 8)
-          # Now build up the list of what each job built.
-          built="$(tools/buildman/buildman ${BMANARGS} $(am33xx_kirkwood) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(amd) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(amlogic_bcm) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(atmel) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(engicam_renesas) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(k3_32b) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(k3_64b) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(kirkwood_mvebu) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(layerscape_vf610) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(m68k_remaining_mx_xtensa) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(mips_x86) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(mx6) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(imx8) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(imx9_arc_nios2_socfpga) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(phytec_toradex) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(powerpc) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(riscv_stm32) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(rk3399) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(rk352x_rk358x) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(rk356x_rk357x) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(rk3xxx_rest) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(sandbox_tegra) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(samsung_omap_mediatek) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(sun4i_5i) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(sun6i_sun7i) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(sun8i) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(sunxi_rest) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(arm_catch_all) | grep '^   ')"
-          built="$built $(tools/buildman/buildman ${BMANARGS} $(aarch64_catch_all) | grep '^   ')"
-
-          # Finally see how many machines that is.
-          actual=$(tools/buildman/buildman ${BMANARGS} $built | grep "Total boards to build for each commit" | cut -d ' ' -f 8)
-          echo We would build a total of $actual out of $total platforms this CI run
-          [ $actual -eq $total ] && exit 0 || exit 1
-
-  - job: create_test_py_wrapper_script
-    displayName: 'Create and stage a wrapper for test.py runs'
-    pool:
-      vmImage: $(ubuntu_vm)
-    steps:
-      - checkout: none
-      - script: |
-          cat << EOF > test.sh
-          #!/bin/bash
-          set -ex
-          # the below corresponds to .gitlab-ci.yml "before_script"
-          cd \${WORK_DIR}
-          git config --global --add safe.directory \${WORK_DIR}
-          git clone --depth=1 https://github.com/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
-          # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled.
-          # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks
-          ln -s conf.qemu_arm64 /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu_arm64_lwip_na
-          ln -s u_boot_boardenv_qemu_arm64_na.py /tmp/uboot-test-hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py
-          ln -s travis-ci /tmp/uboot-test-hooks/bin/\`hostname\`
-          ln -s travis-ci /tmp/uboot-test-hooks/py/\`hostname\`
-          if [[ "\${TEST_PY_BD}" == "qemu-riscv32_spl" ]] || [[ "\${TEST_PY_BD}" == "xilinx_mbv32_smode" ]]; then
-              wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ;
-              export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
-          fi
-          if [[ "\${TEST_PY_BD}" == "qemu-riscv64_spl" ]] || [[ "\${TEST_PY_BD}" == "sifive_unleashed" ]] || [[ "\${TEST_PY_BD}" == "xilinx_mbv64_smode" ]]; then
-              wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ;
-              export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
-          fi
-          if [[ "\${TEST_PY_BD}" == "qemu-arm-sbsa" ]]; then
-              wget -O /tmp/bl1.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/bl1.bin;
-              wget -O /tmp/fip.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/fip.bin;
-              export BINMAN_INDIRS=/tmp
-          fi
-          # the below corresponds to .gitlab-ci.yml "script"
-          cd \${WORK_DIR}
-          export UBOOT_TRAVIS_BUILD_DIR=/tmp/\${TEST_PY_BD}
-          if [ -n "\${BUILD_ENV}" ]; then
-              export \${BUILD_ENV};
-          fi
-          python3 -m venv /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install -r tools/binman/requirements.txt \
-            -r tools/buildman/requirements.txt \
-            -r test/py/requirements.txt \
-            -r tools/u_boot_pylib/requirements.txt \
-            setuptools \
-            pytest-azurepipelines
-          tools/buildman/buildman -o \${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board \${TEST_PY_BD} \${OVERRIDE}
-          cp /opt/grub/grub_x86.efi \${UBOOT_TRAVIS_BUILD_DIR}/
-          cp /opt/grub/grub_x64.efi \${UBOOT_TRAVIS_BUILD_DIR}/
-          cp /opt/grub/grubriscv64.efi \${UBOOT_TRAVIS_BUILD_DIR}/grub_riscv64.efi
-          cp /opt/grub/grubaa64.efi \${UBOOT_TRAVIS_BUILD_DIR}/grub_arm64.efi
-          cp /opt/grub/grubarm.efi \${UBOOT_TRAVIS_BUILD_DIR}/grub_arm.efi
-          # create sdcard / spi-nor images for sifive unleashed using genimage
-          if [[ "\${TEST_PY_BD}" == "sifive_unleashed" ]]; then
-              mkdir -p root;
-              cp \${UBOOT_TRAVIS_BUILD_DIR}/spl/u-boot-spl.bin .;
-              cp \${UBOOT_TRAVIS_BUILD_DIR}/u-boot.itb .;
-              rm -rf tmp;
-              genimage --inputpath . --config board/sifive/unleashed/genimage_sdcard.cfg;
-              cp images/sdcard.img \${UBOOT_TRAVIS_BUILD_DIR}/;
-              rm -rf tmp;
-              genimage --inputpath . --config board/sifive/unleashed/genimage_spi-nor.cfg;
-              cp images/spi-nor.img \${UBOOT_TRAVIS_BUILD_DIR}/;
-          fi
-          if [[ "\${TEST_PY_BD}" == "coreboot" ]]; then
-              cp /opt/coreboot/coreboot.rom \${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
-              /opt/coreboot/cbfstool \${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom remove -n fallback/payload;
-              /opt/coreboot/cbfstool \${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f \${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000;
-          fi
-          # If we have TF-A binaries, we need to use them.
-          tfa_dir=""
-          rm -f /tmp/fip.bin
-          rm -f /tmp/bl1.bin
-          if [[ -d /opt/tf-a/"\${TEST_PY_BD}\${TEST_PY_ID//--id /_}" ]]; then
-            tfa_dir="/opt/tf-a/\${TEST_PY_BD}\${TEST_PY_ID//--id /_}";
-          elif [[ -d /opt/tf-a/"\${TEST_PY_BD}" ]]; then
-            tfa_dir="/opt/tf-a/\${TEST_PY_BD}";
-          fi
-          if [[ -n "\$tfa_dir" ]]; then
-            cp "\$tfa_dir"/fip.bin "\$tfa_dir"/bl1.bin /tmp/;
-          fi
-          if [ -f /tmp/fip.bin ] && [ -f /tmp/bl1.bin ]; then
-            export fip=/tmp/fip.bin;
-            export bl1=/tmp/bl1.bin;
-            export PATH=/opt/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3:\${PATH};
-          fi
-          export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:\${PATH}
-          export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci
-          python3 -m http.server 80 --directory "\${UBOOT_TRAVIS_BUILD_DIR}" > /dev/null 2>&1 &
-          HTTP_PID=\$!
-          sleep 1  # Give the server a moment to start
-          if ps -p \${HTTP_PID} > /dev/null; then
-            export HTTP_PID
-          else
-            unset HTTP_PID
-          fi
-          # "\${var:+"-k \$var"}" expands to "" if \$var is empty, "-k \$var" if not
-          ./test/py/test.py -ra -o cache_dir="\$UBOOT_TRAVIS_BUILD_DIR"/.pytest_cache --bd \${TEST_PY_BD} \${TEST_PY_ID} \${TEST_PY_EXTRA} \${TEST_PY_TEST_SPEC:+"-k \${TEST_PY_TEST_SPEC}"} --build-dir "\$UBOOT_TRAVIS_BUILD_DIR" --report-dir "\$UBOOT_TRAVIS_BUILD_DIR" --junitxml=\$(System.DefaultWorkingDirectory)/results.xml
-          # the below corresponds to .gitlab-ci.yml "after_script"
-          if [[ -n "\${HTTP_PID}" ]]; then
-            kill \${HTTP_PID};
-          fi
-          rm -rf /tmp/uboot-test-hooks /tmp/venv
-          EOF
-      - task: CopyFiles@2
-        displayName: 'Copy test.sh for later usage'
-        inputs:
-          contents: 'test.sh'
-          targetFolder: '$(Build.ArtifactStagingDirectory)'
-      - publish: '$(Build.ArtifactStagingDirectory)/test.sh'
-        displayName: 'Publish test.sh'
-        artifact: testsh
-
-- stage: test_py_sandbox
-  jobs:
-  - job: test_py_sandbox
-    displayName: 'test.py for sandbox'
-    pool:
-      vmImage: $(ubuntu_vm)
-    strategy:
-      matrix:
-        sandbox:
-          TEST_PY_BD: "sandbox"
-          TEST_PY_EXTRA: "--timing"
-          # addr2line in Ubuntu 'Noble' and later are broken.
-          TEST_PY_TEST_SPEC: "not event_dump"
-        sandbox_asan:
-          TEST_PY_BD: "sandbox"
-          OVERRIDE: "-a ASAN"
-          TEST_PY_TEST_SPEC: "version"
-        sandbox_clang:
-          TEST_PY_BD: "sandbox"
-          OVERRIDE: "-O clang-20"
-          # addr2line in Ubuntu 'Noble' and later are broken.
-          TEST_PY_TEST_SPEC: "not event_dump"
-        sandbox_clang_asan:
-          TEST_PY_BD: "sandbox"
-          OVERRIDE: "-O clang-20 -a ASAN"
-          TEST_PY_TEST_SPEC: "version"
-        sandbox64:
-          TEST_PY_BD: "sandbox64"
-        sandbox64_clang:
-          TEST_PY_BD: "sandbox64"
-          OVERRIDE: "-O clang-20"
-        sandbox64_lwip:
-          TEST_PY_BD: "sandbox64_lwip"
-        sandbox_spl:
-          TEST_PY_BD: "sandbox_spl"
-          TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-        sandbox_vpl:
-          TEST_PY_BD: "sandbox_vpl"
-          TEST_PY_TEST_SPEC: "vpl or test_spl"
-        sandbox_noinst:
-          TEST_PY_BD: "sandbox_noinst"
-          TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-        sandbox_noinst_load_fit_full:
-          TEST_PY_BD: "sandbox_noinst"
-          TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-          OVERRIDE: "-a CONFIG_SPL_LOAD_FIT_FULL=y"
-        sandbox_flattree:
-          TEST_PY_BD: "sandbox_flattree"
-        sandbox_trace:
-          TEST_PY_BD: "sandbox"
-          BUILD_ENV: "FTRACE=1 NO_LTO=1"
-          TEST_PY_TEST_SPEC: "trace"
-          OVERRIDE: "-a CONFIG_TRACE=y -a CONFIG_TRACE_EARLY=y -a CONFIG_TRACE_EARLY_SIZE=0x01000000 -a CONFIG_TRACE_BUFFER_SIZE=0x02000000"
-    steps:
-      - download: current
-        artifact: testsh
-      - script: |
-          # make current directory writeable to uboot user inside the container
-          # as sandbox testing need create files like spi flash images, etc.
-          # (TODO: clean up this in the future)
-          chmod 777 .
-          chmod 755 $(Pipeline.Workspace)/testsh/test.sh
-          # Filesystem tests need extra docker args to run
-          set --
-          # mount -o loop needs the loop devices
-          if modprobe loop; then
-              for d in $(find /dev -maxdepth 1 -name 'loop*'); do
-                  set -- "$@" --device $d:$d
-              done
-          fi
-          # Needed for mount syscall (for guestmount as well)
-          set -- "$@" --cap-add SYS_ADMIN
-          # Default apparmor profile denies mounts
-          set -- "$@" --security-opt apparmor=unconfined
-          # Some tests using libguestfs-tools need the fuse device to run
-          docker run "$@" --device /dev/fuse:/dev/fuse \
-                         -v $PWD:$(work_dir) \
-                         -v $(Pipeline.Workspace):$(Pipeline.Workspace) \
-                         -v $(System.DefaultWorkingDirectory):$(System.DefaultWorkingDirectory) \
-                         -e WORK_DIR="${WORK_DIR}" \
-                         -e TEST_PY_BD="${TEST_PY_BD}" \
-                         -e TEST_PY_ID="${TEST_PY_ID}" \
-                         -e TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}" \
-                         -e OVERRIDE="${OVERRIDE}" \
-                         -e BUILD_ENV="${BUILD_ENV}" $(ci_runner_image) \
-                         $(Pipeline.Workspace)/testsh/test.sh
-      - task: PublishTestResults@2
-        inputs:
-          testResultsFormat: 'JUnit'
-          testResultsFiles: 'results.xml'
-
-- stage: test_py_qemu
-  jobs:
-  - job: test_py_qemu
-    displayName: 'test.py for QEMU platforms'
-    pool:
-      vmImage: $(ubuntu_vm)
-    strategy:
-      matrix:
-        coreboot:
-          TEST_PY_BD: "coreboot"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        evb_ast2500:
-          TEST_PY_BD: "evb-ast2500"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        vexpress_ca9x4:
-          TEST_PY_BD: "vexpress_ca9x4"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        vexpress_fvp:
-          TEST_PY_BD: "vexpress_fvp"
-          TEST_PY_TEST_SPEC: "not sleep and not hostfs"
-        vexpress_fvp_bloblist:
-          TEST_PY_BD: "vexpress_fvp_bloblist"
-          TEST_PY_TEST_SPEC: "not sleep and not hostfs"
-        integratorcp_cm926ejs:
-          TEST_PY_BD: "integratorcp_cm926ejs"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_arm:
-          TEST_PY_BD: "qemu_arm"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_arm64:
-          TEST_PY_BD: "qemu_arm64"
-          TEST_PY_TEST_SPEC: "not sleep"
-          OVERRIDE: "-a CONFIG_SEMIHOSTING=y"
-        qemu_arm64_lwip:
-          TEST_PY_BD: "qemu_arm64_lwip"
-          TEST_PY_TEST_SPEC: "test_net_dhcp or test_net_ping or test_net_tftpboot"
-        qemu_arm64_tfa_fw_handoff:
-          TEST_PY_BD: "qemu_arm64"
-          TEST_PY_ID: "--id fw_handoff_tfa_optee"
-          TEST_PY_TEST_SPEC: "test_fw_handoff"
-        qemu_arm_sbsa_ref:
-          TEST_PY_BD: "qemu-arm-sbsa"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_m68k:
-          TEST_PY_BD: "M5208EVBE"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep and not efi"
-          OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR"
-        qemu_m68k_virt:
-          TEST_PY_BD: "qemu-m68k"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_malta:
-          TEST_PY_BD: "malta"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep and not efi"
-        qemu_maltael:
-          TEST_PY_BD: "maltael"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep and not efi"
-        qemu_malta64:
-          TEST_PY_BD: "malta64"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep and not efi"
-        qemu_malta64el:
-          TEST_PY_BD: "malta64el"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep and not efi"
-        qemu_ppce500:
-          TEST_PY_BD: "qemu-ppce500"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_riscv32:
-          TEST_PY_BD: "qemu-riscv32"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_riscv64:
-          TEST_PY_BD: "qemu-riscv64"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_riscv32_spl:
-          TEST_PY_BD: "qemu-riscv32_spl"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_riscv64_spl:
-          TEST_PY_BD: "qemu-riscv64_spl"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_riscv64_smode:
-          TEST_PY_BD: "qemu-riscv64_smode"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_riscv64_smode_acpi:
-          TEST_PY_BD: "qemu-riscv64_smode_acpi"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_x86:
-          TEST_PY_BD: "qemu-x86"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_x86_64:
-          TEST_PY_BD: "qemu-x86_64"
-          TEST_PY_TEST_SPEC: "not sleep"
-        qemu_xtensa_dc233c:
-          TEST_PY_BD: "qemu-xtensa-dc233c"
-          TEST_PY_TEST_SPEC: "not sleep and not efi"
-        r2dplus_i82557c:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id i82557c_qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        r2dplus_pcnet:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id pcnet_qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        r2dplus_rtl8139:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id rtl8139_qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        r2dplus_tulip:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id tulip_qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-# This is broken upsteam: https://gitlab.com/qemu-project/qemu/-/issues/2945
-#        sifive_unleashed_sdcard:
-#          TEST_PY_BD: "sifive_unleashed"
-#          TEST_PY_ID: "--id sdcard_qemu"
-#          TEST_PY_TEST_SPEC: "not sleep"
-        sifive_unleashed_spi-nor:
-          TEST_PY_BD: "sifive_unleashed"
-          TEST_PY_ID: "--id spi-nor_qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        xilinx_mbv32:
-          TEST_PY_BD: "xilinx_mbv32"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        xilinx_mbv32_smode test.py:
-          TEST_PY_BD: "xilinx_mbv32_smode"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        xilinx_mbv64 test.py:
-          TEST_PY_BD: "xilinx_mbv64"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        xilinx_mbv64_smode test.py:
-          TEST_PY_BD: "xilinx_mbv64_smode"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        xilinx_zynq_virt:
-          TEST_PY_BD: "xilinx_zynq_virt"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-        xilinx_versal_virt:
-          TEST_PY_BD: "xilinx_versal_virt"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-          OVERRIDE: "-a ~CONFIG_USB_DWC3"
-        xtfpga:
-          TEST_PY_BD: "xtfpga"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-    steps:
-      - download: current
-        artifact: testsh
-      - script: |
-          # make current directory writeable to uboot user inside the container
-          # as sandbox testing need create files like spi flash images, etc.
-          # (TODO: clean up this in the future)
-          chmod 777 .
-          chmod 755 $(Pipeline.Workspace)/testsh/test.sh
-          # Some tests using libguestfs-tools need the fuse device to run
-          docker run "$@" --device /dev/fuse:/dev/fuse \
-                         -v $PWD:$(work_dir) \
-                         -v $(Pipeline.Workspace):$(Pipeline.Workspace) \
-                         -v $(System.DefaultWorkingDirectory):$(System.DefaultWorkingDirectory) \
-                         -e WORK_DIR="${WORK_DIR}" \
-                         -e TEST_PY_BD="${TEST_PY_BD}" \
-                         -e TEST_PY_ID="${TEST_PY_ID}" \
-                         -e TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}" \
-                         -e OVERRIDE="${OVERRIDE}" \
-                         -e BUILD_ENV="${BUILD_ENV}" $(ci_runner_image) \
-                         $(Pipeline.Workspace)/testsh/test.sh
-        retryCountOnTaskFailure: 2 # QEMU may be too slow, etc.
-      - task: PublishTestResults@2
-        inputs:
-          testResultsFormat: 'JUnit'
-          testResultsFiles: 'results.xml'
-
-- stage: world_build
-  jobs:
-  - job: build_the_world
-    timeoutInMinutes: 0 # Use the maximum allowed
-    displayName: 'Build the World'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    strategy:
-      # We split the world up in to 10 jobs as we can have at most 10
-      # parallel jobs going on the free tier of Azure.
-      matrix:
-        am33xx_kirkwood:
-          BUILDMAN: $(am33xx_kirkwood)
-        amd:
-          BUILDMAN: $(amd)
-        amlogic_bcm:
-          BUILDMAN: $(amlogic_bcm)
-        atmel:
-          BUILDMAN: $(atmel)
-        engicam_renesas:
-          BUILDMAN: $(engicam_renesas)
-        k3_32b:
-          BUILDMAN: $(k3_32b)
-        k3_64b:
-          BUILDMAN: $(k3_64b)
-        kirkwood_mvebu:
-          BUILDMAN: $(kirkwood_mvebu)
-        layerscape_vf610:
-          BUILDMAN: $(layerscape_vf610)
-        m68k_remaining_mx_xtensa:
-          BUILDMAN: $(m68k_remaining_mx_xtensa)
-        mips_x86:
-          BUILDMAN: $(mips_x86)
-        mx6:
-          BUILDMAN: $(mx6)
-        imx8:
-          BUILDMAN: $(imx8)
-        imx9_arc_nios2_socfpga:
-          BUILDMAN: $(imx9_arc_nios2_socfpga)
-        phytec_toradex:
-          BUILDMAN: $(phytec_toradex)
-        powerpc:
-          BUILDMAN: $(powerpc)
-        riscv_stm32:
-          BUILDMAN: $(riscv_stm32)
-        rk3399:
-          BUILDMAN: $(rk3399)
-        rk352x_rk358x:
-          BUILDMAN: $(rk352x_rk358x)
-        rk356x_rk357x:
-          BUILDMAN: $(rk356x_rk357x)
-        rk3xxx_rest:
-          BUILDMAN: $(rk3xxx_rest)
-        sandbox_tegra:
-          BUILDMAN: $(sandbox_tegra)
-        samsung_omap_mediatek:
-          BUILDMAN: $(samsung_omap_mediatek)
-        sun4i_5i:
-          BUILDMAN: $(sun4i_5i)
-        sun6i_sun7i:
-          BUILDMAN: $(sun6i_sun7i)
-        sun8i:
-          BUILDMAN: $(sun8i)
-        sunxi_rest:
-          BUILDMAN: $(sunxi_rest)
-        arm_catch_all:
-          BUILDMAN: $(arm_catch_all)
-        aarch64_catch_all:
-          BUILDMAN: $(aarch64_catch_all)
-    steps:
-      - script: |
-          set -ex
-          # Setup venv, perform build
-          python3 -m venv /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install -r tools/binman/requirements.txt \
-            -r tools/buildman/requirements.txt \
-            setuptools
-          if [[ "${BUILDMAN}" != "" ]]; then
-              ret=0;
-              tools/buildman/buildman -o /tmp -PEWM ${BUILDMAN} ${OVERRIDE} || ret=$?;
-              if [[ $ret -ne 0 ]]; then
-                  tools/buildman/buildman -o /tmp -seP ${BUILDMAN};
-                  exit $ret;
-              fi;
-          fi

.b4-config

@@ -1,11 +0,0 @@
-# Configuration for the `b4` tool
-# See https://b4.docs.kernel.org/en/latest/config.html
-
-[b4]
-    send-auto-to-cmd = scripts/get_maintainer.pl --nogit --nogit-fallback --nogit-chief-penguins --norolestats --nom
-    send-auto-cc-cmd = scripts/get_maintainer.pl --nogit-fallback --nogit-chief-penguins --norolestats --nol
-    # Patchwork integration. You still need to set pw-key to your API key
-    pw-url = https://patchwork.ozlabs.org/
-    pw-project = uboot
-    pw-review-state = under-review
-    pw-accept-state = accepted

.checkpatch.conf

@@ -4,7 +4,7 @@
 # Temporary for false positive in checkpatch
 --ignore COMPLEX_MACRO
 
-# For CFG_SYS_I2C_NOPROBES
+# For CONFIG_SYS_I2C_NOPROBES
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
 
 # For simple_strtoul
@@ -19,21 +19,9 @@
 # Not Linux, so we don't recommend usleep_range() over udelay()
 --ignore USLEEP_RANGE
 
-# We also do not have a functionally different mdelay() and udelay()
---ignore LONG_UDELAY
-
 # Ignore networking block comment style
 --ignore NETWORKING_BLOCK_COMMENT_STYLE
 
 # Ignore "WARNING: Prefer ether_addr_copy() over memcpy() if the Ethernet
 # addresses are __aligned(2)".
 --ignore PREFER_ETHER_ADDR_COPY
-
-# ENOSYS is a conventionally used error, even though U-Boot lacks system calls.
---ignore ENOSYS
-
-# A bit shorter of a description is OK with us.
---min-conf-desc-length=2
-
-# Extra checks for U-Boot
---u-boot

.clang-format

@@ -1,855 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# clang-format configuration file. Intended for clang-format >= 11.
-#
-# For more information, see:
-#
-#   Documentation/dev-tools/clang-format.rst
-#   https://clang.llvm.org/docs/ClangFormat.html
-#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-#
----
-AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Left
-AlignOperands: true
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass: false
-  AfterControlStatement: false
-  AfterEnum: false
-  AfterFunction: true
-  AfterNamespace: true
-  AfterObjCDeclaration: false
-  AfterStruct: false
-  AfterUnion: false
-  AfterExternBlock: false
-  BeforeCatch: false
-  BeforeElse: false
-  IndentBraces: false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeComma
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: false
-ColumnLimit: 80
-CommentPragmas: '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 8
-ContinuationIndentWidth: 8
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: false
-
-# Taken from:
-#   git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ tools/ \
-#   | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$,  - '\1'," \
-#   | LC_ALL=C sort -u
-ForEachMacros:
-  - '__ata_qc_for_each'
-  - '__bio_for_each_bvec'
-  - '__bio_for_each_segment'
-  - '__evlist__for_each_entry'
-  - '__evlist__for_each_entry_continue'
-  - '__evlist__for_each_entry_from'
-  - '__evlist__for_each_entry_reverse'
-  - '__evlist__for_each_entry_safe'
-  - '__for_each_mem_range'
-  - '__for_each_mem_range_rev'
-  - '__for_each_thread'
-  - '__hlist_for_each_rcu'
-  - '__map__for_each_symbol_by_name'
-  - '__pci_bus_for_each_res0'
-  - '__pci_bus_for_each_res1'
-  - '__pci_dev_for_each_res0'
-  - '__pci_dev_for_each_res1'
-  - '__perf_evlist__for_each_entry'
-  - '__perf_evlist__for_each_entry_reverse'
-  - '__perf_evlist__for_each_entry_safe'
-  - '__rq_for_each_bio'
-  - '__shost_for_each_device'
-  - '__sym_for_each'
-  - '_for_each_counter'
-  - 'apei_estatus_for_each_section'
-  - 'ata_for_each_dev'
-  - 'ata_for_each_link'
-  - 'ata_qc_for_each'
-  - 'ata_qc_for_each_raw'
-  - 'ata_qc_for_each_with_internal'
-  - 'ax25_for_each'
-  - 'ax25_uid_for_each'
-  - 'bio_for_each_bvec'
-  - 'bio_for_each_bvec_all'
-  - 'bio_for_each_folio_all'
-  - 'bio_for_each_integrity_vec'
-  - 'bio_for_each_segment'
-  - 'bio_for_each_segment_all'
-  - 'bio_list_for_each'
-  - 'bip_for_each_vec'
-  - 'bond_for_each_slave'
-  - 'bond_for_each_slave_rcu'
-  - 'bpf_for_each'
-  - 'bpf_for_each_reg_in_vstate'
-  - 'bpf_for_each_reg_in_vstate_mask'
-  - 'bpf_for_each_spilled_reg'
-  - 'bpf_object__for_each_map'
-  - 'bpf_object__for_each_program'
-  - 'btree_for_each_safe128'
-  - 'btree_for_each_safe32'
-  - 'btree_for_each_safe64'
-  - 'btree_for_each_safel'
-  - 'card_for_each_dev'
-  - 'cgroup_taskset_for_each'
-  - 'cgroup_taskset_for_each_leader'
-  - 'cpu_aggr_map__for_each_idx'
-  - 'cpufreq_for_each_efficient_entry_idx'
-  - 'cpufreq_for_each_entry'
-  - 'cpufreq_for_each_entry_idx'
-  - 'cpufreq_for_each_valid_entry'
-  - 'cpufreq_for_each_valid_entry_idx'
-  - 'css_for_each_child'
-  - 'css_for_each_descendant_post'
-  - 'css_for_each_descendant_pre'
-  - 'damon_for_each_region'
-  - 'damon_for_each_region_from'
-  - 'damon_for_each_region_safe'
-  - 'damon_for_each_scheme'
-  - 'damon_for_each_scheme_safe'
-  - 'damon_for_each_target'
-  - 'damon_for_each_target_safe'
-  - 'damos_for_each_filter'
-  - 'damos_for_each_filter_safe'
-  - 'damos_for_each_ops_filter'
-  - 'damos_for_each_ops_filter_safe'
-  - 'damos_for_each_quota_goal'
-  - 'damos_for_each_quota_goal_safe'
-  - 'data__for_each_file'
-  - 'data__for_each_file_new'
-  - 'data__for_each_file_start'
-  - 'def_for_each_cpu'
-  - 'device_for_each_child_node'
-  - 'device_for_each_child_node_scoped'
-  - 'dma_fence_array_for_each'
-  - 'dma_fence_chain_for_each'
-  - 'dma_fence_unwrap_for_each'
-  - 'dma_resv_for_each_fence'
-  - 'dma_resv_for_each_fence_unlocked'
-  - 'do_for_each_ftrace_op'
-  - 'drm_atomic_crtc_for_each_plane'
-  - 'drm_atomic_crtc_state_for_each_plane'
-  - 'drm_atomic_crtc_state_for_each_plane_state'
-  - 'drm_atomic_for_each_plane_damage'
-  - 'drm_client_for_each_connector_iter'
-  - 'drm_client_for_each_modeset'
-  - 'drm_connector_for_each_possible_encoder'
-  - 'drm_exec_for_each_locked_object'
-  - 'drm_exec_for_each_locked_object_reverse'
-  - 'drm_for_each_bridge_in_chain'
-  - 'drm_for_each_connector_iter'
-  - 'drm_for_each_crtc'
-  - 'drm_for_each_crtc_reverse'
-  - 'drm_for_each_encoder'
-  - 'drm_for_each_encoder_mask'
-  - 'drm_for_each_fb'
-  - 'drm_for_each_legacy_plane'
-  - 'drm_for_each_plane'
-  - 'drm_for_each_plane_mask'
-  - 'drm_for_each_privobj'
-  - 'drm_gem_for_each_gpuvm_bo'
-  - 'drm_gem_for_each_gpuvm_bo_safe'
-  - 'drm_gpusvm_for_each_range'
-  - 'drm_gpuva_for_each_op'
-  - 'drm_gpuva_for_each_op_from_reverse'
-  - 'drm_gpuva_for_each_op_reverse'
-  - 'drm_gpuva_for_each_op_safe'
-  - 'drm_gpuvm_bo_for_each_va'
-  - 'drm_gpuvm_bo_for_each_va_safe'
-  - 'drm_gpuvm_for_each_va'
-  - 'drm_gpuvm_for_each_va_range'
-  - 'drm_gpuvm_for_each_va_range_safe'
-  - 'drm_gpuvm_for_each_va_safe'
-  - 'drm_mm_for_each_hole'
-  - 'drm_mm_for_each_node'
-  - 'drm_mm_for_each_node_in_range'
-  - 'drm_mm_for_each_node_safe'
-  - 'dsa_switch_for_each_available_port'
-  - 'dsa_switch_for_each_cpu_port'
-  - 'dsa_switch_for_each_cpu_port_continue_reverse'
-  - 'dsa_switch_for_each_port'
-  - 'dsa_switch_for_each_port_continue_reverse'
-  - 'dsa_switch_for_each_port_safe'
-  - 'dsa_switch_for_each_user_port'
-  - 'dsa_switch_for_each_user_port_continue_reverse'
-  - 'dsa_tree_for_each_cpu_port'
-  - 'dsa_tree_for_each_user_port'
-  - 'dsa_tree_for_each_user_port_continue_reverse'
-  - 'dso__for_each_symbol'
-  - 'elf_hash_for_each_possible'
-  - 'elf_symtab__for_each_symbol'
-  - 'evlist__for_each_cpu'
-  - 'evlist__for_each_entry'
-  - 'evlist__for_each_entry_continue'
-  - 'evlist__for_each_entry_from'
-  - 'evlist__for_each_entry_reverse'
-  - 'evlist__for_each_entry_safe'
-  - 'flow_action_for_each'
-  - 'for_each_acpi_consumer_dev'
-  - 'for_each_acpi_dev_match'
-  - 'for_each_active_dev_scope'
-  - 'for_each_active_drhd_unit'
-  - 'for_each_active_iommu'
-  - 'for_each_active_irq'
-  - 'for_each_active_route'
-  - 'for_each_aggr_pgid'
-  - 'for_each_alloc_capable_rdt_resource'
-  - 'for_each_and_bit'
-  - 'for_each_andnot_bit'
-  - 'for_each_available_child_of_node'
-  - 'for_each_available_child_of_node_scoped'
-  - 'for_each_bench'
-  - 'for_each_bio'
-  - 'for_each_board_func_rsrc'
-  - 'for_each_btf_ext_rec'
-  - 'for_each_btf_ext_sec'
-  - 'for_each_bvec'
-  - 'for_each_capable_rdt_resource'
-  - 'for_each_card_auxs'
-  - 'for_each_card_auxs_safe'
-  - 'for_each_card_components'
-  - 'for_each_card_dapms'
-  - 'for_each_card_pre_auxs'
-  - 'for_each_card_prelinks'
-  - 'for_each_card_rtds'
-  - 'for_each_card_rtds_safe'
-  - 'for_each_card_widgets'
-  - 'for_each_card_widgets_safe'
-  - 'for_each_cgroup_storage_type'
-  - 'for_each_child_of_node'
-  - 'for_each_child_of_node_scoped'
-  - 'for_each_child_of_node_with_prefix'
-  - 'for_each_clear_bit'
-  - 'for_each_clear_bit_from'
-  - 'for_each_clear_bitrange'
-  - 'for_each_clear_bitrange_from'
-  - 'for_each_cmd'
-  - 'for_each_cmsghdr'
-  - 'for_each_collection'
-  - 'for_each_comp_order'
-  - 'for_each_compatible_node'
-  - 'for_each_component_dais'
-  - 'for_each_component_dais_safe'
-  - 'for_each_conduit'
-  - 'for_each_console'
-  - 'for_each_console_srcu'
-  - 'for_each_cpu'
-  - 'for_each_cpu_and'
-  - 'for_each_cpu_andnot'
-  - 'for_each_cpu_from'
-  - 'for_each_cpu_or'
-  - 'for_each_cpu_wrap'
-  - 'for_each_dapm_widgets'
-  - 'for_each_dedup_cand'
-  - 'for_each_dev_addr'
-  - 'for_each_dev_scope'
-  - 'for_each_dma_cap_mask'
-  - 'for_each_dpcm_be'
-  - 'for_each_dpcm_be_rollback'
-  - 'for_each_dpcm_be_safe'
-  - 'for_each_dpcm_fe'
-  - 'for_each_drhd_unit'
-  - 'for_each_dss_dev'
-  - 'for_each_efi_memory_desc'
-  - 'for_each_efi_memory_desc_in_map'
-  - 'for_each_element'
-  - 'for_each_element_extid'
-  - 'for_each_element_id'
-  - 'for_each_enabled_cpu'
-  - 'for_each_endpoint_of_node'
-  - 'for_each_event'
-  - 'for_each_event_tps'
-  - 'for_each_evictable_lru'
-  - 'for_each_fib6_node_rt_rcu'
-  - 'for_each_fib6_walker_rt'
-  - 'for_each_file_lock'
-  - 'for_each_free_mem_pfn_range_in_zone_from'
-  - 'for_each_free_mem_range'
-  - 'for_each_free_mem_range_reverse'
-  - 'for_each_func_rsrc'
-  - 'for_each_gpiochip_node'
-  - 'for_each_group_evsel'
-  - 'for_each_group_evsel_head'
-  - 'for_each_group_member'
-  - 'for_each_group_member_head'
-  - 'for_each_hstate'
-  - 'for_each_hwgpio'
-  - 'for_each_hwgpio_in_range'
-  - 'for_each_if'
-  - 'for_each_inject_fn'
-  - 'for_each_insn'
-  - 'for_each_insn_op_loc'
-  - 'for_each_insn_prefix'
-  - 'for_each_intid'
-  - 'for_each_iommu'
-  - 'for_each_ip_tunnel_rcu'
-  - 'for_each_irq_desc'
-  - 'for_each_irq_nr'
-  - 'for_each_lang'
-  - 'for_each_link_ch_maps'
-  - 'for_each_link_codecs'
-  - 'for_each_link_cpus'
-  - 'for_each_link_platforms'
-  - 'for_each_lru'
-  - 'for_each_matching_node'
-  - 'for_each_matching_node_and_match'
-  - 'for_each_media_entity_data_link'
-  - 'for_each_mem_pfn_range'
-  - 'for_each_mem_range'
-  - 'for_each_mem_range_rev'
-  - 'for_each_mem_region'
-  - 'for_each_member'
-  - 'for_each_memory'
-  - 'for_each_migratetype_order'
-  - 'for_each_missing_reg'
-  - 'for_each_mle_subelement'
-  - 'for_each_mod_mem_type'
-  - 'for_each_mon_capable_rdt_resource'
-  - 'for_each_mp_bvec'
-  - 'for_each_net'
-  - 'for_each_net_continue_reverse'
-  - 'for_each_net_rcu'
-  - 'for_each_netdev'
-  - 'for_each_netdev_continue'
-  - 'for_each_netdev_continue_rcu'
-  - 'for_each_netdev_continue_reverse'
-  - 'for_each_netdev_dump'
-  - 'for_each_netdev_feature'
-  - 'for_each_netdev_in_bond_rcu'
-  - 'for_each_netdev_rcu'
-  - 'for_each_netdev_reverse'
-  - 'for_each_netdev_safe'
-  - 'for_each_new_connector_in_state'
-  - 'for_each_new_crtc_in_state'
-  - 'for_each_new_mst_mgr_in_state'
-  - 'for_each_new_plane_in_state'
-  - 'for_each_new_plane_in_state_reverse'
-  - 'for_each_new_private_obj_in_state'
-  - 'for_each_new_reg'
-  - 'for_each_nhlt_endpoint'
-  - 'for_each_nhlt_endpoint_fmtcfg'
-  - 'for_each_nhlt_fmtcfg'
-  - 'for_each_node'
-  - 'for_each_node_by_name'
-  - 'for_each_node_by_type'
-  - 'for_each_node_mask'
-  - 'for_each_node_numadist'
-  - 'for_each_node_state'
-  - 'for_each_node_with_cpus'
-  - 'for_each_node_with_property'
-  - 'for_each_nonreserved_multicast_dest_pgid'
-  - 'for_each_numa_hop_mask'
-  - 'for_each_of_allnodes'
-  - 'for_each_of_allnodes_from'
-  - 'for_each_of_cpu_node'
-  - 'for_each_of_graph_port'
-  - 'for_each_of_graph_port_endpoint'
-  - 'for_each_of_pci_range'
-  - 'for_each_old_connector_in_state'
-  - 'for_each_old_crtc_in_state'
-  - 'for_each_old_mst_mgr_in_state'
-  - 'for_each_old_plane_in_state'
-  - 'for_each_old_private_obj_in_state'
-  - 'for_each_oldnew_connector_in_state'
-  - 'for_each_oldnew_crtc_in_state'
-  - 'for_each_oldnew_mst_mgr_in_state'
-  - 'for_each_oldnew_plane_in_state'
-  - 'for_each_oldnew_plane_in_state_reverse'
-  - 'for_each_oldnew_private_obj_in_state'
-  - 'for_each_online_cpu'
-  - 'for_each_online_cpu_wrap'
-  - 'for_each_online_node'
-  - 'for_each_online_pgdat'
-  - 'for_each_or_bit'
-  - 'for_each_page_ext'
-  - 'for_each_path'
-  - 'for_each_pci_bridge'
-  - 'for_each_pci_dev'
-  - 'for_each_pcm_streams'
-  - 'for_each_physmem_range'
-  - 'for_each_populated_zone'
-  - 'for_each_possible_cpu'
-  - 'for_each_possible_cpu_wrap'
-  - 'for_each_present_blessed_reg'
-  - 'for_each_present_cpu'
-  - 'for_each_present_section_nr'
-  - 'for_each_prime_number'
-  - 'for_each_prime_number_from'
-  - 'for_each_probe_cache_entry'
-  - 'for_each_process'
-  - 'for_each_process_thread'
-  - 'for_each_prop_codec_conf'
-  - 'for_each_prop_dai_codec'
-  - 'for_each_prop_dai_cpu'
-  - 'for_each_prop_dlc_codecs'
-  - 'for_each_prop_dlc_cpus'
-  - 'for_each_prop_dlc_platforms'
-  - 'for_each_property_of_node'
-  - 'for_each_rdt_resource'
-  - 'for_each_reg'
-  - 'for_each_reg_filtered'
-  - 'for_each_reloc'
-  - 'for_each_reloc_from'
-  - 'for_each_requested_gpio'
-  - 'for_each_requested_gpio_in_range'
-  - 'for_each_reserved_child_of_node'
-  - 'for_each_reserved_mem_range'
-  - 'for_each_reserved_mem_region'
-  - 'for_each_rtd_ch_maps'
-  - 'for_each_rtd_codec_dais'
-  - 'for_each_rtd_components'
-  - 'for_each_rtd_cpu_dais'
-  - 'for_each_rtd_dais'
-  - 'for_each_rtd_dais_reverse'
-  - 'for_each_sband_iftype_data'
-  - 'for_each_script'
-  - 'for_each_sec'
-  - 'for_each_set_bit'
-  - 'for_each_set_bit_from'
-  - 'for_each_set_bit_wrap'
-  - 'for_each_set_bitrange'
-  - 'for_each_set_bitrange_from'
-  - 'for_each_set_clump8'
-  - 'for_each_sg'
-  - 'for_each_sg_dma_page'
-  - 'for_each_sg_page'
-  - 'for_each_sgtable_dma_page'
-  - 'for_each_sgtable_dma_sg'
-  - 'for_each_sgtable_page'
-  - 'for_each_sgtable_sg'
-  - 'for_each_sibling_event'
-  - 'for_each_sta_active_link'
-  - 'for_each_subelement'
-  - 'for_each_subelement_extid'
-  - 'for_each_subelement_id'
-  - 'for_each_sublist'
-  - 'for_each_subsystem'
-  - 'for_each_suite'
-  - 'for_each_supported_activate_fn'
-  - 'for_each_supported_inject_fn'
-  - 'for_each_sym'
-  - 'for_each_thread'
-  - 'for_each_token'
-  - 'for_each_unicast_dest_pgid'
-  - 'for_each_valid_link'
-  - 'for_each_vif_active_link'
-  - 'for_each_vma'
-  - 'for_each_vma_range'
-  - 'for_each_vsi'
-  - 'for_each_wakeup_source'
-  - 'for_each_zone'
-  - 'for_each_zone_zonelist'
-  - 'for_each_zone_zonelist_nodemask'
-  - 'func_for_each_insn'
-  - 'fwnode_for_each_available_child_node'
-  - 'fwnode_for_each_child_node'
-  - 'fwnode_for_each_parent_node'
-  - 'fwnode_graph_for_each_endpoint'
-  - 'gadget_for_each_ep'
-  - 'genradix_for_each'
-  - 'genradix_for_each_from'
-  - 'genradix_for_each_reverse'
-  - 'hash_for_each'
-  - 'hash_for_each_possible'
-  - 'hash_for_each_possible_rcu'
-  - 'hash_for_each_possible_rcu_notrace'
-  - 'hash_for_each_possible_safe'
-  - 'hash_for_each_rcu'
-  - 'hash_for_each_safe'
-  - 'hashmap__for_each_entry'
-  - 'hashmap__for_each_entry_safe'
-  - 'hashmap__for_each_key_entry'
-  - 'hashmap__for_each_key_entry_safe'
-  - 'hctx_for_each_ctx'
-  - 'hists__for_each_format'
-  - 'hists__for_each_sort_list'
-  - 'hlist_bl_for_each_entry'
-  - 'hlist_bl_for_each_entry_rcu'
-  - 'hlist_bl_for_each_entry_safe'
-  - 'hlist_for_each'
-  - 'hlist_for_each_entry'
-  - 'hlist_for_each_entry_continue'
-  - 'hlist_for_each_entry_continue_rcu'
-  - 'hlist_for_each_entry_continue_rcu_bh'
-  - 'hlist_for_each_entry_from'
-  - 'hlist_for_each_entry_from_rcu'
-  - 'hlist_for_each_entry_rcu'
-  - 'hlist_for_each_entry_rcu_bh'
-  - 'hlist_for_each_entry_rcu_notrace'
-  - 'hlist_for_each_entry_safe'
-  - 'hlist_for_each_entry_srcu'
-  - 'hlist_for_each_safe'
-  - 'hlist_nulls_for_each_entry'
-  - 'hlist_nulls_for_each_entry_from'
-  - 'hlist_nulls_for_each_entry_rcu'
-  - 'hlist_nulls_for_each_entry_safe'
-  - 'i3c_bus_for_each_i2cdev'
-  - 'i3c_bus_for_each_i3cdev'
-  - 'idr_for_each_entry'
-  - 'idr_for_each_entry_continue'
-  - 'idr_for_each_entry_continue_ul'
-  - 'idr_for_each_entry_ul'
-  - 'iio_for_each_active_channel'
-  - 'in_dev_for_each_ifa_rcu'
-  - 'in_dev_for_each_ifa_rtnl'
-  - 'in_dev_for_each_ifa_rtnl_net'
-  - 'inet_bind_bucket_for_each'
-  - 'interval_tree_for_each_span'
-  - 'intlist__for_each_entry'
-  - 'intlist__for_each_entry_safe'
-  - 'kcore_copy__for_each_phdr'
-  - 'key_for_each'
-  - 'key_for_each_safe'
-  - 'klp_for_each_func'
-  - 'klp_for_each_func_safe'
-  - 'klp_for_each_func_static'
-  - 'klp_for_each_object'
-  - 'klp_for_each_object_safe'
-  - 'klp_for_each_object_static'
-  - 'kunit_suite_for_each_test_case'
-  - 'kvm_for_each_memslot'
-  - 'kvm_for_each_memslot_in_gfn_range'
-  - 'kvm_for_each_vcpu'
-  - 'libbpf_nla_for_each_attr'
-  - 'list_for_each'
-  - 'list_for_each_codec'
-  - 'list_for_each_codec_safe'
-  - 'list_for_each_continue'
-  - 'list_for_each_entry'
-  - 'list_for_each_entry_continue'
-  - 'list_for_each_entry_continue_rcu'
-  - 'list_for_each_entry_continue_reverse'
-  - 'list_for_each_entry_from'
-  - 'list_for_each_entry_from_rcu'
-  - 'list_for_each_entry_from_reverse'
-  - 'list_for_each_entry_lockless'
-  - 'list_for_each_entry_rcu'
-  - 'list_for_each_entry_reverse'
-  - 'list_for_each_entry_safe'
-  - 'list_for_each_entry_safe_continue'
-  - 'list_for_each_entry_safe_from'
-  - 'list_for_each_entry_safe_reverse'
-  - 'list_for_each_entry_srcu'
-  - 'list_for_each_from'
-  - 'list_for_each_prev'
-  - 'list_for_each_prev_safe'
-  - 'list_for_each_rcu'
-  - 'list_for_each_safe'
-  - 'llist_for_each'
-  - 'llist_for_each_entry'
-  - 'llist_for_each_entry_safe'
-  - 'llist_for_each_safe'
-  - 'lwq_for_each_safe'
-  - 'map__for_each_symbol'
-  - 'map__for_each_symbol_by_name'
-  - 'mas_for_each'
-  - 'mas_for_each_rev'
-  - 'mci_for_each_dimm'
-  - 'media_device_for_each_entity'
-  - 'media_device_for_each_intf'
-  - 'media_device_for_each_link'
-  - 'media_device_for_each_pad'
-  - 'media_entity_for_each_pad'
-  - 'media_pipeline_for_each_entity'
-  - 'media_pipeline_for_each_pad'
-  - 'mlx5_lag_for_each_peer_mdev'
-  - 'mptcp_for_each_subflow'
-  - 'msi_domain_for_each_desc'
-  - 'msi_for_each_desc'
-  - 'mt_for_each'
-  - 'nanddev_io_for_each_block'
-  - 'nanddev_io_for_each_page'
-  - 'neigh_for_each_in_bucket'
-  - 'neigh_for_each_in_bucket_rcu'
-  - 'neigh_for_each_in_bucket_safe'
-  - 'netdev_for_each_lower_dev'
-  - 'netdev_for_each_lower_private'
-  - 'netdev_for_each_lower_private_rcu'
-  - 'netdev_for_each_mc_addr'
-  - 'netdev_for_each_synced_mc_addr'
-  - 'netdev_for_each_synced_uc_addr'
-  - 'netdev_for_each_uc_addr'
-  - 'netdev_for_each_upper_dev_rcu'
-  - 'netdev_hw_addr_list_for_each'
-  - 'nft_rule_for_each_expr'
-  - 'nla_for_each_attr'
-  - 'nla_for_each_attr_type'
-  - 'nla_for_each_nested'
-  - 'nla_for_each_nested_type'
-  - 'nlmsg_for_each_attr'
-  - 'nlmsg_for_each_msg'
-  - 'nr_neigh_for_each'
-  - 'nr_neigh_for_each_safe'
-  - 'nr_node_for_each'
-  - 'nr_node_for_each_safe'
-  - 'of_for_each_phandle'
-  - 'of_property_for_each_string'
-  - 'of_property_for_each_u32'
-  - 'pci_bus_for_each_resource'
-  - 'pci_dev_for_each_resource'
-  - 'pcl_for_each_chunk'
-  - 'pcl_for_each_segment'
-  - 'pcm_for_each_format'
-  - 'perf_config_items__for_each_entry'
-  - 'perf_config_sections__for_each_entry'
-  - 'perf_config_set__for_each_entry'
-  - 'perf_cpu_map__for_each_cpu'
-  - 'perf_cpu_map__for_each_cpu_skip_any'
-  - 'perf_cpu_map__for_each_idx'
-  - 'perf_evlist__for_each_entry'
-  - 'perf_evlist__for_each_entry_reverse'
-  - 'perf_evlist__for_each_entry_safe'
-  - 'perf_evlist__for_each_evsel'
-  - 'perf_evlist__for_each_mmap'
-  - 'perf_evsel_for_each_per_thread_period_safe'
-  - 'perf_hpp_list__for_each_format'
-  - 'perf_hpp_list__for_each_format_safe'
-  - 'perf_hpp_list__for_each_sort_list'
-  - 'perf_hpp_list__for_each_sort_list_safe'
-  - 'plist_for_each'
-  - 'plist_for_each_continue'
-  - 'plist_for_each_entry'
-  - 'plist_for_each_entry_continue'
-  - 'plist_for_each_entry_safe'
-  - 'plist_for_each_safe'
-  - 'pnp_for_each_card'
-  - 'pnp_for_each_dev'
-  - 'protocol_for_each_card'
-  - 'protocol_for_each_dev'
-  - 'queue_for_each_hw_ctx'
-  - 'radix_tree_for_each_slot'
-  - 'radix_tree_for_each_tagged'
-  - 'rb_for_each'
-  - 'rbtree_postorder_for_each_entry_safe'
-  - 'rdma_for_each_block'
-  - 'rdma_for_each_port'
-  - 'rdma_umem_for_each_dma_block'
-  - 'resource_list_for_each_entry'
-  - 'resource_list_for_each_entry_safe'
-  - 'rhl_for_each_entry_rcu'
-  - 'rhl_for_each_rcu'
-  - 'rht_for_each'
-  - 'rht_for_each_entry'
-  - 'rht_for_each_entry_from'
-  - 'rht_for_each_entry_rcu'
-  - 'rht_for_each_entry_rcu_from'
-  - 'rht_for_each_entry_safe'
-  - 'rht_for_each_from'
-  - 'rht_for_each_rcu'
-  - 'rht_for_each_rcu_from'
-  - 'rq_for_each_bvec'
-  - 'rq_for_each_segment'
-  - 'rq_list_for_each'
-  - 'rq_list_for_each_safe'
-  - 'sample_read_group__for_each'
-  - 'scsi_for_each_prot_sg'
-  - 'scsi_for_each_sg'
-  - 'sctp_for_each_hentry'
-  - 'sctp_skb_for_each'
-  - 'sec_for_each_insn'
-  - 'sec_for_each_insn_continue'
-  - 'sec_for_each_insn_from'
-  - 'sec_for_each_sym'
-  - 'shdma_for_each_chan'
-  - 'shost_for_each_device'
-  - 'sk_for_each'
-  - 'sk_for_each_bound'
-  - 'sk_for_each_bound_safe'
-  - 'sk_for_each_entry_offset_rcu'
-  - 'sk_for_each_from'
-  - 'sk_for_each_rcu'
-  - 'sk_for_each_safe'
-  - 'sk_nulls_for_each'
-  - 'sk_nulls_for_each_from'
-  - 'sk_nulls_for_each_rcu'
-  - 'snd_array_for_each'
-  - 'snd_pcm_group_for_each_entry'
-  - 'snd_soc_dapm_widget_for_each_path'
-  - 'snd_soc_dapm_widget_for_each_path_safe'
-  - 'snd_soc_dapm_widget_for_each_sink_path'
-  - 'snd_soc_dapm_widget_for_each_source_path'
-  - 'sparsebit_for_each_set_range'
-  - 'strlist__for_each_entry'
-  - 'strlist__for_each_entry_safe'
-  - 'sym_for_each_insn'
-  - 'sym_for_each_insn_continue_reverse'
-  - 'symbols__for_each_entry'
-  - 'tb_property_for_each'
-  - 'tcf_act_for_each_action'
-  - 'tcf_exts_for_each_action'
-  - 'test_suite__for_each_test_case'
-  - 'tool_pmu__for_each_event'
-  - 'ttm_bo_lru_for_each_reserved_guarded'
-  - 'ttm_resource_manager_for_each_res'
-  - 'udp_lrpa_for_each_entry_rcu'
-  - 'udp_portaddr_for_each_entry'
-  - 'udp_portaddr_for_each_entry_rcu'
-  - 'usb_hub_for_each_child'
-  - 'v4l2_device_for_each_subdev'
-  - 'v4l2_m2m_for_each_dst_buf'
-  - 'v4l2_m2m_for_each_dst_buf_safe'
-  - 'v4l2_m2m_for_each_src_buf'
-  - 'v4l2_m2m_for_each_src_buf_safe'
-  - 'virtio_device_for_each_vq'
-  - 'vkms_config_for_each_connector'
-  - 'vkms_config_for_each_crtc'
-  - 'vkms_config_for_each_encoder'
-  - 'vkms_config_for_each_plane'
-  - 'vkms_config_connector_for_each_possible_encoder'
-  - 'vkms_config_encoder_for_each_possible_crtc'
-  - 'vkms_config_plane_for_each_possible_crtc'
-  - 'while_for_each_ftrace_op'
-  - 'workloads__for_each'
-  - 'xa_for_each'
-  - 'xa_for_each_marked'
-  - 'xa_for_each_range'
-  - 'xa_for_each_start'
-  - 'xas_for_each'
-  - 'xas_for_each_conflict'
-  - 'xas_for_each_marked'
-  - 'xbc_array_for_each_value'
-  - 'xbc_for_each_key_value'
-  - 'xbc_node_for_each_array_value'
-  - 'xbc_node_for_each_child'
-  - 'xbc_node_for_each_key_value'
-  - 'xbc_node_for_each_subkey'
-  - 'ynl_attr_for_each'
-  - 'ynl_attr_for_each_nested'
-  - 'ynl_attr_for_each_payload'
-  - 'zorro_for_each_dev'
-  # U-Boot specific
-  - '__for_each_child_of_node'
-  - '__usbhs_for_each_pipe'
-  - '__usbhsg_for_each_uep'
-  - '_for_each_zynqmp_part'
-  - 'alist_for_each'
-  - 'alist_for_each_filter'
-  - 'cvmx_coremask_for_each_core'
-  - 'cvmx_coremask_for_each_node'
-  - 'dev_for_each_property'
-  - 'dev_for_each_subnode'
-  - 'expr_list_for_each_sym'
-  - 'fdt_for_each_node_by_compatible'
-  - 'fdt_for_each_property_offset'
-  - 'fdt_for_each_subnode'
-  - 'for_each_bin_hdr_v0'
-  - 'for_each_bl_params_node'
-  - 'for_each_child_withdel'
-  - 'for_each_console_dev'
-  - 'for_each_ext_hdr_v0'
-  - 'for_each_label'
-  - 'for_each_label_withdel'
-  - 'for_each_marker'
-  - 'for_each_marker_of_type'
-  - 'for_each_memory_map_entry_reversed'
-  - 'for_each_mmc_mode_by_pref'
-  - 'for_each_opt_hdr_v1'
-  - 'for_each_property_withdel'
-  - 'for_each_sd_mode_by_pref'
-  - 'for_each_supported_width'
-  - 'for_each_tpm_device'
-  - 'for_each_w1_device'
-  - 'for_each_zynqmp_image'
-  - 'for_each_zynqmp_part'
-  - 'for_each_zynqmp_part_in_image'
-  - 'mtd_for_each_device'
-  - 'ofnode_for_each_compatible_node'
-  - 'ofnode_for_each_prop'
-  - 'ofnode_for_each_subnode'
-  - 'pko_for_each_port'
-  - 'sfi_for_each_mentry'
-  - 'ubi_for_each_free_peb'
-  - 'ubi_for_each_protected_peb'
-  - 'ubi_for_each_scrub_peb'
-  - 'ubi_for_each_used_peb'
-  - 'ubi_rb_for_each_entry'
-  - 'usbhs_for_each_dfifo'
-  - 'usbhs_for_each_pipe'
-  - 'usbhs_for_each_pipe_with_dcp'
-  - 'usbhsg_for_each_uep'
-  - 'usbhsg_for_each_uep_with_dcp'
-
-IncludeBlocks: Preserve
-IncludeCategories:
-  - Regex: '.*'
-    Priority: 1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-IndentGotoLabels: false
-IndentPPDirectives: None
-IndentWidth: 8
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 8
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-
-# Taken from git's rules
-PenaltyBreakAssignment: 10
-PenaltyBreakBeforeFirstCallParameter: 30
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakString: 10
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
-
-PointerAlignment: Right
-ReflowComments: false
-SortIncludes: false
-SortUsingDeclarations: false
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatementsExceptForEachMacros
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-TabWidth: 8
-UseTab: Always
-...

.get_maintainer.conf

@@ -1 +0,0 @@
---find-maintainer-files --git --maintainer-path=.

.get_maintainer.ignore

@@ -1 +0,0 @@
-"Pali Rohár" <pali@kernel.org>

.gitattributes

@@ -1,8 +0,0 @@
-# Declare files that always have LF line endings on checkout
-* text eol=lf
-# Denote all files that are truly binary and should not be modified
-*.bin binary
-*.bmp binary
-*.ttf binary
-*.gz binary
-*.png binary

.github/pull_request_template.md

@@ -1,6 +0,0 @@
-Please do not submit a Pull Request via github.  Our project makes use of
-mailing lists for patch submission and review.  For more details please
-see https://u-boot.readthedocs.io/en/latest/develop/sending_patches.html
-
-The only exception to this is in order to trigger a CI loop on Azure prior
-to posting of patches.

.gitignore

@@ -3,97 +3,58 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# Normal rules (sorted alphabetically)
+# Normal rules
 #
 .*
-!.checkpatch.conf
-*.a
-*.asn1.[ch]
-*.bin
-*.bin[_.]*
-*.cfgout
-*.cover
-*.dtb
-*.dtbo
-*.dtb.S
-*.elf
-*.exe
-*.fit
-*.gcda
-*.gcno
-*.i
-*.img
-*.itb
-*.lex.c
-*.lst
-*.map
-*.mod.c
-*.mbx
 *.o
 *.o.*
-*.order
-*.patch
-*.pem
+*.a
 *.s
 *.su
+*.mod.c
+*.i
+*.lst
+*.order
+*.elf
 *.swp
-*.tab.[ch]
-*.ti-*
+*.bin
+*.patch
+*.cfgtmp
+
+# host programs on Cygwin
+*.exe
+
 # Build tree
-/build*
+/build-*
 
 #
 # Top-level generic files
 #
-fit-dtb.blob*
 /MLO*
-/SPL*
+/SPL
 /System.map
-/boards.cfg
-/mkimage*mkimage
-/mkimage-in-simple-bin*
-/simple-bin*
 /u-boot*
-/*.log
+/boards.cfg
 
 #
-# We don't want to ignore the following even if they are dot-files
+# git files that we don't want to ignore even it they are dot-files
 #
-!.clang-format
-!.get_maintainer.*
-!.gitattributes
 !.gitignore
 !.mailmap
 
 #
 # Generated files
 #
+/LOG
 /spl/
 /tpl/
-/vpl/
 /defconfig
-/generated_defconfig
-/Test*
-/capsule*.efi-capsule
-/capsule*.map
-/keep-syms-lto.*
-/*imx8mimage*
-/*imx8mcst*
-/*rcar4-sa0*
-/drivers/video/u_boot_logo.S
-/test/fdt_overlay/test-fdt-overlay-stacked.dtbo.S
-/test/fdt_overlay/test-fdt-overlay.dtbo.S
-capsule_esl_file
 
 #
 # Generated include files
 #
-/include/autoconf.mk*
-/include/config.h
 /include/config/
 /include/generated/
-/include/bmp_logo.h
-/include/bmp_logo_data.h
 
 # stgit generated dirs
 patches-*
@@ -123,19 +84,3 @@ GTAGS
 *.orig
 *~
 \#*#
-
-# Python cache
-__pycache__
-
-# Python code coverage output (python3-coverage html)
-/htmlcov/
-
-# pylint files
-/pylint.cur
-/pylint.out/
-
-# qconfig database
-/qconfig.db
-
-# Clang's compilation database file
-/compile_commands.json

.gitlab-ci-sage-lab.yml

@@ -1,227 +0,0 @@
-# Definition for the lab connected to the "sage" host and managed with labgrid
-
-.sage_lab_template: &sage_lab_dfn
-  stage: sage-lab
-  rules:
-    - if: $SAGE_LAB == "1"
-      when: always
-    - if: $SAGE_LAB != "1"
-      when: manual
-      allow_failure: true
-  # USB can be unreliable.
-  retry: 2
-  dependencies: []
-  needs: [ "sandbox test.py" ]
-  tags: [ 'konsulko-sage-labgrid' ]
-  before_script:
-    # Clone uboot-test-hooks
-    - git config --global --add safe.directory "${CI_PROJECT_DIR}"
-    - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
-    - ln -s sage /tmp/uboot-test-hooks/bin/`hostname`
-    - ln -s sage /tmp/uboot-test-hooks/py/`hostname`
-    - export LG_ENV="/tmp/uboot-test-hooks/bin/sage/labgrid-sage-env.yaml";
-      export LG_COORDINATOR=172.17.0.1:20408
-    # Prepare python environment
-    - python3 -m venv /tmp/venv;
-      . /tmp/venv/bin/activate;
-      pip install -r test/py/requirements.txt -r tools/binman/requirements.txt
-        -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt
-        labgrid setuptools
-    # Acquire and turn on the exporter.
-    - labgrid-client reserve --wait board=${LABGRID_EXPORTER} &&
-      labgrid-client -p ${LABGRID_EXPORTER} acquire &&
-      labgrid-client -p ${LABGRID_EXPORTER} power on
-    # Prepare ssh
-    - mkdir --mode=0700 ~/.ssh;
-      printf 'Host sage-exporter-*\n\tUser labgrid\n' > ~/.ssh/config
-    # If we have TF-A binaries, we need to use them.
-    - if [[ -d /opt/tf-a/${TEST_PY_BD}${TEST_PY_ID//--id /_} ]]; then
-        cp /opt/tf-a/${TEST_PY_BD}${TEST_PY_ID//--id /_}/* /tmp/;
-      elif [[ -d /opt/tf-a/${TEST_PY_BD} ]]; then
-        cp /opt/tf-a/${TEST_PY_BD}/* /tmp/;
-      fi;
-      export BINMAN_INDIRS=/tmp;
-  script:
-    - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}
-    # Don't stop on non-zero exit codes now, to provide as much chance as
-    # possible to ensure we don't leave lab resources acquired.
-    - set +e;
-    # Sage is 16 threads and has 4 devices attached, so 4 builder threads.
-    - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e
-        --board ${TEST_PY_BD} ${OVERRIDE} -T 4;
-      RC=`echo $?`;
-    # Wait for the exporter to have the device ready
-    - while test `labgrid-client resources |
-        grep -q ${LABGRID_EXPORTER}/${LG_PLACE}/; echo $?` -ne 0; do sleep 1;
-      done
-    # Fingerprint the exporter
-    - ssh-keyscan ${LABGRID_EXPORTER} > ~/.ssh/known_hosts 2>/dev/null
-    # If we built, run the tests and save the results.
-    - export PATH=/tmp/uboot-test-hooks/bin:${PATH};
-      export PYTHONPATH=/tmp/uboot-test-hooks/py/sage;
-      test $RC -eq 0 && labgrid-client reserve --wait board=${LG_PLACE} &&
-      labgrid-client -p ${LG_PLACE} acquire &&
-      ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID}
-        ${TEST_PY_EXTRA:-"--capture=tee-sys"}
-        ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"}
-        --build-dir "$UBOOT_TRAVIS_BUILD_DIR"
-        --junitxml=/tmp/${TEST_PY_BD}/results.xml;
-      RC=`echo $?`;
-      cp -v /tmp/${TEST_PY_BD}/*.{html,css,xml} .;
-    # Release and power off everything.
-    - labgrid-client -p ${LG_PLACE} power off
-    - labgrid-client -p ${LG_PLACE} release
-    - labgrid-client -p ${LABGRID_EXPORTER} ssh sudo poweroff && sleep 15 &&
-      labgrid-client -p ${LABGRID_EXPORTER} power off
-    - labgrid-client -p ${LABGRID_EXPORTER} release
-    - exit $RC
-  artifacts:
-    when: always
-    paths:
-      - "*.html"
-      - "*.css"
-      - results.xml
-    reports:
-      junit: results.xml
-    expire_in: 1 week
-
-BeagleBone Black:
-  <<: *sage_lab_dfn
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-bbb-1"
-    LG_PLACE: "bbb-1"
-    TEST_PY_BD: "am335x_evm"
-    OVERRIDE: "-a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_HELLO -a CMD_BOOTEFI_SELFTEST"
-
-BeagleBone Black (lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "BeagleBone Black" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-bbb-1"
-    LG_PLACE: "bbb-1"
-    TEST_PY_BD: "am335x_evm"
-    OVERRIDE: "-a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_HELLO -a CMD_BOOTEFI_SELFTEST -a NET_LWIP"
-
-Pine64+:
-  <<: *sage_lab_dfn
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-pine64-1"
-    LG_PLACE: "pine64-1"
-    TEST_PY_BD: "pine64_plus"
-    OVERRIDE: "-a CMD_BOOTMENU -a CMD_LOG"
-
-Pine64+ (lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "Pine64+" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-pine64-1"
-    LG_PLACE: "pine64-1"
-    TEST_PY_BD: "pine64_plus"
-    # Leads to crash on lwIP, needs investigation.
-    TEST_PY_TEST_SPEC: "not test_net_pxe_boot_config"
-    OVERRIDE: "-a CMD_BOOTMENU -a CMD_LOG -a NET_LWIP"
-
-SolidRun Hummingboard 2:
-  <<: *sage_lab_dfn
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-hb-1"
-    LG_PLACE: "hb-1"
-    TEST_PY_BD: "mx6cuboxi"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG"
-
-SolidRun Hummingboard 2 (lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "SolidRun Hummingboard 2" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-hb-1"
-    LG_PLACE: "hb-1"
-    TEST_PY_BD: "mx6cuboxi"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a NET_LWIP"
-
-Raspberry Pi 4:
-  <<: *sage_lab_dfn
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi4-1"
-    LG_PLACE: "rpi4-1"
-    TEST_PY_BD: "rpi_4"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a ~CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000"
-
-Raspberry Pi 4 (rpi_arm64):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 4" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi4-1"
-    LG_PLACE: "rpi4-1"
-    TEST_PY_BD: "rpi_arm64"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a ~CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000"
-
-Raspberry Pi 4 (rpi_arm64, lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 4 (rpi_arm64)" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi4-1"
-    LG_PLACE: "rpi4-1"
-    TEST_PY_BD: "rpi_arm64"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a ~CMD_BOOTEFI_SELFTEST -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000 -a NET_LWIP"
-
-Raspberry Pi 4 (rpi_4_32b):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 4 (rpi_arm64, lwIP)" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi4-1"
-    LG_PLACE: "rpi4-1"
-    TEST_PY_BD: "rpi_4_32b"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000"
-
-Raspberry Pi 4 (rpi_4_32b, lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 4 (rpi_4_32b)" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi4-1"
-    LG_PLACE: "rpi4-1"
-    TEST_PY_BD: "rpi_4_32b"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000 -a NET_LWIP"
-
-Raspberry Pi 3:
-  <<: *sage_lab_dfn
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi3-1"
-    LG_PLACE: "rpi3-1"
-    TEST_PY_BD: "rpi_3"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000"
-
-Raspberry Pi 3 (rpi_arm64):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 3" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi3-1"
-    LG_PLACE: "rpi3-1"
-    TEST_PY_BD: "rpi_arm64"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a ~CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000"
-
-Raspberry Pi 3 (rpi_arm64, lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 3 (rpi_arm64)" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi3-1"
-    LG_PLACE: "rpi3-1"
-    TEST_PY_BD: "rpi_arm64"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a ~CMD_BOOTEFI_SELFTEST -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000 -a NET_LWIP"
-
-Raspberry Pi 3 (rpi_3_32b):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 3 (rpi_arm64, lwIP)" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi3-1"
-    LG_PLACE: "rpi3-1"
-    TEST_PY_BD: "rpi_3_32b"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000"
-
-Raspberry Pi 3 (rpi_3_32b, lwIP):
-  <<: *sage_lab_dfn
-  needs: [ "Raspberry Pi 3 (rpi_3_32b)" ]
-  variables:
-    LABGRID_EXPORTER: "sage-exporter-rpi3-1"
-    LG_PLACE: "rpi3-1"
-    TEST_PY_BD: "rpi_3_32b"
-    OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000 -a NET_LWIP"

.gitlab-ci.yml

@@ -1,799 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-variables:
-  DEFAULT_ALL_TAG: "all"
-  DEFAULT_AMD64_TAG: "amd64"
-  DEFAULT_FAST_TAG: "fast"
-  MIRROR_DOCKER: docker.io
-  SAGE_LAB: ""
-  SJG_LAB: ""
-  PLATFORM: linux/amd64,linux/arm64
-
-default:
-  tags:
-    - ${DEFAULT_ALL_TAG}
-
-workflow:
-  rules:
-    - when: always
-
-# Grab our configured image.  The source for this is found
-# in the u-boot tree at tools/docker/Dockerfile
-image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:noble-20251013-23Jan2026
-
-# We run some tests in different order, to catch some failures quicker.
-stages:
-  - testsuites
-  - test.py
-  - sage-lab
-  - sjg-lab
-  - world build
-
-.buildman_and_testpy_template: &buildman_and_testpy_dfn
-  stage: test.py
-  retry: 2 # QEMU may be too slow, etc.
-  needs: [ "Build allyesconfig, tools-only and envtools" ]
-  before_script:
-    # Clone uboot-test-hooks
-    - git config --global --add safe.directory "${CI_PROJECT_DIR}"
-    - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
-    # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled.
-    # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks
-    - ln -s conf.qemu_arm64 /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu_arm64_lwip_na
-    - ln -s u_boot_boardenv_qemu_arm64_na.py /tmp/uboot-test-hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py
-    - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
-    - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
-    - if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]] || [[ "${TEST_PY_BD}" == "xilinx_mbv32_smode" ]]; then
-        wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ;
-        export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
-      fi
-    - if [[ "${TEST_PY_BD}" == "qemu-riscv64_spl" ]] || [[ "${TEST_PY_BD}" == "sifive_unleashed" ]] || [[ "${TEST_PY_BD}" == "xilinx_mbv64_smode" ]]; then
-        wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ;
-        export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
-      fi
-    - if [[ "${TEST_PY_BD}" == "qemu-arm-sbsa" ]]; then
-        wget -O /tmp/bl1.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/bl1.bin;
-        wget -O /tmp/fip.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/fip.bin;
-        export BINMAN_INDIRS=/tmp;
-      fi
-    # Prepare python environment
-    - python3 -m venv /tmp/venv;
-      . /tmp/venv/bin/activate;
-      pip install -r test/py/requirements.txt -r tools/binman/requirements.txt
-        -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt
-        setuptools
-
-  after_script:
-    - cp -v /tmp/${TEST_PY_BD}/*.{html,css,xml} .
-    - rm -rf /tmp/uboot-test-hooks /tmp/venv
-  script:
-    # If we've been asked to use clang only do one configuration.
-    - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}
-    - echo BUILD_ENV ${BUILD_ENV}
-    - if [ -n "${BUILD_ENV}" ]; then
-        export ${BUILD_ENV};
-      fi
-    - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e
-        --board ${TEST_PY_BD} ${OVERRIDE}
-    - cp /opt/grub/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/
-    - cp /opt/grub/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/
-    - cp /opt/grub/grubriscv64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv64.efi
-    - cp /opt/grub/grubaa64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm64.efi
-    - cp /opt/grub/grubarm.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm.efi
-    # create sdcard / spi-nor images for sifive unleashed using genimage
-    - if [[ "${TEST_PY_BD}" == "sifive_unleashed" ]]; then
-        mkdir -p root;
-        cp ${UBOOT_TRAVIS_BUILD_DIR}/spl/u-boot-spl.bin .;
-        cp ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.itb .;
-        rm -rf tmp;
-        genimage --inputpath . --config board/sifive/unleashed/genimage_sdcard.cfg;
-        cp images/sdcard.img ${UBOOT_TRAVIS_BUILD_DIR}/;
-        rm -rf tmp;
-        genimage --inputpath . --config board/sifive/unleashed/genimage_spi-nor.cfg;
-        cp images/spi-nor.img ${UBOOT_TRAVIS_BUILD_DIR}/;
-      fi
-    - if [[ "${TEST_PY_BD}" == "coreboot" ]]; then
-        cp /opt/coreboot/coreboot.rom ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
-        /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom remove -n fallback/payload;
-        /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000;
-      fi
-    # If we have TF-A binaries, we need to use them.
-    - tfa_dir=""
-    - rm -f /tmp/fip.bin
-    - rm -f /tmp/bl1.bin
-    - if [[ -d /opt/tf-a/"${TEST_PY_BD}${TEST_PY_ID//--id /_}" ]]; then
-        tfa_dir="/opt/tf-a/${TEST_PY_BD}${TEST_PY_ID//--id /_}";
-      elif [[ -d /opt/tf-a/"${TEST_PY_BD}" ]]; then
-        tfa_dir="/opt/tf-a/${TEST_PY_BD}";
-      fi
-    - if [[ -n "$tfa_dir" ]]; then
-        cp "$tfa_dir"/fip.bin "$tfa_dir"/bl1.bin /tmp/;
-      fi
-    - if [ -f /tmp/fip.bin ] && [ -f /tmp/bl1.bin ]; then
-        export fip=/tmp/fip.bin;
-        export bl1=/tmp/bl1.bin;
-        export PATH=/opt/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3:${PATH};
-      fi
-    # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not
-    - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH};
-      export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
-      python3 -m http.server 80 --directory "${UBOOT_TRAVIS_BUILD_DIR}" > /dev/null 2>&1 &
-      HTTP_PID=$!;
-      sleep 1;
-      if ps -p ${HTTP_PID} > /dev/null; then
-        export HTTP_PID;
-      else
-        unset HTTP_PID;
-      fi;
-      ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_EXTRA}
-        ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"}
-        --build-dir "$UBOOT_TRAVIS_BUILD_DIR"
-        --junitxml=/tmp/${TEST_PY_BD}/results.xml;
-      if [[ -n "${HTTP_PID}" ]]; then
-        kill ${HTTP_PID};
-      fi
-  artifacts:
-    when: always
-    paths:
-      - "*.html"
-      - "*.css"
-      - results.xml
-    reports:
-      junit: results.xml
-    expire_in: 1 week
-
-build all platforms in a single job:
-  stage: world build
-  dependencies: []
-  needs: [ "sandbox test.py" ]
-  tags:
-    - ${DEFAULT_FAST_TAG}
-  script:
-    # Prepare python environment
-    - python3 -m venv /tmp/venv;
-      . /tmp/venv/bin/activate;
-      pip install -r tools/binman/requirements.txt
-        -r tools/buildman/requirements.txt
-        setuptools
-    - ret=0;
-      git config --global --add safe.directory "${CI_PROJECT_DIR}";
-      ./tools/buildman/buildman -o /tmp -PEWM -x xtensa || ret=$?;
-      if [[ $ret -ne 0 ]]; then
-        ./tools/buildman/buildman -o /tmp -seP;
-        exit $ret;
-      fi;
-
-.testsuites:
-  stage: testsuites
-
-check for new CONFIG symbols outside Kconfig:
-  extends: .testsuites
-  script:
-    - git config --global --add safe.directory "${CI_PROJECT_DIR}"
-    # If grep succeeds and finds a match the test fails as we should
-    # have no matches.
-    - git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_'
-        :^doc/ :^arch/arm/dts/ :^scripts/kconfig/lkc.h
-        :^include/linux/kconfig.h :^tools/ :^dts/upstream/
-        :^lib/mbedtls/external :^lib/mbedtls/mbedtls_def_config.h &&
-        exit 1 || exit 0
-
-# build documentation
-docs:
-  extends: .testsuites
-  script:
-    - python3 -m venv /tmp/venvhtml
-    - . /tmp/venvhtml/bin/activate
-    - pip install -r doc/sphinx/requirements.txt -r test/py/requirements.txt
-    - make htmldocs KDOC_WERROR=1
-    - make infodocs
-
-# ensure all configs have MAINTAINERS entries
-Check for configs without MAINTAINERS entry:
-  extends: .testsuites
-  script:
-    - ./tools/buildman/buildman --maintainer-check
-
-# Ensure host tools build
-Build allyesconfig, tools-only and envtools:
-  extends: .testsuites
-  script:
-    # Allow pipefail because of how we use 'yes' here.
-    - set +o pipefail;
-      yes 0 | make allyesconfig oldconfig all -j$(nproc);
-      make mrproper;
-      make tools-only_config tools-only -j$(nproc);
-      make mrproper;
-      make tools-only_config envtools -j$(nproc)
-
-Run binman, buildman, dtoc, Kconfig and patman testsuites:
-  extends: .testsuites
-  tags:
-    - ${DEFAULT_AMD64_TAG}
-  script:
-    - git config --global user.name "GitLab CI Runner";
-      git config --global user.email trini@konsulko.com;
-      git config --global --add safe.directory "${CI_PROJECT_DIR}";
-      export USER=gitlab;
-      python3 -m venv /tmp/venv;
-      . /tmp/venv/bin/activate;
-      pip install -r test/py/requirements.txt -r tools/binman/requirements.txt
-        -r tools/buildman/requirements.txt -r tools/patman/requirements.txt
-        -r tools/u_boot_pylib/requirements.txt;
-      export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only;
-      export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt";
-      export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}";
-      set +e;
-      ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w
-        --board tools-only;
-      set -e;
-      export TOOLPATH="--toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools --toolpath /opt/coreboot";
-      ./tools/binman/binman ${TOOLPATH} tool -f missing;
-      ./tools/binman/binman ${TOOLPATH} test;
-      ./tools/binman/binman ${TOOLPATH} test -T;
-      ./tools/buildman/buildman -t;
-      ./tools/dtoc/dtoc -t;
-      ./tools/patman/patman test;
-      make testconfig
-
-# Check for any pylint regressions
-Run pylint:
-  extends: .testsuites
-  script:
-    - git config --global --add safe.directory "${CI_PROJECT_DIR}"
-    - python3 -m venv /tmp/venv
-    - . /tmp/venv/bin/activate
-    - pip install -r test/py/requirements.txt -r tools/binman/requirements.txt
-        -r tools/buildman/requirements.txt -r tools/patman/requirements.txt
-        -r tools/u_boot_pylib/requirements.txt asteval pylint==3.3.4 pyopenssl
-    - export PATH=${PATH}:~/.local/bin
-    - echo "[MASTER]" >> .pylintrc
-    - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
-    - export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only
-    - set +e
-    - ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w
-        --board tools-only
-    - set -e
-    - pylint --version
-    - export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"
-    - make pylint_err
-
-# Check we can package the Python tools
-Check packing of Python tools:
-  extends: .testsuites
-  script:
-    - make pip
-
-# Test sandbox with test.py
-sandbox test.py:
-  parallel:
-    matrix:
-      - HOST: "arm64"
-      - HOST: "amd64"
-  tags:
-    - ${HOST}
-  variables:
-    TEST_PY_BD: "sandbox"
-    TEST_PY_EXTRA: "--timing"
-    # addr2line in Ubuntu 'Noble' and later are broken.
-    TEST_PY_TEST_SPEC: "not event_dump"
-  <<: *buildman_and_testpy_dfn
-
-sandbox with clang test.py:
-  parallel:
-    matrix:
-      - HOST: "arm64"
-      - HOST: "amd64"
-  tags:
-    - ${HOST}
-  variables:
-    TEST_PY_BD: "sandbox"
-    OVERRIDE: "-O clang-20"
-    # addr2line in Ubuntu 'Noble' and later are broken.
-    TEST_PY_TEST_SPEC: "not event_dump"
-  <<: *buildman_and_testpy_dfn
-
-sandbox64 test.py:
-  parallel:
-    matrix:
-      - HOST: "arm64"
-      - HOST: "amd64"
-  tags:
-    - ${HOST}
-  variables:
-    TEST_PY_BD: "sandbox64"
-  <<: *buildman_and_testpy_dfn
-
-sandbox64 with clang test.py:
-  parallel:
-    matrix:
-      - HOST: "arm64"
-      - HOST: "amd64"
-  tags:
-    - ${HOST}
-  variables:
-    TEST_PY_BD: "sandbox64"
-    OVERRIDE: "-O clang-20"
-  <<: *buildman_and_testpy_dfn
-
-sandbox64_lwip test.py:
-  variables:
-    TEST_PY_BD: "sandbox64_lwip"
-  <<: *buildman_and_testpy_dfn
-
-sandbox_spl test.py:
-  variables:
-    TEST_PY_BD: "sandbox_spl"
-    TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-  <<: *buildman_and_testpy_dfn
-
-sandbox_noinst_test.py:
-  variables:
-    TEST_PY_BD: "sandbox_noinst"
-    TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-  <<: *buildman_and_testpy_dfn
-
-sandbox_noinst with LOAD_FIT_FULL test.py:
-  variables:
-    TEST_PY_BD: "sandbox_noinst"
-    TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-    OVERRIDE: "-a CONFIG_SPL_LOAD_FIT_FULL=y"
-  <<: *buildman_and_testpy_dfn
-
-sandbox_vpl test.py:
-  variables:
-    TEST_PY_BD: "sandbox_vpl"
-    TEST_PY_TEST_SPEC: "vpl or test_spl"
-  <<: *buildman_and_testpy_dfn
-
-# Enable tracing and disable LTO, to ensure functions are not elided
-sandbox trace_test.py:
-  variables:
-    TEST_PY_BD: "sandbox"
-    BUILD_ENV: "FTRACE=1 NO_LTO=1"
-    TEST_PY_TEST_SPEC: "trace"
-    OVERRIDE: "-a CONFIG_TRACE=y -a CONFIG_TRACE_EARLY=y -a CONFIG_TRACE_EARLY_SIZE=0x01000000 -a CONFIG_TRACE_BUFFER_SIZE=0x02000000"
-  <<: *buildman_and_testpy_dfn
-
-evb-ast2500 test.py:
-  variables:
-    TEST_PY_BD: "evb-ast2500"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-sandbox_flattree test.py:
-  variables:
-    TEST_PY_BD: "sandbox_flattree"
-  <<: *buildman_and_testpy_dfn
-
-vexpress_ca9x4 test.py:
-  variables:
-    TEST_PY_BD: "vexpress_ca9x4"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-integratorcp_cm926ejs test.py:
-  variables:
-    TEST_PY_BD: "integratorcp_cm926ejs"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-qemu_arm test.py:
-  variables:
-    TEST_PY_BD: "qemu_arm"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu_arm64 test.py:
-  variables:
-    TEST_PY_BD: "qemu_arm64"
-    TEST_PY_TEST_SPEC: "not sleep"
-    OVERRIDE: "-a CONFIG_SEMIHOSTING=y"
-  <<: *buildman_and_testpy_dfn
-
-qemu_arm64_lwip test.py:
-  variables:
-    TEST_PY_BD: "qemu_arm64_lwip"
-    TEST_PY_TEST_SPEC: "test_net_dhcp or test_net_ping or test_net_tftpboot"
-  <<: *buildman_and_testpy_dfn
-
-qemu_arm64_tfa_fw_handoff test.py:
-  variables:
-    TEST_PY_BD: "qemu_arm64"
-    TEST_PY_ID: "--id fw_handoff_tfa_optee"
-    TEST_PY_TEST_SPEC: "test_fw_handoff"
-  <<: *buildman_and_testpy_dfn
-
-qemu_arm_sbsa test.py:
-  variables:
-    TEST_PY_BD: "qemu-arm-sbsa"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu_m68k test.py:
-  variables:
-    TEST_PY_BD: "M5208EVBE"
-    TEST_PY_ID: "--id qemu"
-    TEST_PY_TEST_SPEC: "not sleep and not efi"
-    OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR"
-  <<: *buildman_and_testpy_dfn
-
-qemu_m68k_virt test.py:
-  variables:
-    TEST_PY_BD: "qemu-m68k"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu_malta test.py:
-  variables:
-    TEST_PY_BD: "malta"
-    TEST_PY_TEST_SPEC: "not sleep and not efi"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-qemu_maltael test.py:
-  variables:
-    TEST_PY_BD: "maltael"
-    TEST_PY_TEST_SPEC: "not sleep and not efi"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-qemu_malta64 test.py:
-  variables:
-    TEST_PY_BD: "malta64"
-    TEST_PY_TEST_SPEC: "not sleep and not efi"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-qemu_malta64el test.py:
-  variables:
-    TEST_PY_BD: "malta64el"
-    TEST_PY_TEST_SPEC: "not sleep and not efi"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-qemu-ppce500 test.py:
-  variables:
-    TEST_PY_BD: "qemu-ppce500"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-riscv32 test.py:
-  variables:
-    TEST_PY_BD: "qemu-riscv32"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-riscv64 test.py:
-  variables:
-    TEST_PY_BD: "qemu-riscv64"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-riscv32_spl test.py:
-  variables:
-    TEST_PY_BD: "qemu-riscv32_spl"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-riscv64_spl test.py:
-  variables:
-    TEST_PY_BD: "qemu-riscv64_spl"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-riscv64_smode test.py:
-  variables:
-    TEST_PY_BD: "qemu-riscv64_smode"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-riscv64_smode_acpi test.py:
-  variables:
-    TEST_PY_BD: "qemu-riscv64_smode_acpi"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-x86 test.py:
-  variables:
-    TEST_PY_BD: "qemu-x86"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-x86_64 test.py:
-  variables:
-    TEST_PY_BD: "qemu-x86_64"
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *buildman_and_testpy_dfn
-
-qemu-xtensa-dc233c test.py:
-  variables:
-    TEST_PY_BD: "qemu-xtensa-dc233c"
-    TEST_PY_TEST_SPEC: "not sleep and not efi"
-  tags:
-    - ${DEFAULT_AMD64_TAG}
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_i82557c test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id i82557c_qemu"
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_pcnet test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id pcnet_qemu"
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_rtl8139 test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id rtl8139_qemu"
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_tulip test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id tulip_qemu"
-  <<: *buildman_and_testpy_dfn
-
-# This is broken upsteam: https://gitlab.com/qemu-project/qemu/-/issues/2945
-#sifive_unleashed_sdcard test.py:
-#  variables:
-#    TEST_PY_BD: "sifive_unleashed"
-#    TEST_PY_TEST_SPEC: "not sleep"
-#    TEST_PY_ID: "--id sdcard_qemu"
-#  <<: *buildman_and_testpy_dfn
-
-sifive_unleashed_spi-nor test.py:
-  variables:
-    TEST_PY_BD: "sifive_unleashed"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id spi-nor_qemu"
-  <<: *buildman_and_testpy_dfn
-
-xilinx_mbv32 test.py:
-  variables:
-    TEST_PY_BD: "xilinx_mbv32"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-xilinx_mbv32_smode test.py:
-  variables:
-    TEST_PY_BD: "xilinx_mbv32_smode"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-xilinx_mbv64 test.py:
-  variables:
-    TEST_PY_BD: "xilinx_mbv64"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-xilinx_mbv64_smode test.py:
-  variables:
-    TEST_PY_BD: "xilinx_mbv64_smode"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-xilinx_zynq_virt test.py:
-  variables:
-    TEST_PY_BD: "xilinx_zynq_virt"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-xilinx_versal_virt test.py:
-  variables:
-    TEST_PY_BD: "xilinx_versal_virt"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-    OVERRIDE: "-a ~CONFIG_USB_DWC3"
-  <<: *buildman_and_testpy_dfn
-
-xtfpga test.py:
-  variables:
-    TEST_PY_BD: "xtfpga"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  tags:
-    - ${DEFAULT_AMD64_TAG}
-  <<: *buildman_and_testpy_dfn
-
-coreboot test.py:
-  variables:
-    TEST_PY_BD: "coreboot"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-# Add sage-lab stage
-include: .gitlab-ci-sage-lab.yml
-
-.sjg_lab_template: &sjg_lab_dfn
-  stage: sjg-lab
-  rules:
-    - if: $SJG_LAB == "1"
-      when: always
-    - if: $SJG_LAB != "1"
-      when: manual
-      allow_failure: true
-  dependencies: []
-  needs: [ "sandbox test.py" ]
-  tags: [ 'lab' ]
-  script:
-    # Environment:
-    #   SRC  - source tree
-    #   OUT  - output directory for builds
-    - export SRC="$(pwd)"
-    - export OUT="${SRC}/build/${BOARD}"
-    - export PATH=$PATH:~/bin
-    - export PATH=$PATH:/vid/software/devel/ubtest/u-boot-test-hooks/bin
-
-    # Load it on the device
-    - ret=0
-    - echo "role ${ROLE}"
-    - export strategy="-s uboot -e off"
-    - export USE_LABGRID_SJG=1
-    # export verbose="-v"
-    - ${SRC}/test/py/test.py -ra --role ${ROLE} ${TEST_PY_EXTRA:-"--capture=tee-sys"}
-        --build-dir "${OUT}"
-        ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"}
-        --junitxml=${OUT}/results.xml || ret=$?
-    - U_BOOT_BOARD_IDENTITY="${ROLE}" u-boot-test-release || true
-    - if [[ $ret -ne 0 ]]; then
-        exit $ret;
-      fi
-  artifacts:
-    when: always
-    paths:
-      - "build/${BOARD}/test-log.html"
-      - "build/${BOARD}/multiplexed_log.css"
-      - "build/${BOARD}/results.xml"
-    reports:
-      junit: "build/${BOARD}/results.xml"
-    expire_in: 1 week
-
-rpi3:
-  variables:
-    ROLE: rpi3
-  <<: *sjg_lab_dfn
-
-opi_pc:
-  variables:
-    ROLE: opi_pc
-  <<: *sjg_lab_dfn
-
-pcduino3_nano:
-  variables:
-    ROLE: pcduino3_nano
-  <<: *sjg_lab_dfn
-
-samus:
-  variables:
-    ROLE: samus
-  <<: *sjg_lab_dfn
-
-link:
-  variables:
-    ROLE: link
-  <<: *sjg_lab_dfn
-
-jerry:
-  variables:
-    ROLE: jerry
-  <<: *sjg_lab_dfn
-
-minnowmax:
-  variables:
-    ROLE: minnowmax
-  <<: *sjg_lab_dfn
-
-opi_pc2:
-  variables:
-    ROLE: opi_pc2
-  <<: *sjg_lab_dfn
-
-bpi:
-  variables:
-    ROLE: bpi
-  <<: *sjg_lab_dfn
-
-rpi2:
-  variables:
-    ROLE: rpi2
-  <<: *sjg_lab_dfn
-
-bob:
-  variables:
-    ROLE: bob
-  <<: *sjg_lab_dfn
-
-ff3399:
-  variables:
-    ROLE: ff3399
-  <<: *sjg_lab_dfn
-
-coral:
-  variables:
-    ROLE: coral
-  <<: *sjg_lab_dfn
-
-rpi3z:
-  variables:
-    ROLE: rpi3z
-  <<: *sjg_lab_dfn
-
-bbb:
-  variables:
-    ROLE: bbb
-  <<: *sjg_lab_dfn
-
-kevin:
-  variables:
-    ROLE: kevin
-  <<: *sjg_lab_dfn
-
-pine64:
-  variables:
-    ROLE: pine64
-  <<: *sjg_lab_dfn
-
-c4:
-  variables:
-    ROLE: c4
-  <<: *sjg_lab_dfn
-
-rpi4:
-  variables:
-    ROLE: rpi4
-  <<: *sjg_lab_dfn
-
-rpi0:
-  variables:
-    ROLE: rpi0
-  <<: *sjg_lab_dfn
-
-snow:
-  variables:
-    ROLE: snow
-  <<: *sjg_lab_dfn
-
-pcduino3:
-  variables:
-    ROLE: pcduino3
-  <<: *sjg_lab_dfn
-
-nyan-big:
-  variables:
-    ROLE: nyan-big
-  <<: *sjg_lab_dfn
-
-rpi:
-  variables:
-    ROLE: rpi
-  <<: *sjg_lab_dfn
-
-# StarFive VisionFive 2
-vf2:
-  variables:
-    ROLE: vf2
-  <<: *sjg_lab_dfn
-
-qemu-x86_64:
-  variables:
-    ROLE: qemu-x86_64
-    TEST_PY_TEST_SPEC: "not sleep"
-  <<: *sjg_lab_dfn

.mailmap

@@ -4,169 +4,32 @@
 # and/or not always written the same way, making contributions from the
 # same person appearing not to be so or badly displayed.
 #
-# This file is also used by scripts/get_maintainer.pl.
-#
 # This file can be modified by hand or updated by the following command:
 #  scripts/mailmapper > tmp; mv tmp .mailmap
 #
-# Entries in this file take one of the following forms:
-# Proper Name <commit@email.xx>
-# <proper@email.xx> <commit@email.xx>
-# Proper Name <proper@email.xx> <commit@email.xx>
-# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
 
-AKASHI Takahiro <akashi.tkhro@gmail.com> <takahiro.akashi@linaro.org>
-Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
 Allen Martin <amartin@nvidia.com>
-Amanda Baze <amanda.baze@amd.com> <nicole.baze@xilinx.com>
-Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> <amit.kumar-mahapatra@xilinx.com>
 Andreas Bießmann <andreas.devel@googlemail.com>
 Andreas Bießmann <andreas@biessmann.org>
 Aneesh V <aneesh@ti.com>
-Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
-Anurag Kumar Vulisha <AnuragKumar.Vulisha@amd.com> <anurag.kumar.vulisha@xilinx.com>
-Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com> <appana.durga.rao@xilinx.com>
-Ashok Reddy Soma <ashok.reddy.soma@amd.com> <ashok.reddy.soma@xilinx.com>
-Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
-Bernhard Messerklinger <bernhard.messerklinger@at.abb.com> <bernhard.messerklinger@br-automation.com>
-Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharat.kumar.gogada@xilinx.com>
-Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharatku@xilinx.com>
-Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@amd.com> <bhargava.sreekantappa-gayathri@xilinx.com>
-Bhupesh Sharma <bhupesh.linux@gmail.com> <bhupesh.sharma@linaro.org>
-Bin Meng <bmeng.cn@gmail.com> <bin.meng@windriver.com>
-Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
-Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
-Casey Connolly <casey.connolly@linaro.org> <caleb.connolly@linaro.org>
-Chen-Yu Tsai <wens@kernel.org> <wens@csie.org>
-Christian Kohn <chris.kohn@amd.com> <christian.kohn@xilinx.com>
-Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
 Dirk Behme <dirk.behme@googlemail.com>
-<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
-Durga Challa <durga.challa@amd.com> <vnsl.durga.challa@xilinx.com>
-Eugen Hristev <ehristev@kernel.org> <eugen.hristev@microchip.com>
-Eugen Hristev <ehristev@kernel.org> <eugen.hristev@linaro.org>
-Eugen Hristev <ehristev@kernel.org> <eugen.hristev@collabora.com>
 Fabio Estevam <fabio.estevam@nxp.com>
-Greg Malysa <malysagreg@gmail.com> <greg.malysa@timesys.com>
-Harini Katakam <harini.katakam@amd.com> <harini.katakam@xilinx.com>
-Harsha <harsha.harsha@amd.com> <harsha.harsha@xilinx.com>
-Heiko Stuebner <heiko.stuebner@cherry.de> <heiko.stuebner@theobroma-systems.com>
-Heiko Schocher <hs@nabladev.com> <hs@denx.de>
-Heiko Schocher <hs@nabladev.com> <hs@pollux.denx.de>
-Heiko Schocher <hs@nabladev.com> <heiko.schocher@invitel.hu>
-Heiko Schocher <hs@nabladev.com> <[hs@denx.de]>
-Heiko Schocher <hs@nabladev.com> <hs@pollux.(none)>
-Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
-Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
-Ibai Erkiaga <ibai.erkiaga-elorza@amd.com> <ibai.erkiaga-elorza@xilinx.com>
-Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
-Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
-Izhar Ameer Shaikh <izhar.ameer.shaikh@amd.com> <izhar.ameer.shaikh@xilinx.com>
 Jagan Teki <402jagan@gmail.com>
 Jagan Teki <jaganna@gmail.com>
 Jagan Teki <jaganna@xilinx.com>
 Jagan Teki <jagannadh.teki@gmail.com>
 Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
-Jakob Unterwurzacher <jakob.unterwurzacher@cherry.de> <jakob.unterwurzacher@theobroma-systems.com>
-Javier Tia <floss@jetm.me> <javier.tia@linaro.org>
-Jay Buddhabhatti <jay.buddhabhatti@amd.com> <jay.buddhabhatti@xilinx.com>
-Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
-Jerome Forissier <jerome.forissier@arm.com> <jerome@forissier.org>
-Jerome Forissier <jerome.forissier@arm.com> <jerome.forissier@linaro.org>
-John Linn <john.linn@amd.com> <john.linn@xilinx.com>
-Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari@amd.com> <jyothee@xilinx.com>
-Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari@amd.com> <jyotheeswar.reddy.mutthareddyvari@xilinx.com>
-Kalyani Akula <kalyani.akula@amd.com> <kalyani.akula@xilinx.com>
-Klaus Goger <klaus.goger@cherry.de> <klaus.goger@theobroma-systems.com>
-Masahisa Kojima <kojima.masahisa@socionext.com> <masahisa.kojima@linaro.org>
-Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
-Love Kumar <love.kumar@amd.com> <love.kumar@xilinx.com>
-Lukasz Majewski <lukma@denx.de>
-Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
-Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
-Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
-Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
-Marek Vasut <marex@denx.de> <marex at denx.de>
 Markus Klotzbuecher <mk@denx.de>
-Masahiro Yamada <masahiroy@kernel.org> <yamada.masahiro@socionext.com>
-Masahiro Yamada <masahiroy@kernel.org> <yamada.m@jp.panasonic.com>
-Mattijs Korpershoek <mkorpershoek@kernel.org> <mkorpershoek@baylibre.com>
-Michal Simek <michal.simek@amd.com> <Monstr@seznam.cz>
-Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
-Michal Simek <michal.simek@amd.com> <monstr@monstr.eu>
-Michal Simek <michal.simek@amd.com> <root@monstr.eu>
-Mirza <Taimoor_Mirza@mentor.com>
-Mounika Grace Akula <mounika.akula@amd.com> <mounika.grace.akula@xilinx.com>
-Mubin Usman Sayyed <mubin.sayyed@amd.com> <mubin.usman.sayyed@xilinx.com>
-Nathalie Chan King Choy <nathalie.chan-king-choy@amd.com> <nathalie.chan-king-choy@xilinx.com>
-Nathalie Chan King Choy <nathalie.chan-king-choy@amd.com> <nathalie@xilinx.com>
-Nava kishore Manne <nava.kishore.manne@amd.com> <nava.manne@xilinx.com>
-Neal Frager <neal.frager@amd.com> <neal.frager@xilinx.com>
-Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
-Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
-This contributor prefers not to receive mails <noreply@example.com> <pali@kernel.org>
-This contributor prefers not to receive mails <noreply@example.com> <pali.rohar@gmail.com>
-Padmarao Begari <padmarao.begari@amd.com> <padmarao.begari@microchip.com>
-Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
-Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
-Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
-Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
-Philipp Tomsich <philipp.tomsich@vrull.eu> <philipp.tomsich@theobroma-systems.com>
-Piyush Mehta <piyush.mehta@amd.com> <piyush.mehta@xilinx.com>
 Prabhakar Kushwaha <prabhakar@freescale.com>
-Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@amd.com> <punnaiah.choudary.kalluri@xilinx.com>
-Quentin Schulz <quentin.schulz@cherry.de> <quentin.schulz@theobroma-systems.com>
-Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> <radhey.shyam.pandey@xilinx.com>
 Rajeshwari Shinde <rajeshwari.s@samsung.com>
-Raju Kumar Pothuraju <rajukumar.pothuraju@amd.com> <raju.kumar-pothuraju@xilinx.com>
-Ravi Patel <ravi.patel@amd.com> <ravi.patel@xilinx.com>
-Raymond Mao <raymondmaoca@gmail.com> <raymond.mao@linaro.org>
-Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
-Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
-Rohit Visavalia <rohit.visavalia@amd.com> <rohit.visavalia@xilinx.com>
-Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
-Saeed Nowshadi <saeed.nowshadi@amd.com> <saeed.nowshadi@xilinx.com>
-Sai Krishna Potthuri <sai.krishna.potthuri@amd.com> <lakshmi.sai.krishna.potthuri@xilinx.com>
-Sai Pavan Boddu <sai.pavan.boddu@amd.com> <sai.pavan.boddu@xilinx.com>
-Sam Protsenko <semen.protsenko@linaro.org>
-Sam Protsenko <semen.protsenko@linaro.org> <joe.skb7@gmail.com>
-Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> <sandeep.gundlupet-raju@xilinx.com>
+Ricardo Ribalda <ricardo.ribalda@uam.es>
+Ricardo Ribalda <ricardo.ribalda@gmail.com>
 Sandeep Paulraj <s-paulraj@ti.com>
-Sandeep Reddy Ghanapuram <sandeep.reddy-ghanapuram@amd.com> <sandeep.reddy-ghanapuram@xilinx.com>
-Sean Anderson <sean.anderson@linux.dev> <sean.anderson@seco.com>
 Shaohui Xie <Shaohui.Xie@freescale.com>
-Shravya Kumbham <shravya.kumbham@amd.com> <shravya.kumbham@xilinx.com>
-Shubhrajyoti Datta <shubhrajyoti.datta@amd.com> <shubhrajyoti.datta@xilinx.com>
-Simon Glass <sjg@chromium.org> <simon.glass@canonical.com>
-Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com> <siva.durga.paladugu@xilinx.com>
-Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com> <sivadur@xilinx.com>
-Srinivas Goud <srinivas.goud@amd.com> <srinivas.goud@xilinx.com>
-Srinivas Neeli <srinivas.neeli@amd.com> <srinivas.neeli@xilinx.com>
-Stefan Roese <stefan.roese@mailbox.org> <stroese>
-Stefano Babic <sbabic@nabladev.com>
-Stefano Stabellini <stefano.stabellini@amd.com> <stefano.stabellini@xilinx.com>
-Sughosh Ganu <sughosh.ganu@arm.com> <sughosh.ganu@linaro.org>
-No generic patch CC mail please <noreply@example.com> <swarren@wwwdotorg.org>
-No generic patch CC mail please <noreply@example.com> <swarren@nvidia.com>
-Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>
-Tom Rini <trini@konsulko.com> <trini@ti.com>
-Tomas Thoresen <tomas.thoresen@amd.com> <tomast@xilinx.com>
+Stefan Roese <stroese>
+Stefano Babic <sbabic@denx.de>
 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
-Varalaxmi Bingi <varalaxmi.bingi@amd.com> <varalaxmi.bingi@xilinx.com>
-Abbarapu Venkatesh Yadav <venkyada@qti.qualcomm.com>
-Vikhyat Goyal <vikhyat.goyal@amd.com> <vikhyat.goyal@xilinx.com>
-Vishal Patel <vishal.patel@amd.com> <vishal.patel@xilinx.com>
-Wolfgang Denk <wd@denx.de> <wd@atlas.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@castor.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@fifi.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@nyx.(none)>
-Wolfgang Denk <wd@denx.de> <wd@nyx.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
-Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
-Wolfgang Denk <wd@denx.de> <wdenk>
-Wolfgang Wallner <wolfgang.wallner@at.abb.com> <wolfgang.wallner@br-automation.com>
-Yao Zi <me@ziyao.cc> <ziyao@disroot.org>
-York Sun <york.sun@nxp.com>
+Wolfgang Denk <wdenk>
 York Sun <yorksun@freescale.com>
+York Sun <york.sun@nxp.com>
 Łukasz Majewski <l.majewski@samsung.com>

.readthedocs.yml

@@ -1,25 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-build:
-  os: "ubuntu-24.04"
-  apt_packages:
-    - python3-six
-  tools:
-    python: "3.12"
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: doc/conf.py
-
-# Optionally build your docs in additional formats such as PDF and ePub
-formats: []
-
-python:
-  install:
-    - requirements: doc/sphinx/requirements.txt
-    - requirements: test/py/requirements.txt

.travis.yml

@@ -0,0 +1,189 @@
+# Copyright Roger Meier <r.meier@siemens.com>
+# SPDX-License-Identifier:	GPL-2.0+
+
+# build U-Boot on Travis CI - https://travis-ci.org/
+
+sudo: true
+
+language: c
+
+addons:
+  apt:
+    packages:
+    - cppcheck
+    - sloccount
+    - sparse
+    - bc
+    - build-essential
+    - libsdl1.2-dev
+    - python
+    - python-virtualenv
+
+cache:
+ - apt
+
+install:
+ # install latest device tree compiler
+ - git clone --depth=1 https://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc
+ - make -j4 -C /tmp/dtc
+ # prepare buildman environment
+ - export BUILDMAN_ROOT="root:"
+ - export BUILDMAN_PPC="ppc:"
+ - export BUILDMAN_ARM="arm:"
+ - export BUILDMAN_SANDBOX="sandbox:"
+ - echo -e "[toolchain]\n${BUILDMAN_ROOT} /\n" > ~/.buildman
+ - echo -e "${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/\n" >> ~/.buildman
+ - echo -e "${BUILDMAN_ARM} /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/\n" >> ~/.buildman
+ - echo -e "${BUILDMAN_SANDBOX} /usr/bin/gcc\n" >> ~/.buildman
+ - export BUILDMAN_ALIAS="x86:"
+ - export BUILDMAN_ALIAS_ARM="arm:"
+ - echo -e "\n\n[toolchain-alias]\n${BUILDMAN_ALIAS} i386\n" >> ~/.buildman
+ - echo -e "${BUILDMAN_ALIAS_ARM} armv5te\n" >> ~/.buildman
+ - cat ~/.buildman
+ - virtualenv /tmp/venv
+ - . /tmp/venv/bin/activate
+ - pip install pytest
+
+env:
+  global:
+    - PATH=/tmp/dtc:$PATH
+    - BUILD_DIR=build
+    - HOSTCC="cc"
+    - HOSTCXX="c++"
+
+before_script:
+  # install toolchains based on TOOLCHAIN} variable
+  - if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi
+  - if [[ "${TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi
+  - if [[ "${TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi
+  - if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi
+  - if [[ "${TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi
+  - if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi
+  - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi
+  - if [[ "${TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi
+  - if [[ "${TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi
+
+script:
+ # the execution sequence for each test
+ - if [[ "${TEST_CMD}" != "" ]]; then
+     ${TEST_CMD};
+   fi
+ - if [[ "${BUILDMAN}" != "" ]]; then
+     tools/buildman/buildman ${BUILDMAN};
+   fi
+
+matrix:
+  include:
+  # we need to build by vendor due to 50min time limit for builds
+  # each env setting here is a dedicated build
+    - env:
+        - BUILDMAN="arm1136"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="arm1136"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="arm1176"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="arm720t"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="arm920t"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="atmel -x avr32"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="avr32"
+          TOOLCHAIN="avr32"
+    - env:
+        - BUILDMAN="davinci"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="denx"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="freescale -x powerpc,m68k,aarch64"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="sandbox x86"
+          TOOLCHAIN="i386"
+    - env:
+        - BUILDMAN="kirkwood"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="m68k"
+          TOOLCHAIN="m68k"
+    - env:
+        - BUILDMAN="mips"
+          TOOLCHAIN="mips"
+    - env:
+        - BUILDMAN="mpc512x"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc5xx"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc5xxx"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc8260"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc83xx"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc85xx -x freescale"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="t208xrdb t4qds t102*"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="p1_p2_rdb_pc p1010rdb"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc86xx"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="mpc8xx"
+          TOOLCHAIN="ppc"
+    - env:
+        - BUILDMAN="siemens"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="ti"
+          TOOLCHAIN="arm"
+    - env:
+        - BUILDMAN="aarch64"
+          TOOLCHAIN="aarch64"
+
+    # QA jobs for code analytics
+    # static code analysis with cppcheck (we can add --enable=all later)
+    - env:
+        - TEST_CMD="cppcheck --force --quiet --inline-suppr ."
+    # search for TODO within source tree
+    - env:
+        - TEST_CMD="grep -r TODO ."
+    # search for FIXME within source tree
+    - env:
+        - TEST_CMD="grep -r FIXME ."
+    # search for HACK within source tree and ignore HACKKIT board
+    - env:
+        - TEST_CMD="grep -r HACK . | grep -v HACKKIT"
+      script:
+        - grep -r HACK . | grep -v HACKKIT
+    # some statistics about the code base
+    - env:
+        - TEST_CMD="sloccount ."
+    # test/py
+    - env:
+        - TEST_CMD="./test/py/test.py --bd sandbox --build"
+
+# TODO make it perfect ;-r

COPYING

@@ -1 +0,0 @@
-Licenses/gpl-2.0.txt

Kbuild

@@ -1,33 +1,68 @@
-# SPDX-License-Identifier: GPL-2.0
 #
 # Kbuild for top-level directory of U-Boot
+# This file takes care of the following:
+# 1) Generate generic-asm-offsets.h
+# 2) Generate asm-offsets.h
+
+# Default sed regexp - multiline due to syntax constraints
+define sed-y
+	"s:[[:space:]]*\.ascii[[:space:]]*\"\(.*\)\":\1:; \
+	/^->/{s:->#\(.*\):/* \1 */:; \
+	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:->::; p;}"
+endef
+
+# Use filechk to avoid rebuilds when a header changes, but the resulting file
+# does not
+define filechk_offsets
+	(set -e; \
+	 echo "#ifndef $2"; \
+	 echo "#define $2"; \
+	 echo "/*"; \
+	 echo " * DO NOT MODIFY."; \
+	 echo " *"; \
+	 echo " * This file was generated by Kbuild"; \
+	 echo " */"; \
+	 echo ""; \
+	 sed -ne $(sed-y); \
+	 echo ""; \
+	 echo "#endif" )
+endef
 
 #####
-# Generate generic-asm-offsets.h
+# 1) Generate generic-asm-offsets.h
 
 generic-offsets-file := include/generated/generic-asm-offsets.h
 
-always-y  := $(generic-offsets-file)
+always  := $(generic-offsets-file)
 targets := lib/asm-offsets.s
 
-CFLAGS_REMOVE_lib/asm-offsets.o := $(LTO_CFLAGS)
-CFLAGS_REMOVE_arch/$(ARCH)/lib/asm-offsets.o := $(LTO_CFLAGS)
+# We use internal kbuild rules to avoid the "is up to date" message from make
+lib/asm-offsets.s: lib/asm-offsets.c FORCE
+	$(Q)mkdir -p $(dir $@)
+	$(call if_changed_dep,cc_s_c)
 
-$(obj)/$(generic-offsets-file): $(obj)/lib/asm-offsets.s FORCE
+$(obj)/$(generic-offsets-file): lib/asm-offsets.s FORCE
 	$(call filechk,offsets,__GENERIC_ASM_OFFSETS_H__)
 
 #####
-# Generate asm-offsets.h
+# 2) Generate asm-offsets.h
+#
 
 ifneq ($(wildcard $(srctree)/arch/$(ARCH)/lib/asm-offsets.c),)
 offsets-file := include/generated/asm-offsets.h
 endif
 
-always-y  += $(offsets-file)
+always  += $(offsets-file)
 targets += arch/$(ARCH)/lib/asm-offsets.s
 
-CFLAGS_lib/asm-offsets.o := -DDO_DEPS_ONLY
-CFLAGS_arch/$(ARCH)/lib/asm-offsets.o := -DDO_DEPS_ONLY
+CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY
 
-$(obj)/$(offsets-file): $(obj)/arch/$(ARCH)/lib/asm-offsets.s FORCE
+# We use internal kbuild rules to avoid the "is up to date" message from make
+arch/$(ARCH)/lib/asm-offsets.s: arch/$(ARCH)/lib/asm-offsets.c FORCE
+	$(Q)mkdir -p $(dir $@)
+	$(call if_changed_dep,cc_s_c)
+
+$(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s FORCE
 	$(call filechk,offsets,__ASM_OFFSETS_H__)

Licenses/Exceptions

@@ -7,13 +7,9 @@ use U-Boot services by means of the jump table provided by U-Boot
 exactly for this purpose - this is merely considered normal use of
 U-Boot, and does *not* fall under the heading of "derived work".
 
-The following files define interfaces to U-Boot:
-  * include/image.h
-  * include/export.h
-  * arch/*/include/asm/u-boot.h
-  * examples/standalone/stubs.c
-
-Including these (unmodified) files in another file is considered normal
-use of U-Boot, and does *not* fall under the heading of "derived work".
+  The header files "include/image.h" and "arch/*/include/asm/u-boot.h"
+define interfaces to U-Boot.  Including these (unmodified) header
+files in another file is considered normal use of U-Boot, and does
+*not* fall under the heading of "derived work".
 -- Wolfgang Denk
 

Licenses/README

@@ -1,5 +1,3 @@
-SPDX-License-Identifier: GPL-2.0
-
   U-Boot is Free Software.  It is copyrighted by Wolfgang Denk and
 many others who contributed code (see the actual source code and the
 git commit messages for details).  You can redistribute U-Boot and/or
@@ -33,113 +31,32 @@ information, ...) which makes automatic processing a nightmare.
 
 To make this easier, such license headers in the source files will be
 replaced with a single line reference to Unique License Identifiers
-as defined by the Linux Foundation's SPDX project [1].
+as defined by the Linux Foundation's SPDX project [1].  For example,
+in a source file the full "GPL v2.0 or later" header text will be
+replaced by a single line:
+
+	SPDX-License-Identifier:	GPL-2.0+
+
+Ideally, the license terms of all files in the source tree should be
+defined by such License Identifiers; in no case a file can contain
+more than one such License Identifier list.
 
 If a "SPDX-License-Identifier:" line references more than one Unique
 License Identifier, then this means that the respective file can be
 used under the terms of either of these licenses, i. e. with
 
-	SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+	SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
 
 you can choose between GPL-2.0+ and BSD-3-Clause licensing.
 
 We use the SPDX Unique License Identifiers here; these are available
 at [2].
 
-License identifier syntax
--------------------------
-
-1. Placement:
-
-   The SPDX license identifier in U-Boot files shall be added at the first
-   possible line in a file which can contain a comment.  For the majority
-   or files this is the first line, except for scripts which require the
-   '#!PATH_TO_INTERPRETER' in the first line.  For those scripts the SPDX
-   identifier goes into the second line.
-
-|
-
-2. Style:
-
-   The SPDX license identifier is added in form of a comment.  The comment
-   style depends on the file type::
-
-      C source:	// SPDX-License-Identifier: <SPDX License Expression>
-      C header:	/* SPDX-License-Identifier: <SPDX License Expression> */
-      ASM:	/* SPDX-License-Identifier: <SPDX License Expression> */
-      scripts:	# SPDX-License-Identifier: <SPDX License Expression>
-      .rst:	.. SPDX-License-Identifier: <SPDX License Expression>
-      .dts{i}:	// SPDX-License-Identifier: <SPDX License Expression>
-
-   If a specific tool cannot handle the standard comment style, then the
-   appropriate comment mechanism which the tool accepts shall be used. This
-   is the reason for having the "/\* \*/" style comment in C header
-   files. There was build breakage observed with generated .lds files where
-   'ld' failed to parse the C++ comment. This has been fixed by now, but
-   there are still older assembler tools which cannot handle C++ style
-   comments.
-
-|
-
-3. Syntax:
-
-   A <SPDX License Expression> is either an SPDX short form license
-   identifier found on the SPDX License List, or the combination of two
-   SPDX short form license identifiers separated by "WITH" when a license
-   exception applies. When multiple licenses apply, an expression consists
-   of keywords "AND", "OR" separating sub-expressions and surrounded by
-   "(", ")" .
-
-   License identifiers for licenses like [L]GPL with the 'or later' option
-   are constructed by using a "+" for indicating the 'or later' option.::
-
-      // SPDX-License-Identifier: GPL-2.0+
-      // SPDX-License-Identifier: LGPL-2.1+
-
-   WITH should be used when there is a modifier to a license needed.
-   For example, the linux kernel UAPI files use the expression::
-
-      // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
-      // SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note
-
-   Other examples using WITH exceptions found in the linux kernel are::
-
-      // SPDX-License-Identifier: GPL-2.0 WITH mif-exception
-      // SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0
-
-   Exceptions can only be used with particular License identifiers. The
-   valid License identifiers are listed in the tags of the exception text
-   file.
-
-   OR should be used if the file is dual licensed and only one license is
-   to be selected.  For example, some dtsi files are available under dual
-   licenses::
-
-      // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
-
-   Examples from U-Boot for license expressions in dual licensed files::
-
-      // SPDX-License-Identifier: GPL-2.0 OR MIT
-      // SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
-
-   AND should be used if the file has multiple licenses whose terms all
-   apply to use the file. For example, if code is inherited from another
-   project and permission has been given to put it in U-Boot, but the
-   original license terms need to remain in effect::
-
-      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) AND MIT
-
-   Another other example where both sets of license terms need to be
-   adhered to is::
-
-      // SPDX-License-Identifier: GPL-1.0+ AND LGPL-2.1+
-
 [1] http://spdx.org/
 [2] http://spdx.org/licenses/
 
 Full name					SPDX Identifier	OSI Approved	File name		URI
 =======================================================================================================================================
-bzip2 and libbzip2 License v1.0.6		bzip2-1.0.6			bzip2-1.0.6.txt		https://spdx.org/licenses/bzip2-1.0.6.html
 GNU General Public License v2.0 only		GPL-2.0		Y		gpl-2.0.txt		http://www.gnu.org/licenses/gpl-2.0.txt
 GNU General Public License v2.0 or later	GPL-2.0+	Y		gpl-2.0.txt		http://www.gnu.org/licenses/gpl-2.0.txt
 GNU Library General Public License v2 or later	LGPL-2.0+	Y		lgpl-2.0.txt		http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt
@@ -150,6 +67,5 @@ BSD 3-clause "New" or "Revised" License		BSD-3-Clause	Y		bsd-3-clause.txt	http:/
 IBM PIBS (PowerPC Initialization and		IBM-pibs			ibm-pibs.txt
 	Boot Software) license
 ISC License					ISC		Y		isc.txt			https://spdx.org/licenses/ISC
-MIT License					MIT		Y		mit.txt			https://spdx.org/licenses/MIT.html
 SIL OPEN FONT LICENSE (OFL-1.1)			OFL-1.1		Y		OFL.txt			https://spdx.org/licenses/OFL-1.1.html
 X11 License					X11				x11.txt			https://spdx.org/licenses/X11.html

Licenses/bzip2-1.0.6.txt

@@ -1,30 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
-   documentation would be appreciated but is not required.
-
-3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-
-4. The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Licenses/lgpl-2.0.txt

@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-
+  
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an

Licenses/mit.txt

@@ -1,20 +0,0 @@
-MIT License
-Copyright (c) 2020 EPAM Systems Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Licenses/r8a779x_usb3.txt

@@ -1,26 +0,0 @@
-Copyright (c) 2014, Renesas Electronics Corporation
-All rights reserved.
-
-Redistribution and use in binary form, without modification, are permitted
-provided that the following conditions are met:
-
-1. Redistribution in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-2. The name of Renesas Electronics Corporation may not be used to endorse or
-   promote products derived from this software without specific prior written
-   permission.
-3. Reverse engineering, decompilation, or disassembly of this software is
-   not permitted.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS ELECTRONICS CORPORATION DISCLAIMS
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL RENESAS ELECTRONICS
-CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

api/Kconfig

@@ -1,22 +0,0 @@
-config API
-	bool "Enable U-Boot API"
-	depends on CC_IS_GCC
-	help
-	  This option enables the U-Boot API. See api/README for more information.
-
-menu "API"
-	depends on API
-
-config SYS_MMC_MAX_DEVICE
-	int  "Maximum number of MMC devices exposed via the API"
-	default 1
-
-config EXAMPLES
-	bool "Compile API examples"
-	depends on !SANDBOX
-	default y if ARCH_QEMU
-	help
-	  U-Boot provides an API for standalone applications. Examples are
-	  provided in directory examples/.
-
-endmenu

api/Makefile

@@ -1,11 +1,10 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # (C) Copyright 2007 Semihalf
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
 obj-y += api.o api_display.o api_net.o api_storage.o
-
-ifeq (CONFIG_PPC,y)
+obj-$(CONFIG_ARM) += api_platform-arm.o
 obj-$(CONFIG_PPC) += api_platform-powerpc.o
-else
-obj-y += api_platform.o
-endif
+obj-$(CONFIG_MIPS) += api_platform-mips.o

api/api.c

@@ -1,22 +1,18 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
 #include <command.h>
-#include <env.h>
+#include <common.h>
 #include <malloc.h>
-#include <time.h>
-#include <env_internal.h>
-#include <vsprintf.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
+#include <environment.h>
 #include <linux/types.h>
 #include <api_public.h>
-#include <u-boot/crc.h>
 
 #include "api_private.h"
 
@@ -59,7 +55,7 @@ static int API_getc(va_list ap)
 	if ((c = (int *)va_arg(ap, uintptr_t)) == NULL)
 		return API_EINVAL;
 
-	*c = getchar();
+	*c = getc();
 	return 0;
 }
 
@@ -180,6 +176,7 @@ static int API_get_timer(va_list ap)
 	return 0;
 }
 
+
 /*****************************************************************************
  *
  * pseudo signature:
@@ -229,6 +226,7 @@ static int API_dev_enum(va_list ap)
 	return 0;
 }
 
+
 static int API_dev_open(va_list ap)
 {
 	struct device_info *di;
@@ -260,6 +258,7 @@ static int API_dev_open(va_list ap)
 	return err;
 }
 
+
 static int API_dev_close(va_list ap)
 {
 	struct device_info *di;
@@ -294,32 +293,29 @@ static int API_dev_close(va_list ap)
 	return err;
 }
 
+
 /*
+ * Notice: this is for sending network packets only, as U-Boot does not
+ * support writing to storage at the moment (12.2007)
+ *
  * pseudo signature:
  *
  * int API_dev_write(
  *	struct device_info *di,
  *	void *buf,
- *	int *len,
- *	unsigned long *start
+ *	int *len
  * )
  *
  * buf:	ptr to buffer from where to get the data to send
  *
- * len: ptr to length to be read
- *      - network: len of packet to be sent (in bytes)
- *      - storage: # of blocks to write (can vary in size depending on define)
+ * len: length of packet to be sent (in bytes)
  *
- * start: ptr to start block (only used for storage devices, ignored for
- *        network)
  */
 static int API_dev_write(va_list ap)
 {
 	struct device_info *di;
 	void *buf;
-	lbasize_t *len_stor, act_len_stor;
-	lbastart_t *start;
-	int *len_net;
+	int *len;
 	int err = 0;
 
 	/* 1. arg is ptr to the device_info struct */
@@ -337,41 +333,29 @@ static int API_dev_write(va_list ap)
 	if (buf == NULL)
 		return API_EINVAL;
 
-	if (di->type & DEV_TYP_STOR) {
-		/* 3. arg - ptr to var with # of blocks to write */
-		len_stor = (lbasize_t *)va_arg(ap, uintptr_t);
-		if (!len_stor)
-			return API_EINVAL;
-		if (*len_stor <= 0)
-			return API_EINVAL;
+	/* 3. arg is length of buffer */
+	len = (int *)va_arg(ap, uintptr_t);
+	if (len == NULL)
+		return API_EINVAL;
+	if (*len <= 0)
+		return API_EINVAL;
 
-		/* 4. arg - ptr to var with start block */
-		start = (lbastart_t *)va_arg(ap, uintptr_t);
+	if (di->type & DEV_TYP_STOR)
+		/*
+		 * write to storage is currently not supported by U-Boot:
+		 * no storage device implements block_write() method
+		 */
+		return API_ENODEV;
 
-		act_len_stor = dev_write_stor(di->cookie, buf, *len_stor, *start);
-		if (act_len_stor != *len_stor) {
-			debugf("write @ %llu: done %llu out of %llu blocks",
-				   (uint64_t)blk, (uint64_t)act_len_stor,
-				   (uint64_t)len_stor);
-			return API_EIO;
-		}
-
-	} else if (di->type & DEV_TYP_NET) {
-		/* 3. arg points to the var with length of packet to write */
-		len_net = (int *)va_arg(ap, uintptr_t);
-		if (!len_net)
-			return API_EINVAL;
-		if (*len_net <= 0)
-			return API_EINVAL;
-
-		err = dev_write_net(di->cookie, buf, *len_net);
-
-	} else
+	else if (di->type & DEV_TYP_NET)
+		err = dev_write_net(di->cookie, buf, *len);
+	else
 		err = API_ENODEV;
 
 	return err;
 }
 
+
 /*
  * pseudo signature:
  *
@@ -457,6 +441,7 @@ static int API_dev_read(va_list ap)
 	return 0;
 }
 
+
 /*
  * pseudo signature:
  *
@@ -473,7 +458,7 @@ static int API_env_get(va_list ap)
 	if ((value = (char **)va_arg(ap, uintptr_t)) == NULL)
 		return API_EINVAL;
 
-	*value = env_get(name);
+	*value = getenv(name);
 
 	return 0;
 }
@@ -496,7 +481,7 @@ static int API_env_set(va_list ap)
 	if ((value = (char *)va_arg(ap, uintptr_t)) == NULL)
 		return API_EINVAL;
 
-	env_set(name, value);
+	setenv(name, value);
 
 	return 0;
 }
@@ -510,47 +495,45 @@ static int API_env_set(va_list ap)
  */
 static int API_env_enum(va_list ap)
 {
-	int i, buflen;
-	char *last, **next, *s;
-	struct env_entry *match, search;
-	static char *var;
+	int i, n;
+	char *last, **next;
 
 	last = (char *)va_arg(ap, unsigned long);
 
 	if ((next = (char **)va_arg(ap, uintptr_t)) == NULL)
 		return API_EINVAL;
 
-	if (last == NULL) {
-		var = NULL;
-		i = 0;
-	} else {
-		var = strdup(last);
-		s = strchr(var, '=');
-		if (s != NULL)
-			*s = 0;
-		search.key = var;
-		i = hsearch_r(search, ENV_FIND, &match, &env_htab, 0);
-		if (i == 0) {
-			i = API_EINVAL;
-			goto done;
+	if (last == NULL)
+		/* start over */
+		*next = ((char *)env_get_addr(0));
+	else {
+		*next = last;
+
+		for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
+			for (n = i; env_get_char(n) != '\0'; ++n) {
+				if (n >= CONFIG_ENV_SIZE) {
+					/* XXX shouldn't we set *next = NULL?? */
+					return 0;
+				}
+			}
+
+			if (envmatch((uchar *)last, i) < 0)
+				continue;
+
+			/* try to get next name */
+			i = n + 1;
+			if (env_get_char(i) == '\0') {
+				/* no more left */
+				*next = NULL;
+				return 0;
+			}
+
+			*next = ((char *)env_get_addr(i));
+			return 0;
 		}
 	}
 
-	/* match the next entry after i */
-	i = hmatch_r("", i, &match, &env_htab);
-	if (i == 0)
-		goto done;
-	buflen = strlen(match->key) + strlen(match->data) + 2;
-	var = realloc(var, buflen);
-	snprintf(var, buflen, "%s=%s", match->key, match->data);
-	*next = var;
 	return 0;
-
-done:
-	free(var);
-	var = NULL;
-	*next = NULL;
-	return i;
 }
 
 /*
@@ -638,9 +621,9 @@ int syscall(int call, int *retval, ...)
 	return 1;
 }
 
-int api_init(void)
+void api_init(void)
 {
-	struct api_signature *sig;
+	struct api_signature *sig = NULL;
 
 	/* TODO put this into linker set one day... */
 	calls_table[API_RSVD] = NULL;
@@ -675,10 +658,10 @@ int api_init(void)
 	sig = malloc(sizeof(struct api_signature));
 	if (sig == NULL) {
 		printf("API: could not allocate memory for the signature!\n");
-		return -ENOMEM;
+		return;
 	}
 
-	env_set_hex("api_address", (unsigned long)sig);
+	setenv_hex("api_address", (unsigned long)sig);
 	debugf("API sig @ 0x%lX\n", (unsigned long)sig);
 	memcpy(sig->magic, API_SIG_MAGIC, 8);
 	sig->version = API_SIG_VERSION;
@@ -687,8 +670,6 @@ int api_init(void)
 	sig->checksum = crc32(0, (unsigned char *)sig,
 			      sizeof(struct api_signature));
 	debugf("syscall entry: 0x%lX\n", (unsigned long)sig->syscall);
-
-	return 0;
 }
 
 void platform_set_mr(struct sys_info *si, unsigned long start, unsigned long size,

api/api_display.c

@@ -1,11 +1,17 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <common.h>
 #include <api_public.h>
-#include <log.h>
-#include <linux/types.h>
+#include <lcd.h>
+#include <video_font.h> /* Get font width and height */
+
+/* lcd.h needs BMP_LOGO_HEIGHT to calculate CONSOLE_ROWS */
+#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
+#include <bmp_logo.h>
+#endif
 
 /* TODO(clchiou): add support of video device */
 
@@ -19,6 +25,14 @@ int display_get_info(int type, struct display_info *di)
 		debug("%s: unsupport display device type: %d\n",
 				__FILE__, type);
 		return API_ENODEV;
+#ifdef CONFIG_LCD
+	case DISPLAY_TYPE_LCD:
+		di->pixel_width  = panel_info.vl_col;
+		di->pixel_height = panel_info.vl_row;
+		di->screen_rows = lcd_get_screen_rows();
+		di->screen_cols = lcd_get_screen_columns();
+		break;
+#endif
 	}
 
 	di->type = type;
@@ -29,9 +43,16 @@ int display_draw_bitmap(ulong bitmap, int x, int y)
 {
 	if (!bitmap)
 		return API_EINVAL;
+#ifdef CONFIG_LCD
+	return lcd_display_bitmap(bitmap, x, y);
+#else
 	return API_ENODEV;
+#endif
 }
 
 void display_clear(void)
 {
+#ifdef CONFIG_LCD
+	lcd_clear();
+#endif
 }

api/api_net.c

@@ -1,15 +1,19 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
+#include <common.h>
 #include <net.h>
 #include <linux/types.h>
 #include <api_public.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define DEBUG
 #undef DEBUG
 

api/api_platform-arm.c

@@ -0,0 +1,37 @@
+/*
+ * (C) Copyright 2007 Semihalf
+ *
+ * Written by: Rafal Jaworowski <raj@semihalf.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * This file contains routines that fetch data from ARM-dependent sources
+ * (bd_info etc.)
+ */
+
+#include <config.h>
+#include <linux/types.h>
+#include <api_public.h>
+
+#include <asm/u-boot.h>
+#include <asm/global_data.h>
+
+#include "api_private.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Important notice: handling of individual fields MUST be kept in sync with
+ * include/asm-arm/u-boot.h and include/asm-arm/global_data.h, so any changes
+ * need to reflect their current state and layout of structures involved!
+ */
+int platform_sys_info(struct sys_info *si)
+{
+	int i;
+
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
+		platform_set_mr(si, gd->bd->bi_dram[i].start,
+				gd->bd->bi_dram[i].size, MR_ATTR_DRAM);
+
+	return 1;
+}

api/api_platform-mips.c

@@ -0,0 +1,32 @@
+/*
+ * (C) Copyright 2007 Stanislav Galabov <sgalabov@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * This file contains routines that fetch data from bd_info sources
+ */
+
+#include <config.h>
+#include <linux/types.h>
+#include <api_public.h>
+
+#include <asm/u-boot.h>
+#include <asm/global_data.h>
+
+#include "api_private.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Important notice: handling of individual fields MUST be kept in sync with
+ * include/asm-generic/u-boot.h, so any changes
+ * need to reflect their current state and layout of structures involved!
+ */
+int platform_sys_info(struct sys_info *si)
+{
+
+	platform_set_mr(si, gd->bd->bi_memstart,
+			gd->bd->bi_memsize, MR_ATTR_DRAM);
+
+	return 1;
+}

api/api_platform-powerpc.c

@@ -1,9 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
  *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
  * This file contains routines that fetch data from PowerPC-dependent sources
  * (bd_info etc.)
  */
@@ -12,6 +13,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"
@@ -28,8 +30,11 @@ int platform_sys_info(struct sys_info *si)
 	si->clk_bus = gd->bus_clk;
 	si->clk_cpu = gd->cpu_clk;
 
-#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
+#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || \
+    defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
 #define bi_bar	bi_immr_base
+#elif defined(CONFIG_MPC5xxx)
+#define bi_bar	bi_mbar_base
 #elif defined(CONFIG_MPC83xx)
 #define bi_bar	bi_immrbar
 #endif
@@ -41,8 +46,9 @@ int platform_sys_info(struct sys_info *si)
 	si->bar = 0;
 #endif
 
-	platform_set_mr(si, gd->ram_base, gd->ram_size, MR_ATTR_DRAM);
+	platform_set_mr(si, gd->bd->bi_memstart, gd->bd->bi_memsize, MR_ATTR_DRAM);
 	platform_set_mr(si, gd->bd->bi_flashstart, gd->bd->bi_flashsize, MR_ATTR_FLASH);
+	platform_set_mr(si, gd->bd->bi_sramstart, gd->bd->bi_sramsize, MR_ATTR_SRAM);
 
 	return 1;
 }

api/api_platform.c

@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * (C) Copyright 2007 Semihalf
- *
- * Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * This file contains a routine to fetch data from the global_data structure.
- */
-
-#include <api_public.h>
-#include <asm/global_data.h>
-#include "api_private.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int platform_sys_info(struct sys_info *si)
-{
-	int i;
-
-	si->clk_bus = gd->bus_clk;
-	si->clk_cpu = gd->cpu_clk;
-
-	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-		platform_set_mr(si, gd->bd->bi_dram[i].start,
-				gd->bd->bi_dram[i].size, MR_ATTR_DRAM);
-
-	platform_set_mr(si, gd->ram_base, gd->ram_size, MR_ATTR_DRAM);
-	platform_set_mr(si, gd->bd->bi_flashstart, gd->bd->bi_flashsize, MR_ATTR_FLASH);
-
-	return 1;
-}

api/api_private.h

@@ -1,14 +1,15 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _API_PRIVATE_H_
 #define _API_PRIVATE_H_
 
-int	api_init(void);
+void	api_init(void);
 void	platform_set_mr(struct sys_info *, unsigned long, unsigned long, int);
 int	platform_sys_info(struct sys_info *);
 
@@ -22,7 +23,6 @@ int	dev_close_stor(void *);
 int	dev_close_net(void *);
 
 lbasize_t	dev_read_stor(void *, void *, lbasize_t, lbastart_t);
-lbasize_t	dev_write_stor(void *, void *, lbasize_t, lbastart_t);
 int		dev_read_net(void *, void *, int);
 int		dev_write_net(void *, void *, int);
 

api/api_storage.c

@@ -1,15 +1,14 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007-2008 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
+#include <common.h>
 #include <api_public.h>
-#include <part.h>
-#include <scsi.h>
-#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
@@ -26,6 +25,7 @@
 
 #define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
 
+
 #define ENUM_IDE	0
 #define ENUM_USB	1
 #define ENUM_SCSI	2
@@ -37,15 +37,16 @@ struct stor_spec {
 	int		max_dev;
 	int		enum_started;
 	int		enum_ended;
-	int		type;	/* "external" type: DT_STOR_{IDE,USB,etc} */
+	int		type;		/* "external" type: DT_STOR_{IDE,USB,etc} */
 	char		*name;
 };
 
-static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
+static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
+
 
 void dev_stor_init(void)
 {
-#if defined(CONFIG_IDE)
+#if defined(CONFIG_CMD_IDE)
 	specs[ENUM_IDE].max_dev = CONFIG_SYS_IDE_MAXDEVICE;
 	specs[ENUM_IDE].enum_started = 0;
 	specs[ENUM_IDE].enum_ended = 0;
@@ -59,13 +60,20 @@ void dev_stor_init(void)
 	specs[ENUM_MMC].type = DEV_TYP_STOR | DT_STOR_MMC;
 	specs[ENUM_MMC].name = "mmc";
 #endif
-#if defined(CONFIG_SATA)
+#if defined(CONFIG_CMD_SATA)
 	specs[ENUM_SATA].max_dev = CONFIG_SYS_SATA_MAX_DEVICE;
 	specs[ENUM_SATA].enum_started = 0;
 	specs[ENUM_SATA].enum_ended = 0;
 	specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
 	specs[ENUM_SATA].name = "sata";
 #endif
+#if defined(CONFIG_SCSI)
+	specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
+	specs[ENUM_SCSI].enum_started = 0;
+	specs[ENUM_SCSI].enum_ended = 0;
+	specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
+	specs[ENUM_SCSI].name = "scsi";
+#endif
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 	specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
 	specs[ENUM_USB].enum_started = 0;
@@ -80,71 +88,88 @@ void dev_stor_init(void)
  *
  * type:	storage group type - ENUM_IDE, ENUM_SCSI etc.
  *
+ * first:	if 1 the first device in the storage group is returned (if
+ *              exists), if 0 the next available device is searched
+ *
  * more:	returns 0/1 depending if there are more devices in this group
  *		available (for future iterations)
  *
  * returns:	0/1 depending if device found in this iteration
  */
-static int dev_stor_get(int type, int *more, struct device_info *di)
+static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 {
-	struct blk_desc *dd;
 	int found = 0;
-	int found_last = 0;
-	int i = 0;
+	*more = 0;
 
-	/* Wasn't configured for this type, return 0 directly */
-	if (specs[type].name == NULL)
-		return 0;
+	int i;
 
-	if (di->cookie != NULL) {
-		/* Find the last device we've returned  */
-		for (i = 0; i < specs[type].max_dev; i++) {
+	struct blk_desc *dd;
+
+	if (first) {
+		di->cookie = (void *)blk_get_dev(specs[type].name, 0);
+		if (di->cookie == NULL)
+			return 0;
+		else
+			found = 1;
+
+		/* provide hint if there are more devices in
+		 * this group to enumerate */
+		if (1 < specs[type].max_dev)
+			*more = 1;
+
+	} else {
+		for (i = 0; i < specs[type].max_dev; i++)
 			if (di->cookie ==
 			    (void *)blk_get_dev(specs[type].name, i)) {
-				i += 1;
-				found_last = 1;
+				/* previous cookie found -- advance to the
+				 * next device, if possible */
+
+				if (++i >= specs[type].max_dev) {
+					/* out of range, no more to enum */
+					di->cookie = NULL;
+					break;
+				}
+
+				di->cookie = (void *)blk_get_dev(
+							specs[type].name, i);
+				if (di->cookie == NULL)
+					return 0;
+				else
+					found = 1;
+
+				/* provide hint if there are more devices in
+				 * this group to enumerate */
+				if ((i + 1) < specs[type].max_dev)
+					*more = 1;
+
 				break;
 			}
-		}
-
-		if (!found_last)
-			i = 0;
 	}
 
-	for (; i < specs[type].max_dev; i++) {
-		di->cookie = (void *)blk_get_dev(specs[type].name, i);
-
-		if (di->cookie != NULL) {
-			found = 1;
-			break;
-		}
-	}
-
-	if (i == specs[type].max_dev)
-		*more = 0;
-	else
-		*more = 1;
-
 	if (found) {
 		di->type = specs[type].type;
 
-		dd = (struct blk_desc *)di->cookie;
-		if (dd->type == DEV_TYPE_UNKNOWN) {
-			debugf("device instance exists, but is not active..");
-			found = 0;
-		} else {
-			di->di_stor.block_count = dd->lba;
-			di->di_stor.block_size = dd->blksz;
+		if (di->cookie != NULL) {
+			dd = (struct blk_desc *)di->cookie;
+			if (dd->type == DEV_TYPE_UNKNOWN) {
+				debugf("device instance exists, but is not active..");
+				found = 0;
+			} else {
+				di->di_stor.block_count = dd->lba;
+				di->di_stor.block_size = dd->blksz;
+			}
 		}
-	} else {
+
+	} else
 		di->cookie = NULL;
-	}
 
 	return found;
 }
 
-/* returns: ENUM_IDE, ENUM_USB etc. based on struct blk_desc */
 
+/*
+ * returns:	ENUM_IDE, ENUM_USB etc. based on struct blk_desc
+ */
 static int dev_stor_type(struct blk_desc *dd)
 {
 	int i, j;
@@ -157,13 +182,16 @@ static int dev_stor_type(struct blk_desc *dd)
 	return ENUM_MAX;
 }
 
-/* returns: 0/1 whether cookie points to some device in this group */
 
+/*
+ * returns:	0/1 whether cookie points to some device in this group
+ */
 static int dev_is_stor(int type, struct device_info *di)
 {
 	return (dev_stor_type(di->cookie) == type) ? 1 : 0;
 }
 
+
 static int dev_enum_stor(int type, struct device_info *di)
 {
 	int found = 0, more = 0;
@@ -188,16 +216,18 @@ static int dev_enum_stor(int type, struct device_info *di)
 	 */
 
 	if (di->cookie == NULL) {
+
 		debugf("group%d - enum restart\n", type);
 
 		/*
 		 * 1. Enumeration (re-)started: take the first available
 		 * device, if exists
 		 */
-		found = dev_stor_get(type, &more, di);
+		found = dev_stor_get(type, 1, &more, di);
 		specs[type].enum_started = 1;
 
 	} else if (dev_is_stor(type, di)) {
+
 		debugf("group%d - enum continued for the next device\n", type);
 
 		if (specs[type].enum_ended) {
@@ -206,9 +236,10 @@ static int dev_enum_stor(int type, struct device_info *di)
 		}
 
 		/* 2a. Attempt to take a next available device in the group */
-		found = dev_stor_get(type, &more, di);
+		found = dev_stor_get(type, 0, &more, di);
 
 	} else {
+
 		if (specs[type].enum_ended) {
 			debugf("group %d - already enumerated, skipping\n", type);
 			return 0;
@@ -220,7 +251,7 @@ static int dev_enum_stor(int type, struct device_info *di)
 			/*
 			 * 2b.  If enumerating devices in this group did not
 			 * happen before, it means the cookie pointed to a
-			 * device from some other group (another storage
+			 * device frome some other group (another storage
 			 * group, or network); in this case try to take the
 			 * first available device from our group
 			 */
@@ -230,7 +261,7 @@ static int dev_enum_stor(int type, struct device_info *di)
 			 * Attempt to take the first device in this group:
 			 *'first element' flag is set
 			 */
-			found = dev_stor_get(type, &more, di);
+			found = dev_stor_get(type, 1, &more, di);
 
 		} else {
 			errf("group%d - out of order iteration\n", type);
@@ -247,7 +278,7 @@ static int dev_enum_stor(int type, struct device_info *di)
 
 	if (found)
 		debugf("device found, returning cookie 0x%08x\n",
-		       (u_int32_t)di->cookie);
+			(u_int32_t)di->cookie);
 	else
 		debugf("no device found\n");
 
@@ -268,7 +299,9 @@ int dev_enum_storage(struct device_info *di)
 {
 	int i;
 
-	/* check: ide, usb, scsi, mmc */
+	/*
+	 * check: ide, usb, scsi, mmc
+	 */
 	for (i = ENUM_IDE; i < ENUM_MAX; i ++) {
 		if (dev_enum_stor(i, di))
 			return 1;
@@ -289,6 +322,7 @@ static int dev_stor_is_valid(int type, struct blk_desc *dd)
 	return 0;
 }
 
+
 int dev_open_stor(void *cookie)
 {
 	int type = dev_stor_type(cookie);
@@ -302,6 +336,7 @@ int dev_open_stor(void *cookie)
 	return API_ENODEV;
 }
 
+
 int dev_close_stor(void *cookie)
 {
 	/*
@@ -311,6 +346,7 @@ int dev_close_stor(void *cookie)
 	return 0;
 }
 
+
 lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start)
 {
 	int type;
@@ -322,37 +358,10 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start
 	if (!dev_stor_is_valid(type, dd))
 		return 0;
 
-#ifdef CONFIG_BLK
-	return blk_dread(dd, start, len, buf);
-#else
 	if ((dd->block_read) == NULL) {
 		debugf("no block_read() for device 0x%08x\n", cookie);
 		return 0;
 	}
 
 	return dd->block_read(dd, start, len, buf);
-#endif	/* defined(CONFIG_BLK) */
-}
-
-lbasize_t dev_write_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start)
-{
-	struct blk_desc *dd = (struct blk_desc *)cookie;
-	int type = dev_stor_type(dd);
-
-	if (type == ENUM_MAX)
-		return 0;
-
-	if (!dev_stor_is_valid(type, dd))
-		return 0;
-
-#ifdef CONFIG_BLK
-	return blk_dwrite(dd, start, len, buf);
-#else
-	if (dd->block_write == NULL) {
-		debugf("no block_write() for device 0x%08x\n", cookie);
-		return 0;
-	}
-
-	return dd->block_write(dd, start, len, buf);
-#endif	/* defined(CONFIG_BLK) */
 }

arch/Kconfig

@@ -1,390 +1,96 @@
-config ARCH_MAP_SYSMEM
-	depends on SANDBOX
-	def_bool y
-
 config CREATE_ARCH_SYMLINK
 	bool
 
 config HAVE_ARCH_IOREMAP
 	bool
 
-config HAVE_SETJMP
-	bool
-	help
-	 The architecture supports setjmp() and longjmp().
-
-config HAVE_INITJMP
-	bool
-	depends on HAVE_SETJMP
-	help
-	 The architecture supports initjmp(), a non-standard companion to
-	 setjmp() and longjmp().
-
-config SUPPORT_BIG_ENDIAN
-	bool
-
-config SUPPORT_LITTLE_ENDIAN
-	bool
-	default y if !SUPPORT_BIG_ENDIAN
-
-config SYS_CACHE_SHIFT_4
-	bool
-
-config SYS_CACHE_SHIFT_5
-	bool
-
-config SYS_CACHE_SHIFT_6
-	bool
-
-config SYS_CACHE_SHIFT_7
-	bool
-
-config 32BIT
-	bool
-
-config 64BIT
-	bool
-	help
-	  Indicates that U-Boot proper will be built for a 64 bit
-	  architecture.
-
-config SPL_64BIT
-	bool
-	help
-	  Indicates that SPL will be built for a 64 bit architecture.
-
-config SYS_CACHELINE_SIZE
-	int
-	default 128 if SYS_CACHE_SHIFT_7
-	default 64 if SYS_CACHE_SHIFT_6
-	default 32 if SYS_CACHE_SHIFT_5
-	default 16 if SYS_CACHE_SHIFT_4
-	# Fall-back for MIPS and RISC-V
-	default 64 if RISCV
-	default 32 if MIPS
-
-config SYS_DTC_PAD_BYTES
-	int "Size in bytes to pad device tree blob"
-	default 32768 if X86 && EFI_APP
-	default 4096 if ARC || ARM64 || M68K || MICROBLAZE || NIOS2 \
-		|| RISCV || SANDBOX || X86
-	default 0
-
-config LINKER_LIST_ALIGN
-	int
-	default 32 if SANDBOX
-	default 8 if ARM64 || X86
-	default 4
-	help
-	  Force the each linker list to be aligned to this boundary. This
-	  is required if ll_entry_get() is used, since otherwise the linker
-	  may add padding into the table, thus breaking it.
-	  See linker_lists.rst for full details.
-
 choice
 	prompt "Architecture select"
 	default SANDBOX
 
 config ARC
 	bool "ARC architecture"
-	select ARC_TIMER
-	select CLK
-	select DM
 	select HAVE_PRIVATE_LIBGCC
 	select SUPPORT_OF_CONTROL
-	select SYS_CACHE_SHIFT_7
-	select TIMER
-	select SUPPORT_BIG_ENDIAN
-	select SUPPORT_LITTLE_ENDIAN
-	select SYS_BIG_ENDIAN if CPU_BIG_ENDIAN
-	select SYS_LITTLE_ENDIAN if !CPU_BIG_ENDIAN
 
 config ARM
 	bool "ARM architecture"
-	select HAVE_SETJMP
-	select HAVE_INITJMP
-	select ARCH_SUPPORTS_LTO
 	select CREATE_ARCH_SYMLINK
 	select HAVE_PRIVATE_LIBGCC if !ARM64
-	select SUPPORT_ACPI
-	select SUPPORT_LITTLE_ENDIAN
 	select SUPPORT_OF_CONTROL
 
+config AVR32
+	bool "AVR32 architecture"
+	select CREATE_ARCH_SYMLINK
+
+config BLACKFIN
+	bool "Blackfin architecture"
+
 config M68K
 	bool "M68000 architecture"
 	select HAVE_PRIVATE_LIBGCC
-	select USE_PRIVATE_LIBGCC
-	select SYS_BOOT_GET_CMDLINE
-	select SYS_BOOT_GET_KBD
-	select SYS_CACHE_SHIFT_4
-	select SUPPORT_BIG_ENDIAN
-	select SUPPORT_OF_CONTROL
 
 config MICROBLAZE
 	bool "MicroBlaze architecture"
-	select SUPPORT_BIG_ENDIAN
-	select SUPPORT_LITTLE_ENDIAN
 	select SUPPORT_OF_CONTROL
-	imply CMD_TIMER
-	imply SPL_REGMAP if SPL
-	imply SPL_TIMER if SPL
-	imply TIMER
-	imply XILINX_TIMER
 
 config MIPS
 	bool "MIPS architecture"
 	select HAVE_ARCH_IOREMAP
 	select HAVE_PRIVATE_LIBGCC
 	select SUPPORT_OF_CONTROL
-	select SPL_SEPARATE_BSS if SPL
+
+config NDS32
+	bool "NDS32 architecture"
 
 config NIOS2
 	bool "Nios II architecture"
-	select CPU
-	select DM
-	select DM_EVENT
-	select OF_CONTROL
-	select SUPPORT_LITTLE_ENDIAN
 	select SUPPORT_OF_CONTROL
-	imply CMD_DM
+	select OF_CONTROL
+	select DM
+	select CPU
+
+config OPENRISC
+	bool "OpenRISC architecture"
 
 config PPC
 	bool "PowerPC architecture"
 	select HAVE_PRIVATE_LIBGCC
-	select SUPPORT_BIG_ENDIAN
 	select SUPPORT_OF_CONTROL
-	select SYS_BOOT_GET_CMDLINE
-	select SYS_BOOT_GET_KBD
-
-config RISCV
-	bool "RISC-V architecture"
-	select CREATE_ARCH_SYMLINK
-	select HAVE_PRIVATE_LIBGCC if 64BIT
-	select HAVE_SETJMP
-	select HAVE_INITJMP
-	select SUPPORT_ACPI
-	select SUPPORT_LITTLE_ENDIAN
-	select SUPPORT_OF_CONTROL
-	select OF_CONTROL
-	select DM
-	select DM_EVENT
-	imply SPL_SEPARATE_BSS if SPL
-	imply DM_SERIAL
-	imply DM_MMC
-	imply DM_SPI
-	imply DM_SPI_FLASH
-	imply BLK
-	imply CLK
-	imply MTD
-	imply TIMER
-	imply CMD_DM
-	imply SPL_DM
-	imply SPL_OF_CONTROL
-	imply SPL_LIBCOMMON_SUPPORT
-	imply SPL_LIBGENERIC_SUPPORT
-	imply SPL_SERIAL
-	imply SPL_TIMER
 
 config SANDBOX
 	bool "Sandbox"
-	select HAVE_SETJMP
-	select HAVE_INITJMP
-	select ARCH_SUPPORTS_LTO
-	select AXI
-	select BOARD_LATE_INIT
-	select BZIP2
-	select CMD_POWEROFF if CMDLINE
-	select DM
-	select DM_EVENT
-	select DM_FUZZING_ENGINE
-	select DM_GPIO
-	select DM_I2C
-	select DM_KEYBOARD
-	select DM_MAILBOX
-	select DM_RESET
-	select DM_SERIAL
-	select DM_SPI
-	select DM_SPI_FLASH
-	select GPIO
-	select GZIP_COMPRESSED
-	select I2C
-	select LZO
-	select MMC
-	select MTD
-	select OF_BOARD_SETUP
-	select OF_CONTROL
-	select PCI_ENDPOINT
-	select SANDBOX_RESET
-	select SPI
-	select SERIAL
 	select SUPPORT_OF_CONTROL
-	select SUPPORT_BIG_ENDIAN
-	select SUPPORT_LITTLE_ENDIAN
-	select SYSRESET
-	select SYSRESET_CMD_RESET
-	select SYSRESET_CMD_POWEROFF if SYSRESET && CMD_POWEROFF
-	select SYS_CACHE_SHIFT_4
-	select IRQ
-	select SUPPORT_EXTENSION_SCAN if CMDLINE
-	select SUPPORT_ACPI
-	select TIMER
-	select SPL_TIMER if SPL
-	select TPL_TIMER if TPL
-	select VPL_TIMER if VPL
-	imply BITREVERSE
-	select BLOBLIST
-	imply LTO
-	imply CMD_BOOTEFI_SELFTEST
-	imply CMD_DM
-	imply CMD_EXCEPTION
-	imply CMD_GETTIME
-	imply CMD_HASH
-	imply CMD_IO
-	imply CMD_IOTRACE
-	imply CMD_LZMADEC
-	imply CMD_SF
-	imply CMD_SF_TEST
-	imply CRC32_VERIFY
-	imply FAT_WRITE
-	imply FIRMWARE
-	imply FUZZING_ENGINE_SANDBOX
-	imply HASH_VERIFY
-	imply LZMA
-	imply TEE
-	imply AVB_VERIFY
-	imply LIBAVB
-	imply CMD_AVB
-	imply PARTITION_TYPE_GUID if EFI_PARTITION
-	imply SCP03
-	imply CMD_SCP03
-	imply UDP_FUNCTION_FASTBOOT
-	imply VIRTIO_MMIO
-	imply VIRTIO_PCI
-	imply VIRTIO_SANDBOX
-	# Re-enable this when fully implemented
-	# imply VIRTIO_BLK
-	imply VIRTIO_NET
-	imply SOUND
-	imply PCI_SANDBOX_EP
-	imply PCH
-	imply PHYLIB
-	imply DM_MDIO
-	imply DM_MDIO_MUX
-	imply ACPI
-	imply ACPI_PMC
-	imply ACPI_PMC_SANDBOX
-	imply CMD_PMC
-	imply CMD_CLONE
-	imply SILENT_CONSOLE
-	imply BOOTARGS_SUBST
-	imply PHY_FIXED
-	imply DM_DSA
-	imply CMD_EXTENSION
-	imply PHYSMEM
-	imply GENERATE_ACPI_TABLE
-	imply BINMAN
-	imply CMD_MBR
-	imply CMD_MMC
-	imply BOOTSTD_DEFAULTS if BOOTSTD_FULL && CMDLINE
-	imply BOOTMETH_DISTRO if BOOTSTD_FULL && CMDLINE
-	imply CMD_SYSBOOT if BOOTSTD_FULL
+	select DM
+	select DM_SPI_FLASH
+	select DM_SERIAL
+	select DM_I2C
+	select DM_SPI
+	select DM_GPIO
+	select DM_MMC
 
 config SH
 	bool "SuperH architecture"
-	select SUPPORT_LITTLE_ENDIAN
 	select HAVE_PRIVATE_LIBGCC
-	select SUPPORT_OF_CONTROL
+
+config SPARC
+	bool "SPARC architecture"
+	select CREATE_ARCH_SYMLINK
 
 config X86
 	bool "x86 architecture"
-	select AHCI
-	select HAVE_SETJMP
-	select SUPPORT_SPL
-	select SUPPORT_TPL
-	select SUPPORT_LITTLE_ENDIAN
 	select CREATE_ARCH_SYMLINK
-	select DM
-	select HAVE_ARCH_IOMAP
 	select HAVE_PRIVATE_LIBGCC
-	select LMB_ARCH_MEM_MAP
-	select OF_CONTROL
-	select PCI
-	select SUPPORT_ACPI
 	select SUPPORT_OF_CONTROL
-	select SYS_CACHE_SHIFT_6
-	select TIMER
-	select USE_PRIVATE_LIBGCC
-	select X86_TSC_TIMER
-	select IRQ
-	imply HAS_ROM if X86_RESET_VECTOR
-	imply BLK
-	imply CMD_DM
-	imply CMD_FPGA_LOADMK
-	imply CMD_GETTIME
-	imply CMD_IO
-	imply CMD_IRQ
-	imply CMD_PCI
-	imply CMD_SF
-	imply CMD_SF_TEST
-	imply DM_GPIO
-	imply DM_KEYBOARD
-	imply DM_MMC
-	imply DM_RTC
-	imply SCSI
-	imply DM_SERIAL
-	imply MTD
-	imply DM_SPI
-	imply DM_SPI_FLASH
-	imply DM_USB
-	imply LAST_STAGE_INIT
-	imply VIDEO
-	imply SYSRESET
-	imply SPL_SYSRESET
-	imply SYSRESET_X86
-	imply USB_ETHER_ASIX
-	imply USB_ETHER_SMSC95XX
-	imply USB_HOST_ETHER
-	imply PCH
-	imply PHYSMEM
-	imply RTC_MC146818
-	imply ACPI
-	imply ACPIGEN if !QEMU && !EFI_APP
-	imply SYSINFO if GENERATE_SMBIOS_TABLE
-	imply SYSINFO_SMBIOS if GENERATE_SMBIOS_TABLE
-	imply TIMESTAMP
-
-	# Thing to enable for when SPL/TPL are enabled: SPL
-	imply SPL_DM
-	imply SPL_OF_LIBFDT
-	imply SPL_DRIVERS_MISC
-	imply SPL_GPIO
-	imply SPL_PINCTRL
-	imply SPL_LIBCOMMON_SUPPORT
-	imply SPL_LIBGENERIC_SUPPORT
-	imply SPL_SERIAL
-	imply SPL_SPI_FLASH_SUPPORT
-	imply SPL_SPI
-	imply SPL_OF_CONTROL
-	imply SPL_TIMER
-	imply SPL_REGMAP
-	imply SPL_SYSCON
-	# TPL
-	imply TPL_DM
-	imply TPL_DRIVERS_MISC
-	imply TPL_GPIO
-	imply TPL_PINCTRL
-	imply TPL_LIBCOMMON_SUPPORT
-	imply TPL_LIBGENERIC_SUPPORT
-	imply TPL_SERIAL
-	imply TPL_OF_CONTROL
-	imply TPL_TIMER
-	imply TPL_REGMAP
-	imply TPL_SYSCON
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+	select DM_SPI
+	select DM_SPI_FLASH
 
 config XTENSA
 	bool "Xtensa architecture"
 	select CREATE_ARCH_SYMLINK
-	select SUPPORT_LITTLE_ENDIAN
 	select SUPPORT_OF_CONTROL
 
 endchoice
@@ -439,170 +145,25 @@ config SYS_BOARD
 	  leave this option empty.
 
 config SYS_CONFIG_NAME
-	string "Board header file" if ARCH_MESON || ARCH_VERSAL || \
-		ARCH_VERSAL_NET || ARCH_ZYNQ || ARCH_ZYNQMP || \
-		ARCH_ZYNQMP_R5 || MICROBLAZE || NIOS2
-	default "meson64" if ARCH_MESON
-	default "microblaze-generic" if MICROBLAZE
-	default "xilinx_versal" if ARCH_VERSAL
-	default "xilinx_versal_net" if ARCH_VERSAL_NET
-	default "xilinx_zynqmp" if ARCH_ZYNQMP
-	default "xilinx_zynqmp_r5" if ARCH_ZYNQMP_R5
-	default "zynq-common" if ARCH_ZYNQ
+	string
 	help
 	  This option should contain the base name of board header file.
 	  The header file include/configs/<CONFIG_SYS_CONFIG_NAME>.h
 	  should be included from include/config.h.
 
-config SYS_DISABLE_DCACHE_OPS
-	bool
-	help
-	 This option disables dcache flush and dcache invalidation
-	 operations. For example, on coherent systems where cache
-	 operatios are not required, enable this option to avoid them.
-	 Note that, its up to the individual architectures to implement
-	 this functionality.
-
-config SYS_IMMR
-	hex "Address for the Internal Memory-Mapped Registers (IMMR) window"
-	depends on PPC || FSL_LSCH2 || FSL_LSCH3 || ARCH_LS1021A
-	default 0xFF000000 if MPC8xx
-	default 0xF0000000 if ARCH_MPC8313
-	default 0xE0000000 if MPC83xx && !ARCH_MPC8313
-	default 0x01000000 if ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
-	default 0xFFE00000 if ARCH_P1010 || ARCH_P1011 || ARCH_P1020 || \
-			      ARCH_P1021 || ARCH_P1024 || ARCH_P1025 || \
-			      ARCH_P2020
-	default SYS_CCSRBAR_DEFAULT
-	help
-	  Address for the Internal Memory-Mapped Registers (IMMR) window used
-	  to configure the features of many Freescale / NXP SoCs.
-
-config MONITOR_IS_IN_RAM
-	bool "U-Boot is loaded in to RAM by a pre-loader"
-	depends on M68K || NIOS2
-
-menu "Skipping low level initialization functions"
-	depends on ARM || MIPS || RISCV
-
-config SKIP_LOWLEVEL_INIT
-	bool "Skip calls to certain low level initialization functions"
-	help
-	  If enabled, then certain low level initializations (like setting up
-	  the memory controller) are omitted and/or U-Boot does not relocate
-	  itself into RAM.
-	  Normally this variable MUST NOT be defined. The only exception is
-	  when U-Boot is loaded (to RAM) by some other boot loader or by a
-	  debugger which performs these initializations itself.
-
-config SPL_SKIP_LOWLEVEL_INIT
-	bool "Skip calls to certain low level initialization functions in SPL"
-	depends on SPL
-	help
-	  If enabled, then certain low level initializations (like setting up
-	  the memory controller) are omitted and/or U-Boot does not relocate
-	  itself into RAM.
-	  Normally this variable MUST NOT be defined. The only exception is
-	  when U-Boot is loaded (to RAM) by some other boot loader or by a
-	  debugger which performs these initializations itself.
-
-config TPL_SKIP_LOWLEVEL_INIT
-	bool "Skip calls to certain low level initialization functions in TPL"
-	depends on SPL && ARM
-	help
-	  If enabled, then certain low level initializations (like setting up
-	  the memory controller) are omitted and/or U-Boot does not relocate
-	  itself into RAM.
-	  Normally this variable MUST NOT be defined. The only exception is
-	  when U-Boot is loaded (to RAM) by some other boot loader or by a
-	  debugger which performs these initializations itself.
-
-config SKIP_LOWLEVEL_INIT_ONLY
-	bool "Skip call to lowlevel_init during early boot ONLY"
-	depends on ARM
-	help
-	  This allows just the call to lowlevel_init() to be skipped. The
-	  normal CP15 init (such as enabling the instruction cache) is still
-	  performed.
-
-config SPL_SKIP_LOWLEVEL_INIT_ONLY
-	bool "Skip call to lowlevel_init during early SPL boot ONLY"
-	depends on SPL && ARM
-	help
-	  This allows just the call to lowlevel_init() to be skipped. The
-	  normal CP15 init (such as enabling the instruction cache) is still
-	  performed.
-
-config TPL_SKIP_LOWLEVEL_INIT_ONLY
-	bool "Skip call to lowlevel_init during early TPL boot ONLY"
-	depends on TPL && ARM
-	help
-	  This allows just the call to lowlevel_init() to be skipped. The
-	  normal CP15 init (such as enabling the instruction cache) is still
-	  performed.
-
-endmenu
-
-config SYS_HAS_NONCACHED_MEMORY
-	bool "Enable reserving a non-cached memory area for drivers"
-	depends on (ARM || MIPS) && (RTL8169 || MEDIATEK_ETH)
-	help
-	  This is useful for drivers that would otherwise require a lot of
-	  explicit cache maintenance. For some drivers it's also impossible to
-	  properly maintain the cache. For example if the regions that need to
-	  be flushed are not a multiple of the cache-line size, *and* padding
-	  cannot be allocated between the regions to align them (i.e.  if the
-	  HW requires a contiguous array of regions, and the size of each
-	  region is not cache-aligned), then a flush of one region may result
-	  in overwriting data that hardware has written to another region in
-	  the same cache-line. This can happen for example in network drivers
-	  where descriptors for buffers are typically smaller than the CPU
-	  cache-line (e.g.  16 bytes vs. 32 or 64 bytes).
-
-config SYS_NONCACHED_MEMORY
-	hex "Size in bytes of the non-cached memory area"
-	depends on SYS_HAS_NONCACHED_MEMORY
-	default 0x100000
-	help
-	  Size of non-cached memory area. This area of memory will be typically
-	  located right below the malloc() area and mapped uncached in the MMU.
-
 source "arch/arc/Kconfig"
 source "arch/arm/Kconfig"
+source "arch/avr32/Kconfig"
+source "arch/blackfin/Kconfig"
 source "arch/m68k/Kconfig"
 source "arch/microblaze/Kconfig"
 source "arch/mips/Kconfig"
+source "arch/nds32/Kconfig"
 source "arch/nios2/Kconfig"
+source "arch/openrisc/Kconfig"
 source "arch/powerpc/Kconfig"
 source "arch/sandbox/Kconfig"
 source "arch/sh/Kconfig"
+source "arch/sparc/Kconfig"
 source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
-source "arch/riscv/Kconfig"
-
-if ARM || M68K || PPC
-
-source "arch/Kconfig.nxp"
-
-endif
-
-source "board/keymile/Kconfig"
-
-choice
-	prompt "Endianness selection"
-	default SYS_BIG_ENDIAN if MIPS || MICROBLAZE
-	default SYS_LITTLE_ENDIAN
-	help
-	  Some boards can be configured for either little or big endian
-	  byte order. These modes require different U-Boot images. In general there
-	  is one preferred byteorder for a particular system but some systems are
-	  just as commonly used in the one or the other endianness.
-
-config SYS_BIG_ENDIAN
-	bool "Big endian"
-	depends on SUPPORT_BIG_ENDIAN
-
-config SYS_LITTLE_ENDIAN
-	bool "Little endian"
-	depends on SUPPORT_LITTLE_ENDIAN
-endchoice

arch/Kconfig.nxp

@@ -1,320 +0,0 @@
-menu "Functionality shared between NXP SoCs"
-
-config FSL_TRUST_ARCH_v1
-	bool
-
-config NXP_ESBC
-	bool "NXP ESBC (secure boot) functionality"
-	select FSL_TRUST_ARCH_v1 if ARCH_P3041 || ARCH_P4080 || \
-		ARCH_P5040 || ARCH_P2041
-	help
-	  Enable Freescale Secure Boot feature. Normally selected by defconfig.
-	  If unsure, do not change.
-
-menu "Chain of trust / secure boot options"
-	depends on !FIT_SIGNATURE && NXP_ESBC
-
-config CHAIN_OF_TRUST
-	select FSL_CAAM
-	select ARCH_MISC_INIT
-	select FSL_ISBC_KEY_EXT if (ARM || FSL_CORENET) && !SYS_RAMBOOT
-	select FSL_SEC_MON
-	select SPL_BOARD_INIT if (ARM && SPL)
-	select SPL_HASH if (ARM && SPL)
-	select SHA_HW_ACCEL
-	select SHA_PROG_HW_ACCEL
-	select ENV_IS_NOWHERE
-	select SYS_CPC_REINIT_F if MPC85xx && !SYS_RAMBOOT
-	select CMD_EXT4 if ARM
-	select CMD_EXT4_WRITE if ARM
-	imply CMD_BLOB
-	imply CMD_HASH if ARM
-	def_bool y
-
-config CMD_ESBC_VALIDATE
-	bool "Enable the 'esbc_validate' and 'esbc_halt' commands"
-	default y
-	help
-	  This option enables two commands used for secure booting:
-
-	    esbc_validate - validate signature using RSA verification
-	    esbc_halt - put the core in spin loop (Secure Boot Only)
-
-config ESBC_HDR_LS
-	bool
-
-config ESBC_ADDR_64BIT
-	def_bool y
-	depends on FSL_LAYERSCAPE
-	help
-	  For Layerscape based platforms, ESBC image Address in Header is 64bit.
-
-config FSL_ISBC_KEY_EXT
-	bool
-	help
-	  The key used for verification of next level images is picked up from
-	  an Extension Table which has been verified by the ISBC (Internal
-	  Secure boot Code) in boot ROM of the SoC.  The feature is only
-	  applicable in case of NOR boot and is not applicable in case of
-	  RAMBOOT (NAND, SD, SPI).  For Layerscape, this feature is available
-	  for all device if IE Table is copied to XIP memory Also, for
-	  Layerscape, ISBC doesn't verify this table.
-
-config SYS_FSL_SFP_BE
-	def_bool y
-	depends on PPC || FSL_LSCH2 || ARCH_LS1021A
-
-config SYS_FSL_SFP_LE
-	def_bool y
-	depends on !SYS_FSL_SFP_BE
-
-choice
-	prompt "SFP IP revision"
-	default SYS_FSL_SFP_VER_3_0 if PPC
-	default SYS_FSL_SFP_VER_3_4
-
-config SYS_FSL_SFP_VER_3_0
-	bool "SFP version 3.0"
-
-config SYS_FSL_SFP_VER_3_2
-	bool "SFP version 3.2"
-
-config SYS_FSL_SFP_VER_3_4
-	bool "SFP version 3.4"
-
-endchoice
-
-config FSL_SEC_MON
-	bool
-	help
-	  Freescale Security Monitor block is responsible for monitoring
-	  system states.
-	  Security Monitor can be transitioned on any security failures,
-	  like software violations or hardware security violations.
-
-choice
-	prompt "Security monitor interaction endianess"
-	depends on FSL_SEC_MON
-	default SYS_FSL_SEC_MON_BE if PPC
-	default SYS_FSL_SEC_MON_LE
-
-config SYS_FSL_SEC_MON_LE
-	bool "Security monitor interactions are little endian"
-
-config SYS_FSL_SEC_MON_BE
-	bool "Security monitor interactions are big endian"
-
-endchoice
-
-config SPL_UBOOT_KEY_HASH
-	string "Non-SRK key hash for U-Boot public/private key pair"
-	depends on SPL
-	default ""
-	help
-	  Set the key hash for U-Boot here if public/private key pair used to
-	  sign U-Boot are different from the SRK hash put in the fuse.  Example
-	  of a key hash is
-	  41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b.
-	  Otherwise leave this empty.
-
-if PPC
-
-config BOOTSCRIPT_COPY_RAM
-	bool "Secure boot copies boot script to RAM"
-	help
-	  On systems that support chain of trust booting, a number of addresses
-	  are required to set variables that are used in the copying and then
-	  verification of different parts of the system.  If enabled, the subsequent
-	  options are for what location to use in each step.
-
-config BS_ADDR_DEVICE
-	hex "Address in RAM for bs_device"
-	depends on BOOTSCRIPT_COPY_RAM
-
-config BS_SIZE
-	hex "The size of bs_size which is the amount read from bs_device"
-	depends on BOOTSCRIPT_COPY_RAM
-
-config BS_ADDR_RAM
-	hex "Address in RAM for bs_ram"
-	depends on BOOTSCRIPT_COPY_RAM
-
-config BS_HDR_ADDR_DEVICE
-	hex "Address in RAM for bs_hdr_device"
-	depends on BOOTSCRIPT_COPY_RAM
-
-config BS_HDR_SIZE
-	hex "The size of bs_hdr_size which is the amount read from bs_hdr_device"
-	depends on BOOTSCRIPT_COPY_RAM
-
-config BS_HDR_ADDR_RAM
-	hex "Address in RAM for bs_hdr_ram"
-	depends on BOOTSCRIPT_COPY_RAM
-
-config BOOTSCRIPT_HDR_ADDR
-	hex "CONFIG_BOOTSCRIPT_HDR_ADDR"
-	default BS_ADDR_RAM if BOOTSCRIPT_COPY_RAM
-
-endif
-
-config SYS_FSL_SRK_LE
-	def_bool y
-	depends on ARM
-
-config KEY_REVOCATION
-	def_bool y
-
-endmenu
-
-config DEEP_SLEEP
-	bool "Enable SoC deep sleep feature"
-	depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
-	default y
-	help
-	  Indicates this SoC supports deep sleep feature. If deep sleep is
-	  supported, core will start to execute uboot when wakes up.
-
-config LAYERSCAPE_NS_ACCESS
-	bool "Layerscape non-secure access support"
-	depends on ARCH_LS1021A || FSL_LSCH2
-
-config PCIE1
-	bool "PCIe controller #1"
-	depends on LAYERSCAPE_NS_ACCESS || PPC
-
-config PCIE2
-	bool "PCIe controller #2"
-	depends on LAYERSCAPE_NS_ACCESS || PPC
-
-config PCIE3
-	bool "PCIe controller #3"
-	depends on LAYERSCAPE_NS_ACCESS || PPC
-
-config PCIE4
-	bool "PCIe controller #4"
-	depends on LAYERSCAPE_NS_ACCESS || PPC
-
-config FSL_USE_PCA9547_MUX
-	bool "Enable PCA9547 I2C Mux on Freescale boards"
-	depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
-	help
-	 This option enables the PCA9547 I2C mux on Freescale boards.
-
-config VID
-	bool "Enable Freescale VID"
-	depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (I2C || DM_I2C)
-	help
-	 This option enables setting core voltage based on individual
-	 values saved in SoC fuses.
-
-config SPL_VID
-	bool "Enable Freescale VID in SPL"
-	depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (SPL_I2C || DM_SPL_I2C)
-	help
-	 This option enables setting core voltage based on individual
-	 values saved in SoC fuses, in SPL.
-
-if VID || SPL_VID
-
-config VID_FLS_ENV
-	string "Environment variable for overriding VDD"
-	help
-	  This option allows for specifying the environment variable
-	  to check to override VDD information.
-
-config VOL_MONITOR_INA220
-	bool "Enable the INA220 voltage monitor read"
-	help
-	  This option enables INA220 voltage monitor read
-	  functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_IR36021_READ
-	bool "Enable the IR36021 voltage monitor read"
-	help
-	 This option enables IR36021 voltage monitor read
-	 functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_IR36021_SET
-	bool "Enable the IR36021 voltage monitor set"
-	help
-	 This option enables IR36021 voltage monitor set
-	 functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_LTC3882_READ
-	bool "Enable the LTC3882 voltage monitor read"
-	help
-	 This option enables LTC3882 voltage monitor read
-	 functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_LTC3882_SET
-	bool "Enable the LTC3882 voltage monitor set"
-	help
-	 This option enables LTC3882 voltage monitor set
-	 functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_ISL68233_READ
-	bool "Enable the ISL68233 voltage monitor read"
-	help
-	 This option enables ISL68233 voltage monitor read
-	 functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_ISL68233_SET
-	bool "Enable the ISL68233 voltage monitor set"
-	help
-	 This option enables ISL68233 voltage monitor set
-	 functionality. It is used by the common VID driver.
-
-endif
-
-config SYS_FSL_NUM_CC_PLLS
-	int "Number of clock control PLLs"
-	depends on MPC85xx || FSL_LSCH2 || FSL_LSCH3 || ARCH_LS1021A || ARCH_LS1028A
-	default 2 if ARCH_LS1021A || ARCH_LS1028A || FSL_LSCH2
-	default 6 if FSL_LSCH3 || MPC85xx
-
-config SYS_FSL_ESDHC_BE
-	bool
-
-config SYS_FSL_IFC_BE
-	bool
-
-config SYS_FSL_IFC_BANK_COUNT
-	int "Maximum banks of Integrated flash controller"
-	depends on ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A || \
-		ARCH_LS1088A || ARCH_LS1021A || ARCH_B4860 || ARCH_B4420 || \
-		ARCH_T4240 || ARCH_T1040 || ARCH_T1042 || ARCH_T1024 || \
-		ARCH_T2080 || ARCH_C29X || ARCH_P1010 || ARCH_BSC9131 || \
-		ARCH_BSC9132
-	default 3 if ARCH_BSC9131 || ARCH_BSC9132
-	default 4 if ARCH_LS1043A || ARCH_LS1046A || ARCH_B4860 || \
-			ARCH_B4420 || ARCH_P1010
-	default 8 if ARCH_LS2080A || ARCH_LS1088A || ARCH_LS1021A || \
-			ARCH_T4240 || ARCH_T1040 || ARCH_T1042 || \
-			ARCH_T1024 || ARCH_T2080 || ARCH_C29X
-
-config FSL_QIXIS
-	bool "Enable QIXIS support"
-	depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
-
-config QIXIS_I2C_ACCESS
-	bool "Access to QIXIS is over i2c"
-	depends on FSL_QIXIS
-	default y
-
-config HAS_FSL_DR_USB
-	def_bool y
-	depends on USB_EHCI_HCD && PPC
-
-config SYS_DPAA_FMAN
-	bool
-
-config SYS_FSL_SRDS_1
-	bool
-
-config SYS_FSL_SRDS_2
-	bool
-
-config SYS_HAS_SERDES
-	bool
-
-endmenu

arch/arc/Kconfig

@@ -31,36 +31,36 @@ choice
 
 config CPU_ARC750D
 	bool "ARC 750D"
-	depends on ISA_ARCOMPACT
 	select ARC_MMU_V2
+	depends on ISA_ARCOMPACT
 	help
 	  Choose this option to build an U-Boot for ARC750D CPU.
 
 config CPU_ARC770D
 	bool "ARC 770D"
-	depends on ISA_ARCOMPACT
 	select ARC_MMU_V3
+	depends on ISA_ARCOMPACT
 	help
 	  Choose this option to build an U-Boot for ARC770D CPU.
 
 config CPU_ARCEM6
 	bool "ARC EM6"
-	depends on ISA_ARCV2
 	select ARC_MMU_ABSENT
+	depends on ISA_ARCV2
 	help
 	  Next Generation ARC Core based on ISA-v2 ISA without MMU.
 
 config CPU_ARCHS36
 	bool "ARC HS36"
-	depends on ISA_ARCV2
 	select ARC_MMU_ABSENT
+	depends on ISA_ARCV2
 	help
 	  Next Generation ARC Core based on ISA-v2 ISA without MMU.
 
 config CPU_ARCHS38
 	bool "ARC HS38"
-	depends on ISA_ARCV2
 	select ARC_MMU_V4
+	depends on ISA_ARCV2
 	help
 	  Next Generation ARC Core based on ISA-v2 ISA with MMU.
 
@@ -102,92 +102,37 @@ config ARC_MMU_V4
 
 endchoice
 
-config ARC_MMU_VER
-	int
-	default 0 if ARC_MMU_ABSENT
-	default 2 if ARC_MMU_V2
-	default 3 if ARC_MMU_V3
-	default 4 if ARC_MMU_V4
-
 config CPU_BIG_ENDIAN
 	bool "Enable Big Endian Mode"
+	default n
 	help
 	  Build kernel for Big Endian Mode of ARC CPU
 
 config SYS_ICACHE_OFF
-	bool "Do not enable icache"
-	help
-	  Do not enable instruction cache in U-Boot.
-
-config SPL_SYS_ICACHE_OFF
-	bool "Do not enable icache in SPL"
-	depends on SPL
-	default SYS_ICACHE_OFF
-	help
-	  Do not enable instruction cache in SPL.
+	bool "Do not use Instruction Cache"
+	default n
 
 config SYS_DCACHE_OFF
-	bool "Do not enable dcache"
-	help
-	  Do not enable data cache in U-Boot.
-
-config SPL_SYS_DCACHE_OFF
-	bool "Do not enable dcache in SPL"
-	depends on SPL
-	default SYS_DCACHE_OFF
-	help
-	  Do not enable data cache in SPL.
-
-menuconfig ARC_DBG
-	bool "ARC debugging"
-
-if ARC_DBG
-
-config ARC_DBG_IOC_ENABLE
-	bool "Enable IO coherency unit"
-	depends on CPU_ARCHS38
-	help
-	  Enable IO coherency unit to debug problems with caches and
-	  DMA peripherals.
-	  NOTE: as of today linux will not work properly if this option
-	  is enabled in u-boot!
-
-endif
+	bool "Do not use Data Cache"
+	default n
 
 choice
 	prompt "Target select"
-	default TARGET_AXS103
+	default TARGET_AXS10X
 
 config TARGET_TB100
 	bool "Support tb100"
 
 config TARGET_NSIM
-	bool "Support ARC simulation & prototyping platforms"
+	bool "Support standalone nSIM & Free nSIM"
 
-config TARGET_AXS101
-	bool "Support Synopsys Designware SDP board AXS101"
-
-config TARGET_AXS103
-	bool "Support Synopsys Designware SDP board AXS103"
-
-config TARGET_EMSDP
-	bool "Synopsys EM Software Development Platform"
-	select CPU_ARCEM6
-
-config TARGET_HSDK
-	bool "Support Synopsys HSDK or HSDK-4xD board"
-
-config TARGET_IOT_DEVKIT
-	bool "Synopsys Brite IoT Development kit"
-	select CPU_ARCEM6
+config TARGET_AXS10X
+	bool "Support Synopsys Designware SDP board (AXS101 & AXS103)"
 
 endchoice
 
 source "board/abilis/tb100/Kconfig"
+source "board/synopsys/Kconfig"
 source "board/synopsys/axs10x/Kconfig"
-source "board/synopsys/emsdp/Kconfig"
-source "board/synopsys/hsdk/Kconfig"
-source "board/synopsys/iot_devkit/Kconfig"
-source "board/synopsys/nsim/Kconfig"
 
 endmenu

arch/arc/Makefile

@@ -1,4 +1,6 @@
-# SPDX-License-Identifier: GPL-2.0+
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
 libs-y += arch/arc/cpu/$(CPU)/
 libs-y += arch/arc/lib/

arch/arc/config.mk

@@ -1,19 +1,59 @@
-# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+ifndef CONFIG_CPU_BIG_ENDIAN
+CONFIG_SYS_LITTLE_ENDIAN = 1
+else
+CONFIG_SYS_BIG_ENDIAN = 1
+endif
 
 ifdef CONFIG_SYS_LITTLE_ENDIAN
-KBUILD_LDFLAGS += -EL
+ARC_CROSS_COMPILE := arc-linux-
+PLATFORM_LDFLAGS += -EL
 PLATFORM_CPPFLAGS += -mlittle-endian
 endif
 
 ifdef CONFIG_SYS_BIG_ENDIAN
-KBUILD_LDFLAGS += -EB
+ARC_CROSS_COMPILE := arceb-linux-
+PLATFORM_LDFLAGS += -EB
 PLATFORM_CPPFLAGS += -mbig-endian
 endif
 
-PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 -mno-sdata
-PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common
+ifeq ($(CROSS_COMPILE),)
+CROSS_COMPILE := $(ARC_CROSS_COMPILE)
+endif
+
+ifdef CONFIG_ARC_MMU_VER
+CONFIG_MMU = 1
+endif
+
+ifdef CONFIG_CPU_ARC750D
+PLATFORM_CPPFLAGS += -marc700
+endif
+
+ifdef CONFIG_CPU_ARC770D
+PLATFORM_CPPFLAGS += -marc700 -mlock -mswape
+endif
+
+ifdef CONFIG_CPU_ARCEM6
+PLATFORM_CPPFLAGS += -marcem
+endif
+
+ifdef CONFIG_CPU_ARCHS34
+PLATFORM_CPPFLAGS += -mcpu=archs
+endif
+
+ifdef CONFIG_CPU_ARCHS38
+PLATFORM_CPPFLAGS += -mcpu=archs
+endif
+
+PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2
 
 # Needed for relocation
-LDFLAGS_FINAL += -pie --gc-sections
+LDFLAGS_FINAL += -pie
+
+# Load address for standalone apps
+CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000

arch/arc/cpu/arcv1/Makefile

@@ -1,5 +1,7 @@
-# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
 obj-y += ivt.o

arch/arc/cpu/arcv1/ivt.S

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 .section .ivt, "ax",@progbits

arch/arc/cpu/arcv2/Makefile

@@ -1,5 +1,7 @@
-# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
 obj-y += ivt.o

arch/arc/cpu/arcv2/ivt.S

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 .section .ivt, "a",@progbits

arch/arc/cpu/u-boot.lds

@@ -1,26 +1,18 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
 
-OUTPUT_FORMAT("elf32-littlearc", "elf32-bigarc", "elf32-littlearc")
+OUTPUT_FORMAT("elf32-littlearc", "elf32-littlearc", "elf32-littlearc")
 OUTPUT_ARCH(arc)
 ENTRY(_start)
 SECTIONS
 {
-	. = CONFIG_TEXT_BASE;
+	. = CONFIG_SYS_TEXT_BASE;
 	__image_copy_start = .;
-	. = ALIGN(1024);
-	__ivt_start = .;
-	.ivt :
-	{
-		KEEP(*(.ivt))
-	}
-	__ivt_end = .;
-
-	. = ALIGN(1024);
 	__text_start = .;
 	.text :	{
 		arch/arc/lib/start.o (.text*)
@@ -28,6 +20,14 @@ SECTIONS
 	}
 	__text_end = .;
 
+	. = ALIGN(1024);
+	__ivt_start = .;
+	.ivt :
+	{
+		*(.ivt)
+	}
+	__ivt_end = .;
+
 	. = ALIGN(4);
 	.rodata : {
 		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
@@ -39,8 +39,8 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	__u_boot_list : {
-		KEEP(*(SORT(__u_boot_list*)));
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
 	}
 
 	. = ALIGN(4);

arch/arc/dts/.gitignore

@@ -0,0 +1 @@
+*.dtb

arch/arc/dts/Makefile

@@ -1,14 +1,17 @@
-# SPDX-License-Identifier: GPL-2.0+
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
-dtb-$(CONFIG_TARGET_AXS101) +=  axs101.dtb
-dtb-$(CONFIG_TARGET_AXS103) +=  axs103.dtb
+dtb-$(CONFIG_TARGET_AXS10X) +=  axs10x.dtb
 dtb-$(CONFIG_TARGET_NSIM) +=  nsim.dtb
 dtb-$(CONFIG_TARGET_TB100) +=  abilis_tb100.dtb
-dtb-$(CONFIG_TARGET_EMSDP) +=  emsdp.dtb
-dtb-$(CONFIG_TARGET_HSDK) +=  hsdk.dtb hsdk-4xd.dtb
-dtb-$(CONFIG_TARGET_IOT_DEVKIT) +=  iot_devkit.dtb
 
-include $(srctree)/scripts/Makefile.dts
+targets += $(dtb-y)
 
-# Add any required device tree compiler flags here
-DTC_FLAGS += -R 4
+DTC_FLAGS += -R 4 -p 0x1000
+
+PHONY += dtbs
+dtbs: $(addprefix $(obj)/, $(dtb-y))
+	@:
+
+clean-files := *.dtb

arch/arc/dts/abilis_tb100.dts

@@ -1,27 +1,20 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Synopsys, Inc. (www.synopsys.com)
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 /dts-v1/;
 
 #include "skeleton.dtsi"
 
 / {
-	model = "abilis,tb100";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	aliases {
 		console = &uart0;
 	};
 
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <500000000>;
-			bootph-all;
-		};
-	};
-
 	uart0: serial@ff100000 {
 			compatible = "snps,dw-apb-uart";
 			reg = <0xff100000 0x1000>;

arch/arc/dts/axc001.dtsi

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Synopsys, Inc. All rights reserved.
- */
-
-/include/ "skeleton.dtsi"
-
-/ {
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <750000000>;
-			bootph-all;
-		};
-	};
-};
-

arch/arc/dts/axc003.dtsi

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Synopsys, Inc. All rights reserved.
- */
-
-/include/ "skeleton.dtsi"
-
-/ {
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <100000000>;
-			bootph-all;
-		};
-	};
-};
-

arch/arc/dts/axs101.dts

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Synopsys, Inc. All rights reserved.
- */
-/dts-v1/;
-
-/include/ "axc001.dtsi"
-/include/ "axs10x_mb.dtsi"
-
-
-/ {
-	model = "snps,axs101";
-
-	chosen {
-		stdout-path = &uart0;
-	};
-};
-

arch/arc/dts/axs103.dts

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Synopsys, Inc. All rights reserved.
- */
-/dts-v1/;
-
-/include/ "axc003.dtsi"
-/include/ "axs10x_mb.dtsi"
-
-
-/ {
-	model = "snps,axs103";
-
-	chosen {
-		stdout-path = &uart0;
-	};
-};
-

arch/arc/dts/axs10x.dts

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+
+#include "skeleton.dtsi"
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	aliases {
+		console = &uart0;
+	};
+
+	clocks {
+		apbclk: apbclk {
+			compatible = "fixed-clock";
+			clock-frequency = <50000000>;
+			#clock-cells = <0>;
+		};
+	};
+
+	uart0: serial0@e0022000 {
+		compatible = "snps,dw-apb-uart";
+		reg = <0xe0022000 0x1000>;
+		reg-shift = <2>;
+		reg-io-width = <4>;
+	};
+
+	ethernet@e0018000 {
+		#interrupt-cells = <1>;
+		compatible = "altr,socfpga-stmmac";
+		reg = < 0xe0018000 0x2000 >;
+		interrupts = < 25 >;
+		interrupt-names = "macirq";
+		phy-mode = "gmii";
+		snps,pbl = < 32 >;
+		clocks = <&apbclk>;
+		clock-names = "stmmaceth";
+		max-speed = <100>;
+	};
+
+	ehci@0xe0040000 {
+		compatible = "generic-ehci";
+		reg = < 0xe0040000 0x100 >;
+		interrupts = < 8 >;
+	};
+
+	ohci@0xe0060000 {
+		compatible = "generic-ohci";
+		reg = < 0xe0060000 0x100 >;
+		interrupts = < 8 >;
+	};
+};

arch/arc/dts/axs10x_mb.dtsi

@@ -1,123 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Synopsys, Inc. All rights reserved.
- */
-
-/ {
-	aliases {
-		spi0 = &spi0;
-	};
-
-	axs10x_mb@e0000000 {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0x00000000 0xe0000000 0x10000000>;
-		bootph-all;
-
-		clocks {
-			compatible = "simple-bus";
-			bootph-all;
-
-			apbclk: apbclk {
-				compatible = "fixed-clock";
-				clock-frequency = <50000000>;
-				#clock-cells = <0>;
-			};
-
-			uartclk: uartclk {
-				compatible = "fixed-clock";
-				clock-frequency = <33333333>;
-				#clock-cells = <0>;
-				bootph-all;
-			};
-
-			mmcclk_ciu: mmcclk-ciu {
-				compatible = "fixed-clock";
-				/*
-				 * DW sdio controller has external ciu clock divider
-				 * controlled via register in SDIO IP. It divides
-				 * sdio_ref_clk (which comes from CGU) by 16 for
-				 * default. So default mmcclk clock (which comes
-				 * to sdk_in) is 25000000 Hz.
-				 */
-				clock-frequency = <25000000>;
-				#clock-cells = <0>;
-			};
-
-			mmcclk_biu: mmcclk-biu {
-				compatible = "fixed-clock";
-				clock-frequency = <50000000>;
-				#clock-cells = <0>;
-			};
-		};
-
-		ethernet@18000 {
-			compatible = "snps,arc-dwmac-3.70a";
-			reg = < 0x18000 0x2000 >;
-			phy-mode = "gmii";
-			snps,pbl = < 32 >;
-			clocks = <&apbclk>;
-			clock-names = "stmmaceth";
-			max-speed = <100>;
-		};
-
-		ehci@40000 {
-			compatible = "generic-ehci";
-			reg = < 0x40000 0x100 >;
-		};
-
-		ohci@60000 {
-			compatible = "generic-ohci";
-			reg = < 0x60000 0x100 >;
-		};
-
-		mmc: mmc@15000 {
-			compatible = "snps,dw-mshc";
-			reg = <0x15000 0x400>;
-			bus-width = <4>;
-			clocks = <&mmcclk_biu>, <&mmcclk_ciu>;
-			clock-names = "biu", "ciu";
-			max-frequency = <25000000>;
-		};
-
-		uart0: serial0@22000 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x22000 0x100>;
-			clocks = <&uartclk>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-		};
-
-		spi0: spi@0 {
-			compatible = "snps,axs10x-spi", "snps,dw-apb-ssi";
-			reg = <0x0 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			spi-max-frequency = <4000000>;
-			clocks = <&apbclk>;
-			clock-names = "spi_clk";
-			num-cs = <1>;
-			cs-gpios = <&cs_gpio 0>;
-			spi_flash@0 {
-				compatible = "jedec,spi-nor";
-				reg = <0>;
-				spi-max-frequency = <4000000>;
-			};
-		};
-
-		cs_gpio: gpio@11218 {
-			compatible = "snps,creg-gpio";
-			reg = <0x11218 0x4>;
-			gpio-controller;
-			#gpio-cells = <1>;
-			gpio-bank-name = "axs-spi-cs";
-			gpio-count = <1>;
-			gpio-first-shift = <0>;
-			gpio-bit-per-line = <2>;
-			gpio-activate-val = <1>;
-			gpio-deactivate-val = <3>;
-			gpio-default-val = <1>;
-		};
-	};
-};

arch/arc/dts/emsdp.dts

@@ -1,58 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Synopsys, Inc. All rights reserved.
- */
-/dts-v1/;
-
-#include "skeleton.dtsi"
-
-/ {
-	model = "snps,emsdp";
-
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	aliases {
-		console = &uart0;
-	};
-
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <40000000>;
-			bootph-all;
-		};
-	};
-
-	uart0: serial0@f0004000 {
-		compatible = "snps,dw-apb-uart";
-		clock-frequency = <100000000>;
-		reg = <0xf0004000 0x1000>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-	};
-
-	mmcclk_biu: mmcclk-biu {
-		compatible = "fixed-clock";
-		clock-frequency = <50000000>;
-		#clock-cells = <0>;
-	};
-
-	mmcclk_ciu: mmcclk-ciu {
-		compatible = "fixed-clock";
-		clock-frequency = <100000000>;
-		#clock-cells = <0>;
-	};
-
-	mmc: mmc0@f0010000 {
-		compatible = "snps,dw-mshc";
-		reg = <0xf0010000 0x400>;
-		bus-width = <4>;
-		fifo-depth = <256>;
-		clocks = <&mmcclk_biu>, <&mmcclk_ciu>;
-		clock-names = "biu", "ciu";
-		max-frequency = <25000000>;
-	};
-
-};

arch/arc/dts/hsdk-4xd.dts

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2020 Synopsys, Inc. All rights reserved.
- * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
- */
-/dts-v1/;
-
-#include "hsdk-common.dtsi"
-
-/ {
-	model = "snps,hsdk-4xd";
-};

arch/arc/dts/hsdk-common.dtsi

@@ -1,160 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017-2020 Synopsys, Inc. All rights reserved.
- * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
- */
-/dts-v1/;
-
-#include "skeleton.dtsi"
-#include "dt-bindings/clock/snps,hsdk-cgu.h"
-#include "dt-bindings/reset/snps,hsdk-reset.h"
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	aliases {
-		console = &uart0;
-		spi0 = &spi0;
-	};
-
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <500000000>;
-			bootph-all;
-		};
-	};
-
-	clk-fmeas {
-		clocks = <&cgu_clk CLK_ARC_PLL>, <&cgu_clk CLK_SYS_PLL>,
-			 <&cgu_clk CLK_TUN_PLL>, <&cgu_clk CLK_DDR_PLL>,
-			 <&cgu_clk CLK_ARC>, <&cgu_clk CLK_HDMI_PLL>,
-			 <&cgu_clk CLK_TUN_TUN>, <&cgu_clk CLK_HDMI>,
-			 <&cgu_clk CLK_SYS_APB>, <&cgu_clk CLK_SYS_AXI>,
-			 <&cgu_clk CLK_SYS_ETH>, <&cgu_clk CLK_SYS_USB>,
-			 <&cgu_clk CLK_SYS_SDIO>, <&cgu_clk CLK_SYS_HDMI>,
-			 <&cgu_clk CLK_SYS_GFX_CORE>, <&cgu_clk CLK_SYS_GFX_DMA>,
-			 <&cgu_clk CLK_SYS_GFX_CFG>, <&cgu_clk CLK_SYS_DMAC_CORE>,
-			 <&cgu_clk CLK_SYS_DMAC_CFG>, <&cgu_clk CLK_SYS_SDIO_REF>,
-			 <&cgu_clk CLK_SYS_SPI_REF>, <&cgu_clk CLK_SYS_I2C_REF>,
-			 <&cgu_clk CLK_SYS_UART_REF>, <&cgu_clk CLK_SYS_EBI_REF>,
-			 <&cgu_clk CLK_TUN_ROM>, <&cgu_clk CLK_TUN_PWM>,
-			 <&cgu_clk CLK_TUN_TIMER>;
-		clock-names = "cpu-pll", "sys-pll",
-			      "tun-pll", "ddr-clk",
-			      "cpu-clk", "hdmi-pll",
-			      "tun-clk", "hdmi-clk",
-			      "apb-clk", "axi-clk",
-			      "eth-clk", "usb-clk",
-			      "sdio-clk", "hdmi-sys-clk",
-			      "gfx-core-clk", "gfx-dma-clk",
-			      "gfx-cfg-clk", "dmac-core-clk",
-			      "dmac-cfg-clk", "sdio-ref-clk",
-			      "spi-clk", "i2c-clk",
-			      "uart-clk", "ebi-clk",
-			      "rom-clk", "pwm-clk",
-			      "timer-clk";
-	};
-
-	cgu_clk: cgu-clk@f0000000 {
-		compatible = "snps,hsdk-cgu-clock";
-		reg = <0xf0000000 0x10>, <0xf00014B8 0x4>;
-		#clock-cells = <1>;
-	};
-
-	cgu_rst: reset-controller@f00008a0 {
-		compatible = "snps,hsdk-reset";
-		#reset-cells = <1>;
-		reg = <0xf00008a0 0x4>, <0xf0000ff0 0x4>;
-	};
-
-	uart0: serial0@f0005000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0xf0005000 0x1000>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-	};
-
-	ethernet@f0008000 {
-		#interrupt-cells = <1>;
-		compatible = "snps,arc-dwmac-3.70a";
-		reg = <0xf0008000 0x2000>;
-		phy-mode = "gmii";
-	};
-
-	ehci@f0040000 {
-		compatible = "generic-ehci";
-		reg = <0xf0040000 0x100>;
-
-		/*
-		 * OHCI and EHCI have reset line shared so we don't add
-		 * reset property to OHCI node as it is probed later and
-		 * it will reset sucessfuly probed and configured EHCI HW.
-		 */
-		resets = <&cgu_rst HSDK_USB_RESET>;
-	};
-
-	ohci@f0060000 {
-		compatible = "generic-ohci";
-		reg = <0xf0060000 0x100>;
-	};
-
-	mmcclk_ciu: mmcclk-ciu {
-		compatible = "fixed-clock";
-		/*
-		 * DW sdio controller has external ciu clock divider
-		 * controlled via register in SDIO IP. Due to its
-		 * unexpected default value (it should divide by 1
-		 * but it divides by 8) SDIO IP uses wrong clock and
-		 * works unstable (see STAR 9001204800)
-		 * We switched to the minimum possible value of the
-		 * divisor (div-by-2) in HSDK platform code.
-		 * So default mmcclk ciu clock is 50000000 Hz.
-		 */
-		clock-frequency = <50000000>;
-		#clock-cells = <0>;
-	};
-
-	mmc: mmc0@f000a000 {
-		compatible = "snps,dw-mshc";
-		reg = <0xf000a000 0x400>;
-		bus-width = <4>;
-		fifo-depth = <256>;
-		clocks = <&cgu_clk CLK_SYS_SDIO>, <&mmcclk_ciu>;
-		clock-names = "biu", "ciu";
-		max-frequency = <25000000>;
-	};
-
-	spi0: spi@f0020000 {
-		compatible = "snps,hsdk-spi", "snps,dw-apb-ssi";
-		reg = <0xf0020000 0x1000>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		spi-max-frequency = <4000000>;
-		clocks = <&cgu_clk CLK_SYS_SPI_REF>;
-		clock-names = "spi_clk";
-		num-cs = <1>;
-		cs-gpios = <&cs_gpio 0>;
-		spi_flash@0 {
-			compatible = "jedec,spi-nor";
-			reg = <0>;
-			spi-max-frequency = <4000000>;
-		};
-	};
-
-	cs_gpio: gpio@f00014b0 {
-		compatible = "snps,creg-gpio";
-		reg = <0xf00014b0 0x4>;
-		gpio-controller;
-		#gpio-cells = <1>;
-		gpio-bank-name = "hsdk-spi-cs";
-		gpio-count = <1>;
-		gpio-first-shift = <0>;
-		gpio-bit-per-line = <2>;
-		gpio-activate-val = <2>;
-		gpio-deactivate-val = <3>;
-		gpio-default-val = <1>;
-	};
-};

arch/arc/dts/hsdk.dts

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017-2020 Synopsys, Inc. All rights reserved.
- * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
- */
-/dts-v1/;
-
-#include "hsdk-common.dtsi"
-
-/ {
-	model = "snps,hsdk";
-};

arch/arc/dts/iot_devkit.dts

@@ -1,67 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Synopsys, Inc. All rights reserved.
- */
-/dts-v1/;
-
-#include "skeleton.dtsi"
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	aliases {
-		console = &uart0;
-	};
-
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <144000000>;
-			bootph-all;
-		};
-	};
-
-	uart0: serial0@80014000 {
-		compatible = "snps,dw-apb-uart";
-		clock-frequency = <16000000>;
-		reg = <0x80014000 0x1000>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-	};
-
-	usb: usb@f0040000 {
-		compatible = "snps,dwc2";
-		reg = <0xf0040000 0x10000>;
-		phys = <&usbphy>;
-		phy-names = "usb2-phy";
-	};
-
-	usbphy: phy {
-		compatible = "usb-nop-xceiv";
-		#phy-cells = <0>;
-	};
-
-	mmcclk_biu: mmcclk-biu {
-		compatible = "fixed-clock";
-		clock-frequency = <50000000>;
-		#clock-cells = <0>;
-	};
-
-	mmcclk_ciu: mmcclk-ciu {
-		compatible = "fixed-clock";
-		clock-frequency = <50000000>;
-		#clock-cells = <0>;
-	};
-
-	mmc: mmc0@f000b000 {
-		compatible = "snps,dw-mshc";
-		reg = <0xf000b000 0x400>;
-		bus-width = <4>;
-		fifo-depth = <128>;
-		clocks = <&mmcclk_biu>, <&mmcclk_ciu>;
-		clock-names = "biu", "ciu";
-		max-frequency = <25000000>;
-	};
-};

arch/arc/dts/nsim.dts

@@ -1,57 +1,24 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2015-2016, 2020 Synopsys, Inc. (www.synopsys.com)
+ * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com)
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 /dts-v1/;
 
 #include "skeleton.dtsi"
 
 / {
-	model = "snps,nsim";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	aliases {
-		console = &uart0;
+		console = &arcuart0;
 	};
 
-	cpu_card {
-		core_clk: core_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <70000000>;
-			bootph-all;
-		};
+	arcuart0: serial@0xc0fc1000 {
+		compatible = "snps,arc-uart";
+		reg = <0xc0fc1000 0x100>;
+		clock-frequency = <80000000>;
 	};
 
-	uart0: serial@f0000000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0xf0000000 0x1000>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		clock-frequency = <70000000>;
-	};
-
-	virtio0: virtio@f0100000 {
-		compatible = "virtio,mmio";
-		reg = <0xf0100000 0x2000>;
-	};
-
-	virtio1: virtio@f0102000 {
-		compatible = "virtio,mmio";
-		reg = <0xf0102000 0x2000>;
-	};
-
-	virtio2: virtio@f0104000 {
-		compatible = "virtio,mmio";
-		reg = <0xf0104000 0x2000>;
-	};
-
-	virtio3: virtio@f0106000 {
-		compatible = "virtio,mmio";
-		reg = <0xf0106000 0x2000>;
-	};
-
-	virtio4: virtio@f0108000 {
-		compatible = "virtio,mmio";
-		reg = <0xf0108000 0x2000>;
-	};
 };

arch/arc/dts/skeleton.dtsi

@@ -9,22 +9,5 @@
 	#size-cells = <1>;
 	chosen { };
 	aliases { };
-
-	cpu_card {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		bootph-all;
-
-		timer@0 {
-			compatible = "snps,arc-timer";
-			clocks = <&core_clk>;
-			reg = <0 1>;
-		};
-	};
-
-	memory@80000000 {
-		device_type = "memory";
-		reg = <0x80000000 0x10000000>; /* 256M */
-	};
+	memory { device_type = "memory"; reg = <0 0>; };
 };

arch/arc/include/asm/arc-bcr.h

@@ -1,75 +0,0 @@
-/*
- * ARC Build Configuration Registers, with encoded hardware config
- *
- * Copyright (C) 2018 Synopsys
- * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __ARC_BCR_H
-#define __ARC_BCR_H
-#ifndef __ASSEMBLY__
-
-union bcr_di_cache {
-	struct {
-#ifdef CONFIG_SYS_BIG_ENDIAN
-		unsigned int pad:12, line_len:4, sz:4, config:4, ver:8;
-#else
-		unsigned int ver:8, config:4, sz:4, line_len:4, pad:12;
-#endif
-	} fields;
-	unsigned int word;
-};
-
-union bcr_slc_cfg {
-	struct {
-#ifdef CONFIG_SYS_BIG_ENDIAN
-		unsigned int pad:24, way:2, lsz:2, sz:4;
-#else
-		unsigned int sz:4, lsz:2, way:2, pad:24;
-#endif
-	} fields;
-	unsigned int word;
-};
-
-union bcr_generic {
-	struct {
-#ifdef CONFIG_SYS_BIG_ENDIAN
-		unsigned int pad:24, ver:8;
-#else
-		unsigned int ver:8, pad:24;
-#endif
-	} fields;
-	unsigned int word;
-};
-
-union bcr_clust_cfg {
-	struct {
-#ifdef CONFIG_SYS_BIG_ENDIAN
-		unsigned int pad:7, c:1, num_entries:8, num_cores:8, ver:8;
-#else
-		unsigned int ver:8, num_cores:8, num_entries:8, c:1, pad:7;
-#endif
-	} fields;
-	unsigned int word;
-};
-
-union bcr_mmu_4 {
-	struct {
-#ifdef CONFIG_SYS_BIG_ENDIAN
-	unsigned int ver:8, sasid:1, sz1:4, sz0:4, res:2, pae:1,
-		     n_ways:2, n_entry:2, n_super:2, u_itlb:3, u_dtlb:3;
-#else
-	/*           DTLB      ITLB      JES        JE         JA      */
-	unsigned int u_dtlb:3, u_itlb:3, n_super:2, n_entry:2, n_ways:2,
-		     pae:1, res:2, sz0:4, sz1:4, sasid:1, ver:8;
-#endif
-	} fields;
-	unsigned int word;
-};
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARC_BCR_H */

arch/arc/include/asm/arcregs.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _ASM_ARC_ARCREGS_H
@@ -15,26 +16,9 @@
  * access: "lr"/"sr".
  */
 
-/*
- * Typically 8 least significant bits of Build Configuration Register (BCR)
- * describe version of the HW block in question. Moreover if decoded version
- * is 0 this means given HW block is absent - this is especially useful because
- * we may safely read BRC regardless HW block existence while an attempt to
- * access any other AUX regs associated with this HW block lead to imediate
- * "instruction error" exception.
- *
- * I.e. before using any cofigurable HW block it's required to make sure it
- * exists at all, and for that we introduce a special macro below.
- */
-#define ARC_BCR_VERSION_MASK	GENMASK(7, 0)
-#define ARC_FEATURE_EXISTS(bcr)	!!(__builtin_arc_lr(bcr) & ARC_BCR_VERSION_MASK)
-
 #define ARC_AUX_IDENTITY	0x04
 #define ARC_AUX_STATUS32	0x0a
 
-/* STATUS32 Bits Positions */
-#define STATUS_AD_BIT		19	/* Enable unaligned access */
-
 /* Instruction cache related auxiliary registers */
 #define ARC_AUX_IC_IVIC		0x10
 #define ARC_AUX_IC_CTRL		0x11
@@ -43,25 +27,12 @@
 #define ARC_AUX_IC_PTAG		0x1E
 #endif
 #define ARC_BCR_IC_BUILD	0x77
-#define AUX_AUX_CACHE_LIMIT		0x5D
-#define ARC_AUX_NON_VOLATILE_LIMIT	0x5E
-
-/* ICCM and DCCM auxiliary registers */
-#define ARC_AUX_DCCM_BASE	0x18	/* DCCM Base Addr ARCv2 */
-#define ARC_AUX_ICCM_BASE	0x208	/* ICCM Base Addr ARCv2 */
-
-/* CSM auxiliary registers */
-#define ARC_AUX_CSM_ENABLE	0x9A0
 
 /* Timer related auxiliary registers */
 #define ARC_AUX_TIMER0_CNT	0x21	/* Timer 0 count */
 #define ARC_AUX_TIMER0_CTRL	0x22	/* Timer 0 control */
 #define ARC_AUX_TIMER0_LIMIT	0x23	/* Timer 0 limit */
 
-#define ARC_AUX_TIMER1_CNT	0x100	/* Timer 1 count */
-#define ARC_AUX_TIMER1_CTRL	0x101	/* Timer 1 control */
-#define ARC_AUX_TIMER1_LIMIT	0x102	/* Timer 1 limit */
-
 #define ARC_AUX_INTR_VEC_BASE	0x25
 
 /* Data cache related auxiliary registers */
@@ -82,53 +53,21 @@
 #define ARC_AUX_SLC_INVALIDATE	0x905
 #define ARC_AUX_SLC_IVDL	0x910
 #define ARC_AUX_SLC_FLDL	0x912
-#define ARC_AUX_SLC_RGN_START	0x914
-#define ARC_AUX_SLC_RGN_START1	0x915
-#define ARC_AUX_SLC_RGN_END	0x916
-#define ARC_AUX_SLC_RGN_END1	0x917
 #define ARC_BCR_CLUSTER		0xcf
 
-/* MMU Management regs */
-#define ARC_AUX_MMU_BCR		0x6f
-
 /* IO coherency related auxiliary registers */
 #define ARC_AUX_IO_COH_ENABLE	0x500
 #define ARC_AUX_IO_COH_PARTIAL	0x501
 #define ARC_AUX_IO_COH_AP0_BASE	0x508
 #define ARC_AUX_IO_COH_AP0_SIZE	0x509
 
-/* XY-memory related */
-#define ARC_AUX_XY_BUILD	0x79
-
-/* DSP-extensions related auxiliary registers */
-#define ARC_AUX_DSP_BUILD	0x7A
-#define ARC_AUX_DSP_CTRL	0x59F
-
-/* ARC Subsystems related auxiliary registers */
-#define ARC_AUX_SUBSYS_BUILD	0xF0
-
 #ifndef __ASSEMBLY__
-#include <linux/bitops.h>
-
 /* Accessors for auxiliary registers */
 #define read_aux_reg(reg)	__builtin_arc_lr(reg)
 
 /* gcc builtin sr needs reg param to be long immediate */
 #define write_aux_reg(reg_immed, val)		\
 		__builtin_arc_sr((unsigned int)val, reg_immed)
-
-/* ARCNUM [15:8] - field to identify each core in a multi-core system */
-#define CPU_ID_GET()	((read_aux_reg(ARC_AUX_IDENTITY) & 0xFF00) >> 8)
-
-static const inline int is_isa_arcv2(void)
-{
-	return IS_ENABLED(CONFIG_ISA_ARCV2);
-}
-
-static const inline int is_isa_arcompact(void)
-{
-	return IS_ENABLED(CONFIG_ISA_ARCOMPACT);
-}
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_ARC_ARCREGS_H */

arch/arc/include/asm/bitops.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_BITOPS_H

arch/arc/include/asm/byteorder.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_BYTEORDER_H

arch/arc/include/asm/cache.h

@@ -1,11 +1,14 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_CACHE_H
 #define __ASM_ARC_CACHE_H
 
+#include <config.h>
+
 /*
  * As of today we may handle any L1 cache line length right in software.
  * For that essentially cache line length is a variable not constant.
@@ -14,23 +17,19 @@
  */
 #define ARCH_DMA_MINALIGN	128
 
+#if defined(ARC_MMU_ABSENT)
+#define CONFIG_ARC_MMU_VER 0
+#elif defined(CONFIG_ARC_MMU_V2)
+#define CONFIG_ARC_MMU_VER 2
+#elif defined(CONFIG_ARC_MMU_V3)
+#define CONFIG_ARC_MMU_VER 3
+#elif defined(CONFIG_ARC_MMU_V4)
+#define CONFIG_ARC_MMU_VER 4
+#endif
+
 #ifndef __ASSEMBLY__
 
 void cache_init(void);
-void flush_n_invalidate_dcache_all(void);
-void sync_n_cleanup_cache_all(void);
-
-static const inline int is_ioc_enabled(void)
-{
-	return IS_ENABLED(CONFIG_ARC_DBG_IOC_ENABLE);
-}
-
-/*
- * We export SLC control functions to use them in platform configuration code.
- * They maust not be used in any generic code!
- */
-void slc_enable(void);
-void slc_disable(void);
 
 #endif /* __ASSEMBLY__ */
 

arch/arc/include/asm/config.h

@@ -1,9 +1,15 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_CONFIG_H_
 #define __ASM_ARC_CONFIG_H_
 
+#define CONFIG_SYS_BOOT_RAMDISK_HIGH
+#define CONFIG_ARCH_EARLY_INIT_R
+
+#define CONFIG_LMB
+
 #endif /*__ASM_ARC_CONFIG_H_ */

arch/arc/include/asm/dma-mapping.h

@@ -1 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */

arch/arc/include/asm/errno.h

@@ -0,0 +1 @@
+#include <asm-generic/errno.h>

arch/arc/include/asm/global_data.h

@@ -1,25 +1,20 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef	__ASM_ARC_GLOBAL_DATA_H
 #define __ASM_ARC_GLOBAL_DATA_H
 
-#include <asm/u-boot.h>
-
 #ifndef __ASSEMBLY__
 /* Architecture-specific global data */
 struct arch_global_data {
-	int l1_line_sz;
-#if defined(CONFIG_ISA_ARCV2)
-	int slc_line_sz;
-#endif
 };
 #endif /* __ASSEMBLY__ */
 
 #include <asm-generic/global_data.h>
 
-#define DECLARE_GLOBAL_DATA_PTR		register gd_t *gd asm ("r25")
+#define DECLARE_GLOBAL_DATA_PTR		register volatile gd_t *gd asm ("r25")
 
 #endif /* __ASM_ARC_GLOBAL_DATA_H */

arch/arc/include/asm/gpio.h

@@ -1 +0,0 @@
-#include <asm-generic/gpio.h>

arch/arc/include/asm/init_helpers.h

@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _ASM_ARC_INIT_HELPERS_H
+#define _ASM_ARC_INIT_HELPERS_H
+
+int init_cache_f_r(void);
+
+#endif	/* _ASM_ARC_INIT_HELPERS_H */

arch/arc/include/asm/io.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2013-2014, 2020 Synopsys, Inc. All rights reserved.
+ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_IO_H
@@ -9,13 +10,7 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
-/*
- * Compiler barrier. It prevents compiler from reordering instructions before
- * and after it. It doesn't prevent HW (CPU) from any reordering though.
- */
-#define __comp_b()		asm volatile("" : : : "memory")
-
-#ifdef __ARCHS__
+#ifdef CONFIG_ISA_ARCV2
 
 /*
  * ARCv2 based HS38 cores are in-order issue, but still weakly ordered
@@ -47,128 +42,171 @@
 #define mb()	asm volatile("sync\n" : : : "memory")
 #endif
 
-#ifdef __ARCHS__
+#ifdef CONFIG_ISA_ARCV2
 #define __iormb()		rmb()
 #define __iowmb()		wmb()
 #else
-#define __iormb()		__comp_b()
-#define __iowmb()		__comp_b()
+#define __iormb()		do { } while (0)
+#define __iowmb()		do { } while (0)
 #endif
 
+/*
+ * Given a physical address and a length, return a virtual address
+ * that can be used to access the memory range with the caching
+ * properties specified by "flags".
+ */
+#define MAP_NOCACHE	(0)
+#define MAP_WRCOMBINE	(0)
+#define MAP_WRBACK	(0)
+#define MAP_WRTHROUGH	(0)
+
+static inline void *
+map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
+{
+	return (void *)((unsigned long)paddr);
+}
+
+/*
+ * Take down a mapping set up by map_physmem().
+ */
+static inline void unmap_physmem(void *vaddr, unsigned long flags)
+{
+
+}
+
 static inline void sync(void)
 {
 	/* Not yet implemented */
 }
 
-/*
- * We must use 'volatile' in C-version read/write IO accessors implementation
- * to avoid merging several reads (writes) into one read (write), or optimizing
- * them out by compiler.
- * We must use compiler barriers before and after operation (read or write) so
- * it won't be reordered by compiler.
- */
-#define __arch_getb(a)		({ u8  __v; __comp_b(); __v = *(volatile u8  *)(a); __comp_b(); __v; })
-#define __arch_getw(a)		({ u16 __v; __comp_b(); __v = *(volatile u16 *)(a); __comp_b(); __v; })
-#define __arch_getl(a)		({ u32 __v; __comp_b(); __v = *(volatile u32 *)(a); __comp_b(); __v; })
-#define __arch_getq(a)		({ u64 __v; __comp_b(); __v = *(volatile u64 *)(a); __comp_b(); __v; })
-
-#define __arch_putb(v, a)	({ __comp_b(); *(volatile u8  *)(a) = (v); __comp_b(); })
-#define __arch_putw(v, a)	({ __comp_b(); *(volatile u16 *)(a) = (v); __comp_b(); })
-#define __arch_putl(v, a)	({ __comp_b(); *(volatile u32 *)(a) = (v); __comp_b(); })
-#define __arch_putq(v, a)	({ __comp_b(); *(volatile u64 *)(a) = (v); __comp_b(); })
-
-/*
- * We add memory barriers for __raw_readX / __raw_writeX accessors same way as
- * it is done for readX and writeX accessors as lots of U-Boot driver uses
- * __raw_readX / __raw_writeX instead of proper accessor with barrier.
- */
-#define __raw_writeb(v, c)	({ __iowmb(); __arch_putb(v, c); })
-#define __raw_writew(v, c)	({ __iowmb(); __arch_putw(v, c); })
-#define __raw_writel(v, c)	({ __iowmb(); __arch_putl(v, c); })
-#define __raw_writeq(v, c)	({ __iowmb(); __arch_putq(v, c); })
-
-#define __raw_readb(c)		({ u8  __v = __arch_getb(c); __iormb(); __v; })
-#define __raw_readw(c)		({ u16 __v = __arch_getw(c); __iormb(); __v; })
-#define __raw_readl(c)		({ u32 __v = __arch_getl(c); __iormb(); __v; })
-#define __raw_readq(c)		({ u64 __v = __arch_getq(c); __iormb(); __v; })
-
-static inline void __raw_writesb(unsigned long addr, const void *data,
-				 int bytelen)
+static inline u8 __raw_readb(const volatile void __iomem *addr)
 {
-	u8 *buf = (uint8_t *)data;
+	u8 b;
 
-	__iowmb();
-
-	while (bytelen--)
-		__arch_putb(*buf++, addr);
+	__asm__ __volatile__("ldb%U1	%0, %1\n"
+			     : "=r" (b)
+			     : "m" (*(volatile u8 __force *)addr)
+			     : "memory");
+	return b;
 }
 
-static inline void __raw_writesw(unsigned long addr, const void *data,
-				 int wordlen)
+static inline u16 __raw_readw(const volatile void __iomem *addr)
 {
-	u16 *buf = (uint16_t *)data;
+	u16 s;
 
-	__iowmb();
-
-	while (wordlen--)
-		__arch_putw(*buf++, addr);
+	__asm__ __volatile__("ldw%U1	%0, %1\n"
+			     : "=r" (s)
+			     : "m" (*(volatile u16 __force *)addr)
+			     : "memory");
+	return s;
 }
 
-static inline void __raw_writesl(unsigned long addr, const void *data,
-				 int longlen)
+static inline u32 __raw_readl(const volatile void __iomem *addr)
 {
-	u32 *buf = (uint32_t *)data;
+	u32 w;
 
-	__iowmb();
-
-	while (longlen--)
-		__arch_putl(*buf++, addr);
+	__asm__ __volatile__("ld%U1	%0, %1\n"
+			     : "=r" (w)
+			     : "m" (*(volatile u32 __force *)addr)
+			     : "memory");
+	return w;
 }
 
-static inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
+static inline void __raw_writeb(u8 b, volatile void __iomem *addr)
 {
-	u8 *buf = (uint8_t *)data;
-
-	while (bytelen--)
-		*buf++ = __arch_getb(addr);
-
-	__iormb();
+	__asm__ __volatile__("stb%U1	%0, %1\n"
+			     :
+			     : "r" (b), "m" (*(volatile u8 __force *)addr)
+			     : "memory");
 }
 
-static inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
+static inline void __raw_writew(u16 s, volatile void __iomem *addr)
 {
-	u16 *buf = (uint16_t *)data;
-
-	while (wordlen--)
-		*buf++ = __arch_getw(addr);
-
-	__iormb();
+	__asm__ __volatile__("stw%U1	%0, %1\n"
+			     :
+			     : "r" (s), "m" (*(volatile u16 __force *)addr)
+			     : "memory");
 }
 
-static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
+static inline void __raw_writel(u32 w, volatile void __iomem *addr)
 {
-	u32 *buf = (uint32_t *)data;
-
-	while (longlen--)
-		*buf++ = __arch_getl(addr);
-
-	__iormb();
+	__asm__ __volatile__("st%U1	%0, %1\n"
+			     :
+			     : "r" (w), "m" (*(volatile u32 __force *)addr)
+			     : "memory");
 }
 
-/*
- * Relaxed I/O memory access primitives. These follow the Device memory
- * ordering rules but do not guarantee any ordering relative to Normal memory
- * accesses.
- */
-#define readb_relaxed(c)	({ u8  __r = __arch_getb(c); __r; })
-#define readw_relaxed(c)	({ u16 __r = le16_to_cpu((__force __le16)__arch_getw(c)); __r; })
-#define readl_relaxed(c)	({ u32 __r = le32_to_cpu((__force __le32)__arch_getl(c)); __r; })
-#define readq_relaxed(c)	({ u64 __r = le64_to_cpu((__force __le64)__arch_getq(c)); __r; })
+static inline int __raw_readsb(unsigned int addr, void *data, int bytelen)
+{
+	__asm__ __volatile__ ("1:ld.di	r8, [r0]\n"
+			      "sub.f	r2, r2, 1\n"
+			      "bnz.d	1b\n"
+			      "stb.ab	r8, [r1, 1]\n"
+			      :
+			      : "r" (addr), "r" (data), "r" (bytelen)
+			      : "r8");
+	return bytelen;
+}
 
-#define writeb_relaxed(v, c)	((void)__arch_putb((v), (c)))
-#define writew_relaxed(v, c)	((void)__arch_putw((__force u16)cpu_to_le16(v), (c)))
-#define writel_relaxed(v, c)	((void)__arch_putl((__force u32)cpu_to_le32(v), (c)))
-#define writeq_relaxed(v, c)	((void)__arch_putq((__force u64)cpu_to_le64(v), (c)))
+static inline int __raw_readsw(unsigned int addr, void *data, int wordlen)
+{
+	__asm__ __volatile__ ("1:ld.di	r8, [r0]\n"
+			      "sub.f	r2, r2, 1\n"
+			      "bnz.d	1b\n"
+			      "stw.ab	r8, [r1, 2]\n"
+			      :
+			      : "r" (addr), "r" (data), "r" (wordlen)
+			      : "r8");
+	return wordlen;
+}
+
+static inline int __raw_readsl(unsigned int addr, void *data, int longlen)
+{
+	__asm__ __volatile__ ("1:ld.di	r8, [r0]\n"
+			      "sub.f	r2, r2, 1\n"
+			      "bnz.d	1b\n"
+			      "st.ab	r8, [r1, 4]\n"
+			      :
+			      : "r" (addr), "r" (data), "r" (longlen)
+			      : "r8");
+	return longlen;
+}
+
+static inline int __raw_writesb(unsigned int addr, void *data, int bytelen)
+{
+	__asm__ __volatile__ ("1:ldb.ab	r8, [r1, 1]\n"
+			      "sub.f	r2, r2, 1\n"
+			      "bnz.d	1b\n"
+			      "st.di	r8, [r0, 0]\n"
+			      :
+			      : "r" (addr), "r" (data), "r" (bytelen)
+			      : "r8");
+	return bytelen;
+}
+
+static inline int __raw_writesw(unsigned int addr, void *data, int wordlen)
+{
+	__asm__ __volatile__ ("1:ldw.ab	r8, [r1, 2]\n"
+			      "sub.f	r2, r2, 1\n"
+			      "bnz.d	1b\n"
+			      "st.ab.di	r8, [r0, 0]\n"
+			      :
+			      : "r" (addr), "r" (data), "r" (wordlen)
+			      : "r8");
+	return wordlen;
+}
+
+static inline int __raw_writesl(unsigned int addr, void *data, int longlen)
+{
+	__asm__ __volatile__ ("1:ld.ab	r8, [r1, 4]\n"
+			      "sub.f	r2, r2, 1\n"
+			      "bnz.d	1b\n"
+			      "st.ab.di	r8, [r0, 0]\n"
+			      :
+			      : "r" (addr), "r" (data), "r" (longlen)
+			      : "r8");
+	return longlen;
+}
 
 /*
  * MMIO can also get buffered/optimized in micro-arch, so barriers needed
@@ -182,15 +220,32 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
  *
  * http://lkml.kernel.org/r/20150622133656.GG1583@arm.com
  */
-#define readb(c)	({ u8  __v = readb_relaxed(c); __iormb(); __v; })
-#define readw(c)	({ u16 __v = readw_relaxed(c); __iormb(); __v; })
-#define readl(c)	({ u32 __v = readl_relaxed(c); __iormb(); __v; })
-#define readq(c)	({ u64 __v = readq_relaxed(c); __iormb(); __v; })
+#define readb(c)		({ u8  __v = readb_relaxed(c); __iormb(); __v; })
+#define readw(c)		({ u16 __v = readw_relaxed(c); __iormb(); __v; })
+#define readl(c)		({ u32 __v = readl_relaxed(c); __iormb(); __v; })
 
-#define writeb(v, c)	({ __iowmb(); writeb_relaxed(v, c); })
-#define writew(v, c)	({ __iowmb(); writew_relaxed(v, c); })
-#define writel(v, c)	({ __iowmb(); writel_relaxed(v, c); })
-#define writeq(v, c)	({ __iowmb(); writeq_relaxed(v, c); })
+#define writeb(v,c)		({ __iowmb(); writeb_relaxed(v,c); })
+#define writew(v,c)		({ __iowmb(); writew_relaxed(v,c); })
+#define writel(v,c)		({ __iowmb(); writel_relaxed(v,c); })
+
+/*
+ * Relaxed API for drivers which can handle barrier ordering themselves
+ *
+ * Also these are defined to perform little endian accesses.
+ * To provide the typical device register semantics of fixed endian,
+ * swap the byte order for Big Endian
+ *
+ * http://lkml.kernel.org/r/201603100845.30602.arnd@arndb.de
+ */
+#define readb_relaxed(c)	__raw_readb(c)
+#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16) \
+					__raw_readw(c)); __r; })
+#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \
+					__raw_readl(c)); __r; })
+
+#define writeb_relaxed(v,c)	__raw_writeb(v,c)
+#define writew_relaxed(v,c)	__raw_writew((__force u16) cpu_to_le16(v),c)
+#define writel_relaxed(v,c)	__raw_writel((__force u32) cpu_to_le32(v),c)
 
 #define out_arch(type, endian, a, v)	__raw_write##type(cpu_to_##endian(v), a)
 #define in_arch(type, endian, a)	endian##_to_cpu(__raw_read##type(a))
@@ -247,6 +302,9 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
 #define setbits_8(addr, set) setbits(8, addr, set)
 #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
 
-#include <asm-generic/io.h>
+static inline phys_addr_t virt_to_phys(void *vaddr)
+{
+	return (phys_addr_t)((unsigned long)vaddr);
+}
 
 #endif	/* __ASM_ARC_IO_H */

arch/arc/include/asm/linkage.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_LINKAGE_H

arch/arc/include/asm/posix_types.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_POSIX_TYPES_H

arch/arc/include/asm/processor.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _ASM_ARC_PROCESSOR_H

arch/arc/include/asm/ptrace.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_PTRACE_H

arch/arc/include/asm/relocate.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _ASM_ARC_RELOCATE_H
+#define _ASM_ARC_RELOCATE_H
+
+#include <common.h>
+
+int copy_uboot_to_ram(void);
+int clear_bss(void);
+int do_elf_reloc_fixups(void);
+
+#endif	/* _ASM_ARC_RELOCATE_H */

arch/arc/include/asm/sections.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_SECTIONS_H
@@ -8,8 +9,7 @@
 
 #include <asm-generic/sections.h>
 
-extern char __ivt_start[];
-extern char __ivt_end[];
-extern char __text_end[];
+extern ulong __ivt_start;
+extern ulong __ivt_end;
 
 #endif /* __ASM_ARC_SECTIONS_H */

arch/arc/include/asm/string.h

@@ -1 +1,27 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
 
+#ifndef __ASM_ARC_STRING_H
+#define __ASM_ARC_STRING_H
+
+#define __HAVE_ARCH_MEMSET
+#define __HAVE_ARCH_MEMCPY
+#define __HAVE_ARCH_MEMCMP
+#define __HAVE_ARCH_STRCHR
+#define __HAVE_ARCH_STRCPY
+#define __HAVE_ARCH_STRCMP
+#define __HAVE_ARCH_STRLEN
+
+extern void *memset(void *ptr, int, __kernel_size_t);
+extern void *memcpy(void *, const void *, __kernel_size_t);
+extern void memzero(void *ptr, __kernel_size_t n);
+extern int memcmp(const void *, const void *, __kernel_size_t);
+extern char *strchr(const char *s, int c);
+extern char *strcpy(char *dest, const char *src);
+extern int strcmp(const char *cs, const char *ct);
+extern __kernel_size_t strlen(const char *);
+
+#endif /* __ASM_ARC_STRING_H */

arch/arc/include/asm/types.h

@@ -1,15 +1,48 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_TYPES_H
 #define __ASM_ARC_TYPES_H
 
-#include <asm-generic/int-ll64.h>
-
 typedef unsigned short umode_t;
 
+/*
+ * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
+ * header files exported to user space
+ */
+
+typedef __signed__ char __s8;
+typedef unsigned char __u8;
+
+typedef __signed__ short __s16;
+typedef unsigned short __u16;
+
+typedef __signed__ int __s32;
+typedef unsigned int __u32;
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
+#endif
+
+/*
+ * These aren't exported outside the kernel to avoid name space clashes
+ */
+typedef signed char s8;
+typedef unsigned char u8;
+
+typedef signed short s16;
+typedef unsigned short u16;
+
+typedef signed int s32;
+typedef unsigned int u32;
+
+typedef signed long long s64;
+typedef unsigned long long u64;
+
 #define BITS_PER_LONG 32
 
 /* Dma addresses are 32-bits wide. */

arch/arc/include/asm/u-boot-arc.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_U_BOOT_ARC_H__

arch/arc/include/asm/u-boot.h

@@ -1,13 +1,13 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_ARC_U_BOOT_H__
 #define __ASM_ARC_U_BOOT_H__
 
 #include <asm-generic/u-boot.h>
-#include <asm/u-boot-arc.h>
 
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_ARC

arch/arc/lib/Makefile

@@ -1,6 +1,8 @@
-# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
 extra-y	= start.o
 head-y := start.o
@@ -8,7 +10,15 @@ obj-y += cache.o
 obj-y += cpu.o
 obj-y += interrupts.o
 obj-y += relocate.o
+obj-y += strchr-700.o
+obj-y += strcmp.o
+obj-y += strcpy-700.o
+obj-y += strlen.o
+obj-y += memcmp.o
+obj-y += memcpy-700.o
+obj-y += memset.o
 obj-y += reset.o
+obj-y += timer.o
 obj-y += ints_low.o
 obj-y += init_helpers.o
 

arch/arc/lib/_millicodethunk.S

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 1995, 1997, 2007-2013 Free Software Foundation, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
  /* ANSI concatenation macros.  */

arch/arc/lib/bootm.c

@@ -1,92 +1,112 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <bootm.h>
-#include <bootstage.h>
-#include <env.h>
-#include <image.h>
-#include <irq_func.h>
-#include <log.h>
-#include <asm/cache.h>
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static ulong get_sp(void)
+{
+	ulong ret;
+
+	asm("mov %0, sp" : "=r"(ret) : );
+	return ret;
+}
+
+void arch_lmb_reserve(struct lmb *lmb)
+{
+	ulong sp;
+
+	/*
+	 * Booting a (Linux) kernel image
+	 *
+	 * Allocate space for command line and board info - the
+	 * address should be as high as possible within the reach of
+	 * the kernel (see CONFIG_SYS_BOOTMAPSZ settings), but in unused
+	 * memory, which means far enough below the current stack
+	 * pointer.
+	 */
+	sp = get_sp();
+	debug("## Current stack ends at 0x%08lx ", sp);
+
+	/* adjust sp by 4K to be safe */
+	sp -= 4096;
+	lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
+}
 
 static int cleanup_before_linux(void)
 {
 	disable_interrupts();
-	sync_n_cleanup_cache_all();
+	flush_dcache_all();
+	invalidate_icache_all();
 
 	return 0;
 }
 
-__weak int board_prep_linux(struct bootm_headers *images) { return 0; }
-
 /* Subcommand: PREP */
-static int boot_prep_linux(struct bootm_headers *images)
+static void boot_prep_linux(bootm_headers_t *images)
 {
-	int ret;
-
-	if (IS_ENABLED(CONFIG_LMB)) {
-		ret = image_setup_linux(images);
-		if (ret)
-			return ret;
-	}
-
-	return board_prep_linux(images);
+	if (image_setup_linux(images))
+		hang();
 }
 
-/* Generic implementation for single core CPU */
-__weak void board_jump_and_run(ulong entry, int zero, int arch, uint params)
-{
-	void (*kernel_entry)(int zero, int arch, uint params);
-
-	kernel_entry = (void (*)(int, int, uint))entry;
-
-	kernel_entry(zero, arch, params);
-}
+__weak void smp_set_core_boot_addr(unsigned long addr, int corenr) {}
+__weak void smp_kick_all_cpus(void) {}
 
 /* Subcommand: GO */
-static void boot_jump_linux(struct bootm_headers *images, int flag)
+static void boot_jump_linux(bootm_headers_t *images, int flag)
 {
-	ulong kernel_entry;
+	void (*kernel_entry)(int zero, int arch, uint params);
 	unsigned int r0, r2;
-	kernel_entry = images->ep;
+	int fake = (flag & BOOTM_STATE_OS_FAKE_GO);
+
+	kernel_entry = (void (*)(int, int, uint))images->ep;
 
 	debug("## Transferring control to Linux (at address %08lx)...\n",
-	      kernel_entry);
+	      (ulong) kernel_entry);
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-	bootm_final(flag);
+	printf("\nStarting kernel ...%s\n\n", fake ?
+	       "(fake run for tracing)" : "");
+	bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
 
-	if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) {
+	cleanup_before_linux();
+
+	if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {
 		r0 = 2;
 		r2 = (unsigned int)images->ft_addr;
 	} else {
 		r0 = 1;
-		r2 = (unsigned int)env_get("bootargs");
+		r2 = (unsigned int)getenv("bootargs");
 	}
 
-	cleanup_before_linux();
+	smp_set_core_boot_addr((unsigned long)kernel_entry, -1);
+	smp_kick_all_cpus();
 
-	if (!(flag & BOOTM_STATE_OS_FAKE_GO))
-		board_jump_and_run(kernel_entry, r0, 0, r2);
+	if (!fake)
+		kernel_entry(r0, 0, r2);
 }
 
-int do_bootm_linux(int flag, struct bootm_info *bmi)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-	struct bootm_headers *images = bmi->images;
-
 	/* No need for those on ARC */
 	if ((flag & BOOTM_STATE_OS_BD_T) || (flag & BOOTM_STATE_OS_CMDLINE))
 		return -1;
 
-	if (flag & BOOTM_STATE_OS_PREP)
-		return boot_prep_linux(images);
+	if (flag & BOOTM_STATE_OS_PREP) {
+		boot_prep_linux(images);
+		return 0;
+	}
 
 	if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
 		boot_jump_linux(images, flag);
 		return 0;
 	}
 
-	return -1;
+	boot_prep_linux(images);
+	boot_jump_linux(images, flag);
+	return 0;
 }

arch/arc/lib/cpu.c

@@ -1,17 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2013-2014, 2018 Synopsys, Inc. All rights reserved.
+ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <config.h>
-#include <clock_legacy.h>
-#include <init.h>
-#include <malloc.h>
-#include <stdio.h>
+#include <common.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
-#include <asm/global_data.h>
-#include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -19,208 +14,17 @@ int arch_cpu_init(void)
 {
 	timer_init();
 
-	gd->cpu_clk = get_board_sys_clk();
-	gd->ram_size = CFG_SYS_SDRAM_SIZE;
+	gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
+	gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
 
 	cache_init();
 
 	return 0;
 }
 
-/* This is a dummy function on arc */
-int dram_init(void)
+int arch_early_init_r(void)
 {
+	gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
 	return 0;
 }
-
-#ifdef CONFIG_DISPLAY_CPUINFO
-const char *arc_700_version(int arcver, char *name, int name_len)
-{
-	const char *arc_ver;
-
-	switch (arcver) {
-	case 0x32:
-		arc_ver = "v4.4-4.5";
-		break;
-	case 0x33:
-		arc_ver = "v4.6-v4.9";
-		break;
-	case 0x34:
-		arc_ver = "v4.10";
-		break;
-	case 0x35:
-		arc_ver = "v4.11";
-		break;
-	default:
-		arc_ver = "unknown version";
-	}
-
-	snprintf(name, name_len, "ARC 700 %s", arc_ver);
-
-	return name;
-}
-
-struct em_template_t {
-	const bool cache;
-	const bool dsp;
-	const bool xymem;
-	const char name[8];
-};
-
-static const struct em_template_t em_versions[] = {
-	{false,	false,	false,	"EM4"},
-	{true,	false,	false,	"EM6"},
-	{false,	true,	false,	"EM5D"},
-	{true,	true,	false,	"EM7D"},
-	{false,	true,	true,	"EM9D"},
-	{true,	true,	true,	"EM11D"},
-};
-
-const char *arc_em_version(int arcver, char *name, int name_len)
-{
-	const char *arc_name = "EM";
-	const char *arc_ver;
-	bool cache = ARC_FEATURE_EXISTS(ARC_BCR_IC_BUILD);
-	bool dsp = ARC_FEATURE_EXISTS(ARC_AUX_DSP_BUILD);
-	bool xymem = ARC_FEATURE_EXISTS(ARC_AUX_XY_BUILD);
-	int i;
-
-	for (i = 0; i < sizeof(em_versions) / sizeof(struct em_template_t); i++) {
-		if (em_versions[i].cache == cache &&
-		    em_versions[i].dsp == dsp &&
-		    em_versions[i].xymem == xymem) {
-			arc_name = em_versions[i].name;
-			break;
-		}
-	}
-
-	switch (arcver) {
-	case 0x41:
-		arc_ver = "v1.1a";
-		break;
-	case 0x42:
-		arc_ver = "v3.0";
-		break;
-	case 0x43:
-		arc_ver = "v4.0";
-		break;
-	case 0x44:
-		arc_ver = "v5.0";
-		break;
-	default:
-		arc_ver = "unknown version";
-	}
-
-	snprintf(name, name_len, "ARC %s %s", arc_name, arc_ver);
-
-	return name;
-}
-
-struct hs_template_t {
-	const bool cache;
-	const bool mmu;
-	const bool dual_issue;
-	const bool dsp;
-	const char name[8];
-};
-
-static const struct hs_template_t hs_versions[] = {
-	{false,	false,	false,	false,	"HS34"},
-	{true,	false,	false,	false,	"HS36"},
-	{true,	true,	false,	false,	"HS38"},
-	{false,	false,	true,	false,	"HS44"},
-	{true,	false,	true,	false,	"HS46"},
-	{true,	true,	true,	false,	"HS48"},
-	{false,	false,	true,	true,	"HS45D"},
-	{true,	false,	true,	true,	"HS47D"},
-};
-
-const char *arc_hs_version(int arcver, char *name, int name_len)
-{
-	const char *arc_name = "HS";
-	const char *arc_ver;
-	bool cache = ARC_FEATURE_EXISTS(ARC_BCR_IC_BUILD);
-	bool dsp = ARC_FEATURE_EXISTS(ARC_AUX_DSP_BUILD);
-	bool mmu = !!read_aux_reg(ARC_AUX_MMU_BCR);
-	bool dual_issue = arcver == 0x54 ? true : false;
-	int i;
-
-	for (i = 0; i < sizeof(hs_versions) / sizeof(struct hs_template_t); i++) {
-		if (hs_versions[i].cache == cache &&
-		    hs_versions[i].mmu == mmu &&
-		    hs_versions[i].dual_issue == dual_issue &&
-		    hs_versions[i].dsp == dsp) {
-			arc_name = hs_versions[i].name;
-			break;
-		}
-	}
-
-	switch (arcver) {
-	case 0x50:
-		arc_ver = "v1.0";
-		break;
-	case 0x51:
-		arc_ver = "v2.0";
-		break;
-	case 0x52:
-		arc_ver = "v2.1c";
-		break;
-	case 0x53:
-		arc_ver = "v3.0";
-		break;
-	case 0x54:
-		arc_ver = "v4.0";
-		break;
-	default:
-		arc_ver = "unknown version";
-	}
-
-	snprintf(name, name_len, "ARC %s %s", arc_name, arc_ver);
-
-	return name;
-}
-
-const char *decode_identity(void)
-{
-#define MAX_CPU_NAME_LEN	64
-
-	int arcver = read_aux_reg(ARC_AUX_IDENTITY) & 0xff;
-	char *name = malloc(MAX_CPU_NAME_LEN);
-
-	if (arcver >= 0x50)
-		return arc_hs_version(arcver, name, MAX_CPU_NAME_LEN);
-	else if (arcver >= 0x40)
-		return arc_em_version(arcver, name, MAX_CPU_NAME_LEN);
-	else if (arcver >= 0x30)
-		return arc_700_version(arcver, name, MAX_CPU_NAME_LEN);
-	else
-		return "Unknown ARC core";
-}
-
-const char *decode_subsystem(void)
-{
-	int subsys_type = read_aux_reg(ARC_AUX_SUBSYS_BUILD) & GENMASK(3, 0);
-
-	switch (subsys_type) {
-	case 0: return NULL;
-	case 2: return "ARC Sensor & Control IP Subsystem";
-	case 3: return "ARC Data Fusion IP Subsystem";
-	case 4: return "ARC Secure Subsystem";
-	default: return "Unknown subsystem";
-	};
-}
-
-__weak int print_cpuinfo(void)
-{
-	const char *subsys_name = decode_subsystem();
-	char mhz[8];
-
-	printf("CPU:   %s at %s MHz\n", decode_identity(),
-	       strmhz(mhz, gd->cpu_clk));
-
-	if (subsys_name)
-		printf("Subsys:%s\n", subsys_name);
-
-	return 0;
-}
-#endif /* CONFIG_DISPLAY_CPUINFO */

arch/arc/lib/init_helpers.c

@@ -1,14 +1,17 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <init.h>
-#include <asm/cache.h>
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 int init_cache_f_r(void)
 {
-	sync_n_cleanup_cache_all();
-
+#ifndef CONFIG_SYS_DCACHE_OFF
+	flush_dcache_all();
+#endif
 	return 0;
 }

arch/arc/lib/interrupts.c

@@ -1,10 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <irq_func.h>
-#include <vsprintf.h>
+#include <common.h>
 #include <asm/arcregs.h>
 #include <asm/ptrace.h>
 

arch/arc/lib/ints_low.S

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <linux/linkage.h>
@@ -76,8 +77,13 @@
 .endm
 
 .macro SAVE_EXCEPTION_SOURCE
+#ifdef CONFIG_MMU
+	/* If MMU exists exception faulting address is loaded in EFA reg */
+	lr	%r0, [%efa]
+#else
 	/* Otherwise in ERET (exception return) reg */
 	lr	%r0, [%eret]
+#endif
 .endm
 
 ENTRY(memory_error)

arch/arc/lib/libgcc2.c

@@ -1,6 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 1989-2013 Free Software Foundation, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "libgcc2.h"
@@ -158,78 +159,3 @@ __umodsi3(long a, long b)
 {
 	return udivmodsi4(a, b, 1);
 }
-
-UDWtype
-__udivmoddi4(UDWtype n, UDWtype d, UDWtype *rp)
-{
-	UDWtype q = 0, r = n, y = d;
-	UWtype lz1, lz2, i, k;
-
-	/*
-	 * Implements align divisor shift dividend method. This algorithm
-	 * aligns the divisor under the dividend and then perform number of
-	 * test-subtract iterations which shift the dividend left. Number of
-	 * iterations is k + 1 where k is the number of bit positions the
-	 * divisor must be shifted left  to align it under the dividend.
-	 * quotient bits can be saved in the rightmost positions of the
-	 * dividend as it shifts left on each test-subtract iteration.
-	 */
-
-	if (y <= r) {
-		lz1 = __builtin_clzll(d);
-		lz2 = __builtin_clzll(n);
-
-		k = lz1 - lz2;
-		y = (y << k);
-
-		/*
-		 * Dividend can exceed 2 ^ (width - 1) - 1 but still be less
-		 * than the aligned divisor. Normal iteration can drops the
-		 * high order bit of the dividend. Therefore, first
-		 * test-subtract iteration is a special case, saving its
-		 * quotient bit in a separate location and not shifting
-		 * the dividend.
-		 */
-
-		if (r >= y) {
-			r = r - y;
-			q = (1ULL << k);
-		}
-
-		if (k > 0) {
-			y = y >> 1;
-
-			/*
-			 * k additional iterations where k regular test
-			 * subtract shift dividend iterations are done.
-			 */
-			i = k;
-			do {
-				if (r >= y)
-					r = ((r - y) << 1) + 1;
-				else
-					r = (r << 1);
-				i = i - 1;
-			} while (i != 0);
-
-			/*
-			 * First quotient bit is combined with the quotient
-			 * bits resulting from the k regular iterations.
-			 */
-			q = q + r;
-			r = r >> k;
-			q = q - (r << k);
-		}
-	}
-
-	if (rp)
-		*rp = r;
-
-	return q;
-}
-
-UDWtype
-__udivdi3(UDWtype n, UDWtype d)
-{
-	return __udivmoddi4(n, d, (UDWtype *)0);
-}

arch/arc/lib/libgcc2.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 1989-2013 Free Software Foundation, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __ASM_LIBGCC_H
@@ -35,7 +36,7 @@ typedef		 int HItype	__attribute__ ((mode (HI)));
 typedef unsigned int UHItype	__attribute__ ((mode (HI)));
 #if MIN_UNITS_PER_WORD > 1
 /* These typedefs are usually forbidden on dsp's with UNITS_PER_WORD 1.  */
-typedef		 int SItype	__attribute__ ((mode (SI)));
+typedef 	 int SItype	__attribute__ ((mode (SI)));
 typedef unsigned int USItype	__attribute__ ((mode (SI)));
 #if __SIZEOF_LONG_LONG__ > 4
 /* These typedefs are usually forbidden on archs with UNITS_PER_WORD 2.  */

arch/arc/lib/memcmp.S

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifdef __LITTLE_ENDIAN__
+#define WORD2 r2
+#define SHIFT r3
+#else /* __BIG_ENDIAN__ */
+#define WORD2 r3
+#define SHIFT r2
+#endif /* _ENDIAN__ */
+
+.global memcmp
+.align 4
+memcmp:
+	or	%r12, %r0, %r1
+	asl_s	%r12, %r12, 30
+	sub	%r3, %r2, 1
+	brls	%r2, %r12, .Lbytewise
+	ld	%r4, [%r0, 0]
+	ld	%r5, [%r1, 0]
+	lsr.f	%lp_count, %r3, 3
+	lpne	.Loop_end
+	ld_s	WORD2, [%r0, 4]
+	ld_s	%r12, [%r1, 4]
+	brne	%r4, %r5, .Leven
+	ld.a	%r4, [%r0, 8]
+	ld.a	%r5, [%r1, 8]
+	brne	WORD2, %r12, .Lodd
+	nop
+.Loop_end:
+	asl_s	SHIFT, SHIFT, 3
+	bhs_s	.Last_cmp
+	brne	%r4, %r5, .Leven
+	ld	%r4, [%r0, 4]
+	ld	%r5, [%r1, 4]
+#ifdef __LITTLE_ENDIAN__
+	nop_s
+	/* one more load latency cycle */
+.Last_cmp:
+	xor	%r0, %r4, %r5
+	bset	%r0, %r0, SHIFT
+	sub_s	%r1, %r0, 1
+	bic_s	%r1, %r1, %r0
+	norm	%r1, %r1
+	b.d	.Leven_cmp
+	and	%r1, %r1, 24
+.Leven:
+	xor	%r0, %r4, %r5
+	sub_s	%r1, %r0, 1
+	bic_s	%r1, %r1, %r0
+	norm	%r1, %r1
+	/* slow track insn */
+	and	%r1, %r1, 24
+.Leven_cmp:
+	asl	%r2, %r4, %r1
+	asl	%r12, %r5, %r1
+	lsr_s	%r2, %r2, 1
+	lsr_s	%r12, %r12, 1
+	j_s.d	[%blink]
+	sub	%r0, %r2, %r12
+	.balign	4
+.Lodd:
+	xor	%r0, WORD2, %r12
+	sub_s	%r1, %r0, 1
+	bic_s	%r1, %r1, %r0
+	norm	%r1, %r1
+	/* slow track insn */
+	and	%r1, %r1, 24
+	asl_s	%r2, %r2, %r1
+	asl_s	%r12, %r12, %r1
+	lsr_s	%r2, %r2, 1
+	lsr_s	%r12, %r12, 1
+	j_s.d	[%blink]
+	sub	%r0, %r2, %r12
+#else /* __BIG_ENDIAN__ */
+.Last_cmp:
+	neg_s	SHIFT, SHIFT
+	lsr	%r4, %r4, SHIFT
+	lsr	%r5, %r5, SHIFT
+	/* slow track insn */
+.Leven:
+	sub.f	%r0, %r4, %r5
+	mov.ne	%r0, 1
+	j_s.d	[%blink]
+	bset.cs	%r0, %r0, 31
+.Lodd:
+	cmp_s	WORD2, %r12
+
+	mov_s	%r0, 1
+	j_s.d	[%blink]
+	bset.cs	%r0, %r0, 31
+#endif /* _ENDIAN__ */
+	.balign	4
+.Lbytewise:
+	breq	%r2, 0, .Lnil
+	ldb	%r4, [%r0, 0]
+	ldb	%r5, [%r1, 0]
+	lsr.f	%lp_count, %r3
+	lpne	.Lbyte_end
+	ldb_s	%r3, [%r0, 1]
+	ldb	%r12, [%r1, 1]
+	brne	%r4, %r5, .Lbyte_even
+	ldb.a	%r4, [%r0, 2]
+	ldb.a	%r5, [%r1, 2]
+	brne	%r3, %r12, .Lbyte_odd
+	nop
+.Lbyte_end:
+	bcc	.Lbyte_even
+	brne	%r4, %r5, .Lbyte_even
+	ldb_s	%r3, [%r0, 1]
+	ldb_s	%r12, [%r1, 1]
+.Lbyte_odd:
+	j_s.d	[%blink]
+	sub	%r0, %r3, %r12
+.Lbyte_even:
+	j_s.d	[%blink]
+	sub	%r0, %r4, %r5
+.Lnil:
+	j_s.d	[%blink]
+	mov	%r0, 0

arch/arc/lib/memcpy-700.S

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+.global memcpy
+.align 4
+memcpy:
+	or	%r3, %r0, %r1
+	asl_s	%r3, %r3, 30
+	mov_s	%r5, %r0
+	brls.d	%r2, %r3, .Lcopy_bytewise
+	sub.f	%r3, %r2, 1
+	ld_s	%r12, [%r1, 0]
+	asr.f	%lp_count, %r3, 3
+	bbit0.d	%r3, 2, .Lnox4
+	bmsk_s	%r2, %r2, 1
+	st.ab	%r12, [%r5, 4]
+	ld.a	%r12, [%r1, 4]
+.Lnox4:
+	lppnz	.Lendloop
+	ld_s	%r3, [%r1, 4]
+	st.ab	%r12, [%r5, 4]
+	ld.a	%r12, [%r1, 8]
+	st.ab	%r3, [%r5, 4]
+.Lendloop:
+	breq	%r2, 0, .Last_store
+	ld	%r3, [%r5, 0]
+#ifdef __LITTLE_ENDIAN__
+	add3	%r2, -1, %r2
+	/* uses long immediate */
+	xor_s	%r12, %r12, %r3
+	bmsk	%r12, %r12, %r2
+	xor_s	%r12, %r12, %r3
+#else /* __BIG_ENDIAN__ */
+	sub3	%r2, 31, %r2
+	/* uses long immediate */
+	xor_s	%r3, %r3, %r12
+	bmsk	%r3, %r3, %r2
+	xor_s	%r12, %r12, %r3
+#endif /* _ENDIAN__ */
+.Last_store:
+	j_s.d	[%blink]
+	st	%r12, [%r5, 0]
+
+	.balign	4
+.Lcopy_bytewise:
+	jcs	[%blink]
+	ldb_s	%r12, [%r1, 0]
+	lsr.f	%lp_count, %r3
+	bhs_s	.Lnox1
+	stb.ab	%r12, [%r5, 1]
+	ldb.a	%r12, [%r1, 1]
+.Lnox1:
+	lppnz	.Lendbloop
+	ldb_s	%r3, [%r1, 1]
+	stb.ab	%r12, [%r5, 1]
+	ldb.a	%r12, [%r1, 2]
+	stb.ab	%r3, [%r5, 1]
+.Lendbloop:
+	j_s.d	[%blink]
+	stb	%r12, [%r5, 0]

arch/arc/lib/memset.S

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#define SMALL	7 /* Must be at least 6 to deal with alignment/loop issues.  */
+
+.global memset
+.align 4
+memset:
+	mov_s	%r4, %r0
+	or	%r12, %r0, %r2
+	bmsk.f	%r12, %r12, 1
+	extb_s	%r1, %r1
+	asl	%r3, %r1, 8
+	beq.d	.Laligned
+	or_s	%r1, %r1, %r3
+	brls	%r2, SMALL, .Ltiny
+	add	%r3, %r2, %r0
+	stb	%r1, [%r3, -1]
+	bclr_s	%r3, %r3, 0
+	stw	%r1, [%r3, -2]
+	bmsk.f	%r12, %r0, 1
+	add_s	%r2, %r2, %r12
+	sub.ne	%r2, %r2, 4
+	stb.ab	%r1, [%r4, 1]
+	and	%r4, %r4, -2
+	stw.ab	%r1, [%r4, 2]
+	and	%r4, %r4, -4
+
+	.balign	4
+.Laligned:
+	asl	%r3, %r1, 16
+	lsr.f	%lp_count, %r2, 2
+	or_s	%r1, %r1, %r3
+	lpne	.Loop_end
+	st.ab	%r1, [%r4, 4]
+.Loop_end:
+	j_s	[%blink]
+
+	.balign	4
+.Ltiny:
+	mov.f	%lp_count, %r2
+	lpne	.Ltiny_end
+	stb.ab	%r1, [%r4, 1]
+.Ltiny_end:
+	j_s	[%blink]
+
+/*
+ * memzero: @r0 = mem, @r1 = size_t
+ * memset:  @r0 = mem, @r1 = char, @r2 = size_t
+ */
+
+.global memzero
+.align 4
+memzero:
+	/* adjust bzero args to memset args */
+	mov	%r2, %r1
+	mov	%r1, 0
+	/* tail call so need to tinker with blink */
+	b	memset

arch/arc/lib/relocate.c

@@ -1,31 +1,31 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <common.h>
 #include <elf.h>
-#include <log.h>
-#include <asm/sections.h>
-#include <asm/global_data.h>
+#include <asm-generic/sections.h>
+
+extern ulong __image_copy_start;
+extern ulong __ivt_end;
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int copy_uboot_to_ram(void)
 {
-	size_t len = (size_t)__image_copy_end - (size_t)__image_copy_start;
+	size_t len = (size_t)&__image_copy_end - (size_t)&__image_copy_start;
 
-	if (gd->flags & GD_FLG_SKIP_RELOC)
-		return 0;
-
-	memcpy((void *)gd->relocaddr, (void *)__image_copy_start, len);
+	memcpy((void *)gd->relocaddr, (void *)&__image_copy_start, len);
 
 	return 0;
 }
 
 int clear_bss(void)
 {
-	ulong dst_addr = (ulong)__bss_start + gd->reloc_off;
-	size_t len = (size_t)__bss_end - (size_t)__bss_start;
+	ulong dst_addr = (ulong)&__bss_start + gd->reloc_off;
+	size_t len = (size_t)&__bss_end - (size_t)&__bss_start;
 
 	memset((void *)dst_addr, 0x00, len);
 
@@ -37,16 +37,13 @@ int clear_bss(void)
  */
 int do_elf_reloc_fixups(void)
 {
-	Elf32_Rela *re_src = (Elf32_Rela *)__rel_dyn_start;
-	Elf32_Rela *re_end = (Elf32_Rela *)__rel_dyn_end;
-
-	if (gd->flags & GD_FLG_SKIP_RELOC)
-		return 0;
+	Elf32_Rela *re_src = (Elf32_Rela *)(&__rel_dyn_start);
+	Elf32_Rela *re_end = (Elf32_Rela *)(&__rel_dyn_end);
 
 	debug("Section .rela.dyn is located at %08x-%08x\n",
 	      (unsigned int)re_src, (unsigned int)re_end);
 
-	Elf32_Addr *offset_ptr_rom;
+	Elf32_Addr *offset_ptr_rom, *last_offset = NULL;
 	Elf32_Addr *offset_ptr_ram;
 
 	do {
@@ -54,29 +51,16 @@ int do_elf_reloc_fixups(void)
 		offset_ptr_rom = (Elf32_Addr *)re_src->r_offset;
 
 		/* Check that the location of the relocation is in .text */
-		if (offset_ptr_rom >= (Elf32_Addr *)__image_copy_start &&
-		    offset_ptr_rom < (Elf32_Addr *)__image_copy_end) {
-			unsigned int val, do_swap = 0;
+		if (offset_ptr_rom >= (Elf32_Addr *)&__image_copy_start &&
+		    offset_ptr_rom > last_offset) {
+			unsigned int val;
 			/* Switch to the in-RAM version */
 			offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
 							gd->reloc_off);
 
-#ifdef __LITTLE_ENDIAN__
-			/* If location in ".text" section swap value */
-			if (((u32)offset_ptr_rom >= (u32)__text_start &&
-			     (u32)offset_ptr_rom <= (u32)__text_end)
-#if defined(__ARC700__) || defined(__ARC600__)
-			    || ((u32)offset_ptr_rom >= (u32)__ivt_start &&
-				(u32)offset_ptr_rom <= (u32)__ivt_end)
-#endif
-			   )
-				do_swap = 1;
-#endif
-
-			debug("Patching value @ %08x (relocated to %08x)%s\n",
+			debug("Patching value @ %08x (relocated to %08x)\n",
 			      (unsigned int)offset_ptr_rom,
-			      (unsigned int)offset_ptr_ram,
-			      do_swap ? ", middle-endian encoded" : "");
+			      (unsigned int)offset_ptr_ram);
 
 			/*
 			 * Use "memcpy" because target location might be
@@ -86,45 +70,28 @@ int do_elf_reloc_fixups(void)
 			 */
 			memcpy(&val, offset_ptr_ram, sizeof(int));
 
-			if (do_swap)
+#ifdef __LITTLE_ENDIAN__
+			/* If location in ".text" section swap value */
+			if ((unsigned int)offset_ptr_rom <
+			    (unsigned int)&__ivt_end)
 				val = (val << 16) | (val >> 16);
+#endif
 
 			/* Check that the target points into executable */
-			if (val < (unsigned int)__image_copy_start ||
-			    val > (unsigned int)__image_copy_end) {
-				/* TODO: Use panic() instead of debug()
-				 *
-				 * For some reason GCC might generate
-				 * fake relocation even for LD/SC of constant
-				 * inderectly. See an example below:
-				 * ----------------------->8--------------------
-				 * static int setup_mon_len(void)
-				 * {
-				 *         gd->mon_len = (ulong)__bss_end - CONFIG_SYS_MONITOR_BASE;
-				 *         return 0;
-				 * }
-				 * ----------------------->8--------------------
-				 *
-				 * And that's what we get in the binary:
-				 * ----------------------->8--------------------
-				 * 10005cb4 <setup_mon_len>:
-				 * 10005cb4:       193c 3f80 0003 2f80     st      0x32f80,[r25,60]
-				 *                         10005cb8: R_ARC_RELATIVE        *ABS*-0x10000000
-				 * 10005cbc:       7fe0                    j_s.d   [blink]
-				 * 10005cbe:       700c                    mov_s   r0,0
-				 * ----------------------->8--------------------
-				 */
-				debug("Relocation target %08x points outside of image\n",
-				      val);
+			if (val >= (unsigned int)&__image_copy_start && val <=
+			    (unsigned int)&__image_copy_end) {
+				val += gd->reloc_off;
+#ifdef __LITTLE_ENDIAN__
+				/* If location in ".text" section swap value */
+				if ((unsigned int)offset_ptr_rom <
+				    (unsigned int)&__ivt_end)
+					val = (val << 16) | (val >> 16);
+#endif
+				memcpy(offset_ptr_ram, &val, sizeof(int));
 			}
-
-			val += gd->reloc_off;
-
-			if (do_swap)
-				val = (val << 16) | (val >> 16);
-
-			memcpy(offset_ptr_ram, &val, sizeof(int));
 		}
+		last_offset = offset_ptr_rom;
+
 	} while (++re_src < re_end);
 
 	return 0;

arch/arc/lib/reset.c

@@ -1,22 +1,19 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <command.h>
-#include <cpu_func.h>
+#include <common.h>
 
-__weak void reset_cpu(void)
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
+	printf("Put your restart handler here\n");
+
+#ifdef DEBUG
 	/* Stop debug session here */
-	__builtin_arc_brk();
-}
-
-int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	printf("Resetting the board...\n");
-
-	reset_cpu();
-
+	__asm__("brk");
+#endif
 	return 0;
 }