Prepare v2016.09.01

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

.azure-pipelines.yml

@@ -1,563 +0,0 @@
-variables:
-  windows_vm: windows-2019
-  ubuntu_vm: ubuntu-18.04
-  macos_vm: macOS-10.15
-  ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20220302-15Mar2022
-  # 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
-
-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 NO_SDL=1 > 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 NO_SDL=1 \
-            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_migrated_symbols_in_board_header
-    displayName: 'Check for migrated symbols in board header'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          KSYMLST=`mktemp`
-          KUSEDLST=`mktemp`
-          RET=0
-          cat `find . -name "Kconfig*"` | \
-             sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-             -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-             | sort -u > $KSYMLST
-          for CFG in `find include/configs -name "*.h"`; do
-             (grep '#define[[:blank:]]CONFIG_' $CFG | \
-                sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; \
-                grep '#undef[[:blank:]]CONFIG_' $CFG | \
-                sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | \
-                sort -u > ${KUSEDLST} || true
-             NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \
-                cut -d , -f 3`
-             if [[ $NUM -ne 0 ]]; then
-                echo "Unmigrated symbols found in $CFG:"
-                comm -12 ${KSYMLST} ${KUSEDLST}
-                RET=1
-             fi
-          done
-          exit $RET
-
-  - job: cppcheck
-    displayName: 'Static code analysis with cppcheck'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: cppcheck -j$(nproc) --force --quiet --inline-suppr .
-
-  - job: htmldocs
-    displayName: 'Build HTML documentation'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          virtualenv -p /usr/bin/python3 /tmp/venvhtml
-          . /tmp/venvhtml/bin/activate
-          pip install -r doc/sphinx/requirements.txt
-          make htmldocs
-
-  - job: todo
-    displayName: 'Search for TODO within source tree'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: grep -r TODO .
-      - script: grep -r FIXME .
-      - script: grep -r HACK . | grep -v HACKKIT
-
-  - job: sloccount
-    displayName: 'Some statistics about the code base'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: sloccount .
-
-  - job: maintainers
-    displayName: 'Ensure all configs have MAINTAINERS entries'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          if [ `./tools/genboardscfg.py -f 2>&1 | wc -l` -ne 0 ]; then exit 1; fi
-
-  - job: tools_only
-    displayName: 'Ensure host tools build'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          make tools-only_config tools-only -j$(nproc)
-
-  - job: envtools
-    displayName: 'Ensure env tools build'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          make tools-only_config envtools -j$(nproc)
-
-  - job: utils
-    displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites'
-    pool:
-      vmImage: $(ubuntu_vm)
-    steps:
-      - script: |
-          cat << EOF > build.sh
-          set -ex
-          cd ${WORK_DIR}
-          EOF
-          cat << "EOF" >> build.sh
-          git config --global user.name "Azure Pipelines"
-          git config --global user.email bmeng.cn@gmail.com
-          export USER=azure
-          virtualenv -p /usr/bin/python3 /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install -r test/py/requirements.txt
-          export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl
-          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 sandbox_spl
-          ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test
-          ./tools/buildman/buildman -t
-          ./tools/dtoc/dtoc -t
-          ./tools/patman/patman test
-          make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig
-          EOF
-          cat build.sh
-          # We cannot use "container" like other jobs above, as buildman
-          # seems to hang forever with pre-configured "container" environment
-          docker run -v $PWD:$(work_dir) $(ci_runner_image) /bin/bash $(work_dir)/build.sh
-
-  - job: nokia_rx51_test
-    displayName: 'Run tests for Nokia RX-51 (aka N900)'
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          export PATH=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin:$PATH
-          test/nokia_rx51_test.sh
-
-  - job: pylint
-    displayName: Check for any pylint regressions
-    pool:
-      vmImage: $(ubuntu_vm)
-    container:
-      image: $(ci_runner_image)
-      options: $(container_option)
-    steps:
-      - script: |
-          cd ${WORK_DIR}
-          export USER=azure
-          pip install -r test/py/requirements.txt
-          pip install asteval pylint==2.12.2 pyopenssl
-          export PATH=${PATH}:~/.local/bin
-          echo "[MASTER]" >> .pylintrc
-          echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
-          export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl
-          ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w --board sandbox_spl
-          pylint --version
-          export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt
-          make pylint_err
-
-- stage: test_py
-  jobs:
-  - job: test_py
-    displayName: 'test.py'
-    pool:
-      vmImage: $(ubuntu_vm)
-    strategy:
-      matrix:
-        sandbox:
-          TEST_PY_BD: "sandbox"
-        sandbox_clang:
-          TEST_PY_BD: "sandbox"
-          OVERRIDE: "-O clang-13"
-        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: "test_vpl_help or test_spl"
-        sandbox_noinst:
-          TEST_PY_BD: "sandbox_noinst"
-          TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
-        sandbox_flattree:
-          TEST_PY_BD: "sandbox_flattree"
-        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"
-        vexpress_ca9x4:
-          TEST_PY_BD: "vexpress_ca9x4"
-          TEST_PY_ID: "--id qemu"
-        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"
-        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_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"
-        r2dplus_i82557c:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id i82557c_qemu"
-        r2dplus_pcnet:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id pcnet_qemu"
-        r2dplus_rtl8139:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id rtl8139_qemu"
-        r2dplus_tulip:
-          TEST_PY_BD: "r2dplus"
-          TEST_PY_ID: "--id tulip_qemu"
-        sifive_unleashed_sdcard:
-          TEST_PY_BD: "sifive_unleashed"
-          TEST_PY_ID: "--id sdcard_qemu"
-        sifive_unleashed_spi-nor:
-          TEST_PY_BD: "sifive_unleashed"
-          TEST_PY_ID: "--id spi-nor_qemu"
-        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"
-        xtfpga:
-          TEST_PY_BD: "xtfpga"
-          TEST_PY_ID: "--id qemu"
-          TEST_PY_TEST_SPEC: "not sleep"
-    steps:
-      - script: |
-          cat << EOF > test.sh
-          set -ex
-          # make environment variables available as tests are running inside a container
-          export WORK_DIR="${WORK_DIR}"
-          export TEST_PY_BD="${TEST_PY_BD}"
-          export TEST_PY_ID="${TEST_PY_ID}"
-          export TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}"
-          export OVERRIDE="${OVERRIDE}"
-          EOF
-          cat << "EOF" >> test.sh
-          # the below corresponds to .gitlab-ci.yml "before_script"
-          cd ${WORK_DIR}
-          git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
-          ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
-          ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
-          grub-mkimage --prefix=\"\" -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
-          grub-mkimage --prefix=\"\" -o ~/grub_x64.efi -O x86_64-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
-          if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]]; then
-              wget -O - https://github.com/riscv/opensbi/releases/download/v0.9/opensbi-0.9-rv-bin.tar.xz | tar -C /tmp -xJ;
-              export OPENSBI=/tmp/opensbi-0.9-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
-          fi
-          if [[ "${TEST_PY_BD}" == "qemu-riscv64_spl" ]] || [[ "${TEST_PY_BD}" == "sifive_unleashed" ]]; then
-              wget -O - https://github.com/riscv/opensbi/releases/download/v0.9/opensbi-0.9-rv-bin.tar.xz | tar -C /tmp -xJ;
-              export OPENSBI=/tmp/opensbi-0.9-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
-          fi
-          # the below corresponds to .gitlab-ci.yml "script"
-          cd ${WORK_DIR}
-          export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD};
-          tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE}
-          cp ~/grub_x86.efi ${UBOOT_TRAVIS_BUILD_DIR}/
-          cp ~/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
-              wget -O - "https://drive.google.com/uc?id=1x6nrtWIyIRPLS2cQBwYTnT2TbOI8UjmM&export=download" |xz -dc >${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
-              wget -O - "https://drive.google.com/uc?id=149Cz-5SZXHNKpi9xg6R_5XITWohu348y&export=download" >cbfstool;
-              chmod a+x cbfstool;
-              ./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
-          virtualenv -p /usr/bin/python3 /tmp/venv
-          . /tmp/venv/bin/activate
-          pip install -r test/py/requirements.txt
-          export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH};
-          export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
-          # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not
-          ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR";
-          # the below corresponds to .gitlab-ci.yml "after_script"
-          rm -rf /tmp/uboot-test-hooks /tmp/venv
-          EOF
-          cat test.sh
-          # 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 .
-          # Filesystem tests need extra docker args to run
-          set --
-          if [[ "${TEST_PY_BD}" == "sandbox" ]]; then
-              # 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
-          fi
-          # Some tests using libguestfs-tools need the fuse device to run
-          docker run "$@" --device /dev/fuse:/dev/fuse -v $PWD:$(work_dir) $(ci_runner_image) /bin/bash $(work_dir)/test.sh
-
-- stage: world_build
-  jobs:
-  - job: build_the_world
-    displayName: 'Build the World'
-    pool:
-      vmImage: $(ubuntu_vm)
-    strategy:
-      # Use almost the same target division in .travis.yml, only merged
-      # 3 small build jobs (arc/microblaze/xtensa) into one.
-      matrix:
-        arc_microblaze_xtensa:
-          BUILDMAN: "arc microblaze xtensa"
-        arm11_arm7_arm920t_arm946es:
-          BUILDMAN: "arm11 arm7 arm920t arm946es"
-        arm926ejs:
-          BUILDMAN: "arm926ejs -x freescale,siemens,at91,kirkwood,omap"
-        at91_non_armv7:
-          BUILDMAN: "at91 -x armv7"
-        at91_non_arm926ejs:
-          BUILDMAN: "at91 -x arm926ejs"
-        boundary_engicam_toradex:
-          BUILDMAN: "boundary engicam toradex"
-        arm_bcm:
-          BUILDMAN: "bcm -x mips"
-        nxp_arm32:
-          BUILDMAN: "freescale -x powerpc,m68k,aarch64,ls101,ls102,ls104,ls108,ls20,lx216"
-        nxp_ls101x:
-          BUILDMAN: "freescale&ls101"
-        nxp_ls102x:
-          BUILDMAN: "freescale&ls102"
-        nxp_ls104x:
-          BUILDMAN: "freescale&ls104"
-        nxp_ls108x:
-          BUILDMAN: "freescale&ls108"
-        nxp_ls20xx:
-          BUILDMAN: "freescale&ls20"
-        nxp_lx216x:
-          BUILDMAN: "freescale&lx216"
-        imx6:
-          BUILDMAN: "mx6 -x boundary,engicam,freescale,technexion,toradex"
-        imx:
-          BUILDMAN: "mx -x mx6,freescale,technexion,toradex"
-        imx8:
-          BUILDMAN: "imx8"
-        keystone2_keystone3:
-          BUILDMAN: "k2 k3"
-        samsung_socfpga:
-          BUILDMAN: "samsung socfpga"
-        sun4i:
-          BUILDMAN: "sun4i"
-        sun5i:
-          BUILDMAN: "sun5i"
-        sun6i:
-          BUILDMAN: "sun6i"
-        sun7i:
-          BUILDMAN: "sun7i"
-        sun8i_32bit:
-          BUILDMAN: "sun8i&armv7"
-        sun8i_64bit:
-          BUILDMAN: "sun8i&aarch64"
-        sun9i:
-          BUILDMAN: "sun9i"
-        sun50i:
-          BUILDMAN: "sun50i"
-        arm_catch_all:
-          BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,renesas,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rk,toradex,socfpga,k2,k3,zynq"
-        sandbox_x86:
-          BUILDMAN: "sandbox x86"
-        technexion:
-          BUILDMAN: "technexion"
-        kirkwood:
-          BUILDMAN: "kirkwood"
-        mvebu:
-          BUILDMAN: "mvebu"
-        m68k:
-          BUILDMAN: "m68k"
-        mips:
-          BUILDMAN: "mips"
-        non_fsl_ppc:
-          BUILDMAN: "powerpc -x freescale"
-        mpc85xx_freescale:
-          BUILDMAN: "mpc85xx&freescale -x t208xrdb -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x bsc91*"
-        t208xrdb_corenet_ds:
-          BUILDMAN: "t208xrdb corenet_ds"
-        fsl_ppc:
-          BUILDMAN: "mpc83xx&freescale"
-        t102x:
-          BUILDMAN: "t102*"
-        p1_p2_rdb_pc:
-          BUILDMAN: "p1_p2_rdb_pc"
-        p1010rdb_bsc91:
-          BUILDMAN: "p1010rdb bsc91"
-        siemens:
-          BUILDMAN: "siemens"
-        tegra:
-          BUILDMAN: "tegra -x toradex"
-        am33xx_no_siemens:
-          BUILDMAN: "am33xx -x siemens"
-        omap:
-          BUILDMAN: "omap"
-        uniphier:
-          BUILDMAN: "uniphier"
-        aarch64_catch_all:
-          BUILDMAN: "aarch64 -x bcm,imx8,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq"
-        rockchip:
-          BUILDMAN: "rk"
-        renesas:
-          BUILDMAN: "renesas"
-        zynq:
-          BUILDMAN: "zynq&armv7"
-        zynqmp_versal:
-          BUILDMAN: "versal|zynqmp&aarch64"
-        riscv:
-          BUILDMAN: "riscv"
-    steps:
-      - script: |
-          cat << EOF > build.sh
-          set -ex
-          cd ${WORK_DIR}
-          # make environment variables available as tests are running inside a container
-          export BUILDMAN="${BUILDMAN}"
-          EOF
-          cat << "EOF" >> build.sh
-          if [[ "${BUILDMAN}" != "" ]]; then
-              ret=0;
-              tools/buildman/buildman -o /tmp -P -E -W ${BUILDMAN} ${OVERRIDE} || ret=$?;
-              if [[ $ret -ne 0 ]]; then
-                  tools/buildman/buildman -o /tmp -seP ${BUILDMAN};
-                  exit $ret;
-              fi;
-          fi
-          EOF
-          cat build.sh
-          docker run -v $PWD:$(work_dir) $(ci_runner_image) /bin/bash $(work_dir)/build.sh

.checkpatch.conf

@@ -25,12 +25,3 @@
 # 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

.get_maintainer.conf

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

.gitattributes

@@ -1,6 +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
-*.bmp binary
-*.ttf binary
-*.gz 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://www.denx.de/wiki/U-Boot/Patches
-
-The only exception to this is in order to trigger a CI loop on Azure prior
-to posting of patches.

.gitignore

@@ -3,35 +3,26 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# Normal rules (sorted alphabetically)
+# Normal rules
 #
 .*
-*.a
-*.asn1.[ch]
-*.bin
-*.cfgout
-*.cover
-*.dtb
-*.dtbo
-*.dtb.S
-*.elf
-*.exe
-*.gcda
-*.gcno
-*.i
-*.img
-*.lex.c
-*.lst
-*.mod.c
-*.mbx
 *.o
 *.o.*
-*.order
-*.patch
+*.a
 *.s
 *.su
+*.mod.c
+*.i
+*.lst
+*.order
+*.elf
 *.swp
-*.tab.[ch]
+*.bin
+*.patch
+*.cfgtmp
+
+# host programs on Cygwin
+*.exe
 
 # Build tree
 /build-*
@@ -39,13 +30,11 @@
 #
 # Top-level generic files
 #
-fit-dtb.blob*
 /MLO*
-/SPL*
+/SPL
 /System.map
 /u-boot*
 /boards.cfg
-/*.log
 
 #
 # git files that we don't want to ignore even it they are dot-files
@@ -56,6 +45,7 @@ fit-dtb.blob*
 #
 # Generated files
 #
+/LOG
 /spl/
 /tpl/
 /defconfig
@@ -94,13 +84,3 @@ GTAGS
 *.orig
 *~
 \#*#
-
-# Python cache
-__pycache__
-
-# Python code coverage output (python3-coverage html)
-/htmlcov/
-
-# pylint files
-/pylint.cur
-/pylint.out/

.gitlab-ci.yml

@@ -1,442 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-# Grab our configured image.  The source for this is found at:
-# https://source.denx.de/u-boot/gitlab-ci-runner
-image: trini/u-boot-gitlab-ci-runner:focal-20220302-15Mar2022
-
-# We run some tests in different order, to catch some failures quicker.
-stages:
-  - testsuites
-  - test.py
-  - world build
-
-.buildman_and_testpy_template: &buildman_and_testpy_dfn
-  stage: test.py
-  before_script:
-    # Clone uboot-test-hooks
-    - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks
-    - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
-    - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
-    - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
-    - grub-mkimage --prefix="" -o ~/grub_x64.efi -O x86_64-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
-    - if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]]; then
-        wget -O - https://github.com/riscv/opensbi/releases/download/v0.9/opensbi-0.9-rv-bin.tar.xz | tar -C /tmp -xJ;
-        export OPENSBI=/tmp/opensbi-0.9-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
-      fi
-    - if [[ "${TEST_PY_BD}" == "qemu-riscv64_spl" ]] || [[ "${TEST_PY_BD}" == "sifive_unleashed" ]]; then
-        wget -O - https://github.com/riscv/opensbi/releases/download/v0.9/opensbi-0.9-rv-bin.tar.xz | tar -C /tmp -xJ;
-        export OPENSBI=/tmp/opensbi-0.9-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
-      fi
-
-  after_script:
-    - 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}
-    - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e
-        --board ${TEST_PY_BD} ${OVERRIDE}
-    - cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/
-    - cp ~/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
-        wget -O -
-          "https://drive.google.com/uc?id=1x6nrtWIyIRPLS2cQBwYTnT2TbOI8UjmM&export=download" |
-          xz -dc >${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
-        wget -O -
-          "https://drive.google.com/uc?id=149Cz-5SZXHNKpi9xg6R_5XITWohu348y&export=download" >
-          cbfstool;
-        chmod a+x cbfstool;
-        ./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
-    - virtualenv -p /usr/bin/python3 /tmp/venv
-    - . /tmp/venv/bin/activate
-    - pip install -r test/py/requirements.txt
-    # "${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;
-      ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID}
-        ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"}
-        --build-dir "$UBOOT_TRAVIS_BUILD_DIR"
-    # It seems that the files in /tmp go away, so copy out what we need
-    - if [[ "${TEST_PY_BD}" == "coreboot" ]]; then
-        cp -v /tmp/coreboot/*.{html,css} .;
-      fi
-
-build all 32bit ARM platforms:
-  stage: world build
-  script:
-    - ret=0;
-      ./tools/buildman/buildman -o /tmp -P -E -W arm -x aarch64 || ret=$?;
-      if [[ $ret -ne 0 ]]; then
-        ./tools/buildman/buildman -o /tmp -seP;
-        exit $ret;
-      fi;
-
-build all 64bit ARM platforms:
-  stage: world build
-  script:
-    - virtualenv -p /usr/bin/python3 /tmp/venv
-    - . /tmp/venv/bin/activate
-    - pip install pyelftools
-    - ret=0;
-      ./tools/buildman/buildman -o /tmp -P -E -W aarch64 || ret=$?;
-      if [[ $ret -ne 0 ]]; then
-        ./tools/buildman/buildman -o /tmp -seP;
-        exit $ret;
-      fi;
-
-build all PowerPC platforms:
-  stage: world build
-  script:
-    - ret=0;
-      ./tools/buildman/buildman -o /tmp -P -E -W powerpc || ret=$?;
-      if [[ $ret -ne 0 ]]; then
-        ./tools/buildman/buildman -o /tmp -seP;
-        exit $ret;
-      fi;
-
-build all other platforms:
-  stage: world build
-  script:
-    - ret=0;
-      ./tools/buildman/buildman -o /tmp -P -E -W -x arm,powerpc || ret=$?;
-      if [[ $ret -ne 0 ]]; then
-        ./tools/buildman/buildman -o /tmp -seP;
-        exit $ret;
-      fi;
-
-check for migrated symbols in board header:
-  stage: testsuites
-  script:
-    - KSYMLST=`mktemp`;
-      KUSEDLST=`mktemp`;
-      RET=0;
-      cat `find . -name "Kconfig*"` |
-         sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p'
-         -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p'
-         | sort -u > $KSYMLST;
-      for CFG in `find include/configs -name "*.h"`; do
-         (grep '#define[[:blank:]]CONFIG_' $CFG |
-            sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ;
-            grep '#undef[[:blank:]]CONFIG_' $CFG |
-            sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') |
-            sort -u > ${KUSEDLST} || true;
-         NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} |
-            cut -d , -f 3`;
-         if [[ $NUM -ne 0 ]]; then
-            echo "Unmigrated symbols found in $CFG:";
-            comm -12 ${KSYMLST} ${KUSEDLST};
-            RET=1;
-         fi;
-      done;
-      exit $RET
-
-# QA jobs for code analytics
-# static code analysis with cppcheck (we can add --enable=all later)
-cppcheck:
-  stage: testsuites
-  script:
-    - cppcheck -j$(nproc) --force --quiet --inline-suppr .
-
-# search for TODO within source tree
-grep TODO/FIXME/HACK:
-  stage: testsuites
-  script:
-    - grep -r TODO .
-    - grep -r FIXME .
-    # search for HACK within source tree and ignore HACKKIT board
-    - grep -r HACK . | grep -v HACKKIT
-
-# build HTML documentation
-htmldocs:
-  stage: testsuites
-  script:
-    - virtualenv -p /usr/bin/python3 /tmp/venvhtml
-    - . /tmp/venvhtml/bin/activate
-    - pip install -r doc/sphinx/requirements.txt
-    - make htmldocs
-
-# some statistics about the code base
-sloccount:
-  stage: testsuites
-  script:
-    - sloccount .
-
-# ensure all configs have MAINTAINERS entries
-Check for configs without MAINTAINERS entry:
-  stage: testsuites
-  script:
-    - if [ `./tools/genboardscfg.py -f 2>&1 | wc -l` -ne 0 ]; then exit 1; fi
-
-# Ensure host tools build
-Build tools-only:
-  stage: testsuites
-  script:
-    - make tools-only_config tools-only -j$(nproc)
-
-# Ensure env tools build
-Build envtools:
-  stage: testsuites
-  script:
-    - make tools-only_config envtools -j$(nproc)
-
-Run binman, buildman, dtoc, Kconfig and patman testsuites:
-  stage: testsuites
-  script:
-    - git config --global user.name "GitLab CI Runner";
-      git config --global user.email trini@konsulko.com;
-      export USER=gitlab;
-      virtualenv -p /usr/bin/python3 /tmp/venv;
-      . /tmp/venv/bin/activate;
-      pip install -r test/py/requirements.txt;
-      export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl;
-      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 sandbox_spl;
-      ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test;
-      ./tools/buildman/buildman -t;
-      ./tools/dtoc/dtoc -t;
-      ./tools/patman/patman test;
-      make testconfig
-
-Run tests for Nokia RX-51 (aka N900):
-  stage: testsuites
-  script:
-    - export PATH=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin:$PATH;
-      test/nokia_rx51_test.sh
-
-# Check for any pylint regressions
-Run pylint:
-  stage: testsuites
-  script:
-    - pip install -r test/py/requirements.txt
-    - pip install asteval pylint==2.12.2 pyopenssl
-    - export PATH=${PATH}:~/.local/bin
-    - echo "[MASTER]" >> .pylintrc
-    - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
-    - export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl
-    - ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w
-        --board sandbox_spl
-    - pylint --version
-    - export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"
-    - make pylint_err
-
-# Test sandbox with test.py
-sandbox test.py:
-  variables:
-    TEST_PY_BD: "sandbox"
-  <<: *buildman_and_testpy_dfn
-
-sandbox with clang test.py:
-  variables:
-    TEST_PY_BD: "sandbox"
-    OVERRIDE: "-O clang-13"
-  <<: *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_vpl test.py:
-  variables:
-    TEST_PY_BD: "sandbox_vpl"
-    TEST_PY_TEST_SPEC: "test_vpl_help or test_spl"
-  <<: *buildman_and_testpy_dfn
-
-evb-ast2500 test.py:
-  variables:
-    TEST_PY_BD: "evb-ast2500"
-    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_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"
-  <<: *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-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
-
-r2dplus_i82557c test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_ID: "--id i82557c_qemu"
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_pcnet test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_ID: "--id pcnet_qemu"
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_rtl8139 test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_ID: "--id rtl8139_qemu"
-  <<: *buildman_and_testpy_dfn
-
-r2dplus_tulip test.py:
-  variables:
-    TEST_PY_BD: "r2dplus"
-    TEST_PY_ID: "--id tulip_qemu"
-  <<: *buildman_and_testpy_dfn
-
-sifive_unleashed_sdcard test.py:
-  variables:
-    TEST_PY_BD: "sifive_unleashed"
-    TEST_PY_ID: "--id sdcard_qemu"
-  <<: *buildman_and_testpy_dfn
-
-sifive_unleashed_spi-nor test.py:
-  variables:
-    TEST_PY_BD: "sifive_unleashed"
-    TEST_PY_ID: "--id spi-nor_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"
-  <<: *buildman_and_testpy_dfn
-
-xtfpga test.py:
-  variables:
-    TEST_PY_BD: "xtfpga"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  <<: *buildman_and_testpy_dfn
-
-coreboot test.py:
-  variables:
-    TEST_PY_BD: "coreboot"
-    TEST_PY_TEST_SPEC: "not sleep"
-    TEST_PY_ID: "--id qemu"
-  artifacts:
-    paths:
-      - "*.html"
-      - "*.css"
-    expire_in: 1 week
-  <<: *buildman_and_testpy_dfn

.mailmap

@@ -4,75 +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>
 
-Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
 Allen Martin <amartin@nvidia.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>
-Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
-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>
 Dirk Behme <dirk.behme@googlemail.com>
 Fabio Estevam <fabio.estevam@nxp.com>
-Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
-Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
 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>
-Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
-Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
-Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
-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 <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
-Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
-Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
-Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
-Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
-Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>
-Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
-Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
-Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
-Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
 Prabhakar Kushwaha <prabhakar@freescale.com>
 Rajeshwari Shinde <rajeshwari.s@samsung.com>
-Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
-Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
-Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
+Ricardo Ribalda <ricardo.ribalda@uam.es>
+Ricardo Ribalda <ricardo.ribalda@gmail.com>
 Sandeep Paulraj <s-paulraj@ti.com>
 Shaohui Xie <Shaohui.Xie@freescale.com>
-Stefan Roese <sr@denx.de> <stroese>
+Stefan Roese <stroese>
 Stefano Babic <sbabic@denx.de>
-Tom Rini <trini@konsulko.com> <trini@ti.com>
 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
-Wolfgang Denk <wd@denx.de> <wdenk>
-Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
-Wolfgang Denk <wd@denx.de> <wd@fifi.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@nyx.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@atlas.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@castor.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
-Wolfgang Denk <wd@denx.de> <wd@nyx.(none)>
+Wolfgang Denk <wdenk>
 York Sun <yorksun@freescale.com>
 York Sun <york.sun@nxp.com>
 Łukasz Majewski <l.majewski@samsung.com>
-Lukasz Majewski <lukma@denx.de>
-Mirza <Taimoor_Mirza@mentor.com>

.readthedocs.yml

@@ -1,24 +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-20.04"
-  apt_packages:
-    - python3-six
-  tools:
-    python: "3.9"
-
-# 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

.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

Kbuild

@@ -1,22 +1,54 @@
-# 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  := $(generic-offsets-file)
 targets := lib/asm-offsets.s
 
-CFLAGS_REMOVE_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
@@ -27,5 +59,10 @@ targets += arch/$(ARCH)/lib/asm-offsets.s
 
 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__)

Kconfig

@@ -3,30 +3,17 @@
 # see the file Documentation/kbuild/kconfig-language.txt in the
 # Linux kernel source tree.
 #
-mainmenu "U-Boot $(UBOOTVERSION) Configuration"
+mainmenu "U-Boot $UBOOTVERSION Configuration"
 
-comment "Compiler: $(CC_VERSION_TEXT)"
-
-source "scripts/Kconfig.include"
+config UBOOTVERSION
+	string
+	option env="UBOOTVERSION"
 
 # Allow defaults in arch-specific code to override any given here
 source "arch/Kconfig"
 
 menu "General setup"
 
-config BROKEN
-	bool
-	help
-	  This option cannot be enabled. It is used as dependency
-	  for broken and incomplete features.
-
-config DEPRECATED
-	bool
-	help
-	  This option cannot be enabled.  It it used as a dependency for
-	  code that relies on deprecated features that will be removed and
-	  the conversion deadline has passed.
-
 config LOCALVERSION
 	string "Local version - append to U-Boot release"
 	help
@@ -57,187 +44,36 @@ config LOCALVERSION_AUTO
 
 	  which is done within the script "scripts/setlocalversion".)
 
-config CC_IS_GCC
-	def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc)
-
-config GCC_VERSION
-	int
-	default $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//') if CC_IS_GCC
-	default 0
-
-config CC_IS_CLANG
-	def_bool $(success,$(CC) --version | head -n 1 | grep -q clang)
-
-config CLANG_VERSION
-	int
-	default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
-
-choice
-	prompt "Optimization level"
-	default CC_OPTIMIZE_FOR_SIZE
-
 config CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size"
+	default y
 	help
-	  Enabling this option will pass "-Os" to gcc, resulting in a smaller
-	  U-Boot image.
+	  Enabling this option will pass "-Os" instead of "-O2" to gcc
+	  resulting in a smaller U-Boot image.
 
 	  This option is enabled by default for U-Boot.
 
-config CC_OPTIMIZE_FOR_SPEED
-	bool "Optimize for speed"
-	help
-	  Enabling this option will pass "-O2" to gcc, resulting in a faster
-	  U-Boot image.
-
-config CC_OPTIMIZE_FOR_DEBUG
-	bool "Optimize for debugging"
-	help
-	  Enabling this option will pass "-Og" to gcc, enabling optimizations
-	  which don't interfere with debugging.
-
-endchoice
-
-config OPTIMIZE_INLINING
-	bool "Allow compiler to uninline functions marked 'inline' in full U-Boot"
-	help
-	  This option determines if U-Boot forces gcc to inline the functions
-	  developers have marked 'inline'. Doing so takes away freedom from gcc to
-	  do what it thinks is best, which is desirable in some cases for size
-	  reasons.
-
-config SPL_OPTIMIZE_INLINING
-	bool "Allow compiler to uninline functions marked 'inline' in SPL"
-	depends on SPL
-	help
-	  This option determines if U-Boot forces gcc to inline the functions
-	  developers have marked 'inline'. Doing so takes away freedom from gcc to
-	  do what it thinks is best, which is desirable in some cases for size
-	  reasons.
-
-config ARCH_SUPPORTS_LTO
-	bool
-
-config LTO
-	bool "Enable Link Time Optimizations"
-	depends on ARCH_SUPPORTS_LTO
-	help
-	  This option enables Link Time Optimization (LTO), a mechanism which
-	  allows the compiler to optimize between different compilation units.
-
-	  This can optimize away dead code paths, resulting in smaller binary
-	  size (if CC_OPTIMIZE_FOR_SIZE is enabled).
-
-	  This option is not available for every architecture and may
-	  introduce bugs.
-
-	  Currently, when compiling with GCC, due to a weird bug regarding
-	  jobserver, the final linking will not respect make's --jobs argument.
-	  Instead all available processors will be used (as reported by the
-	  nproc command).
-
-	  If unsure, say n.
-
-config TPL_OPTIMIZE_INLINING
-	bool "Allow compiler to uninline functions marked 'inline' in TPL"
-	depends on TPL
-	help
-	  This option determines if U-Boot forces gcc to inline the functions
-	  developers have marked 'inline'. Doing so takes away freedom from gcc to
-	  do what it thinks is best, which is desirable in some cases for size
-	  reasons.
-
-config CC_COVERAGE
-	bool "Enable code coverage analysis"
-	depends on SANDBOX
-	help
-	  Enabling this option will pass "--coverage" to gcc to compile
-	  and link code instrumented for coverage analysis.
-
-config CC_HAS_ASM_INLINE
-	def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null)
-
-config XEN
-	bool "Select U-Boot be run as a bootloader for XEN Virtual Machine"
-	help
-	  Enabling this option will make U-Boot be run as a bootloader
-	  for XEN [1] Virtual Machine.
-
-	  Xen is a virtual machine monitor (VMM) or a type-1 hypervisor with support
-	  for para-virtualization. Xen can organize the safe execution of several
-	  virtual machines on the same physical system with performance close to
-	  native. It is used as the basis for a number of different commercial and
-	  open source applications, such as: server virtualization, Infrastructure
-	  as a Service (IaaS), desktop virtualization, security applications,
-	  embedded and hardware appliances.
-	  Xen has a special VM called Domain-0 that runs the Dom0 kernel and allows
-	  Xen to use the device drivers for the Domain-0 kernel by default.
-
-	  [1] - https://xenproject.org/
-
 config DISTRO_DEFAULTS
 	bool "Select defaults suitable for booting general purpose Linux distributions"
-	select AUTO_COMPLETE
-	select CMDLINE_EDITING
-	select CMD_BOOTI if ARM64
+	default y if ARCH_SUNXI
+	default n
 	select CMD_BOOTZ if ARM && !ARM64
-	select CMD_DHCP if CMD_NET
-	select CMD_ENV_EXISTS
+	select CMD_BOOTI if ARM64
+	select CMD_DHCP
 	select CMD_EXT2
 	select CMD_EXT4
 	select CMD_FAT
 	select CMD_FS_GENERIC
-	select CMD_PART if PARTITIONS
-	select CMD_PING if CMD_NET
-	select CMD_PXE if NET
-	select CMD_SYSBOOT
-	select ENV_VARS_UBOOT_CONFIG
+	select CMD_MII
+	select CMD_PING
 	select HUSH_PARSER
-	select SUPPORT_RAW_INITRD
-	select SYS_LONGHELP
-	imply CMD_MII if NET
-	imply USB_STORAGE
-	imply USE_BOOTCOMMAND
 	help
 	  Select this to enable various options and commands which are suitable
 	  for building u-boot for booting general purpose Linux distributions.
 
-config ENV_VARS_UBOOT_CONFIG
-	bool "Add arch, board, vendor and soc variables to default environment"
-	help
-	  Define this in order to add variables describing the
-	  U-Boot build configuration to the default environment.
-	  These will be named arch, cpu, board, vendor, and soc.
-	  Enabling this option will cause the following to be defined:
-	  - CONFIG_SYS_ARCH
-	  - CONFIG_SYS_CPU
-	  - CONFIG_SYS_BOARD
-	  - CONFIG_SYS_VENDOR
-	  - CONFIG_SYS_SOC
-
-config NR_DRAM_BANKS
-	int "Number of DRAM banks"
-	default 1 if ARCH_SUNXI || ARCH_OWL
-	default 4
-	help
-	  This defines the number of DRAM banks.
-
-config SYS_BOOT_GET_CMDLINE
-	bool "Enable kernel command line setup"
-	help
-	  Enables allocating and saving kernel cmdline in space between
-	  "bootm_low" and "bootm_low" + BOOTMAPSZ.
-
-config SYS_BOOT_GET_KBD
-	bool "Enable kernel board information setup"
-	help
-	  Enables allocating and saving a kernel copy of the bd_info in
-	  space between "bootm_low" and "bootm_low" + BOOTMAPSZ.
-
 config SYS_MALLOC_F
 	bool "Enable malloc() pool before relocation"
 	default y if DM
-
 	help
 	  Before relocation, memory is very limited on many platforms. Still,
 	  we can provide a small malloc() pool if needed. Driver model in
@@ -247,81 +83,7 @@ config SYS_MALLOC_F
 config SYS_MALLOC_F_LEN
 	hex "Size of malloc() pool before relocation"
 	depends on SYS_MALLOC_F
-	default 0x400 if M68K || PPC || ROCKCHIP_PX30 || ROCKCHIP_RK3036 || \
-			 ROCKCHIP_RK3308 || ROCKCHIP_RV1108
-	default 0x600 if ARCH_ZYNQMP_R5 || ARCH_ZYNQMP
-	default 0x800 if ARCH_ZYNQ || ROCKCHIP_RK3128 || ROCKCHIP_RK3188 || \
-			 ROCKCHIP_RK322X || X86
-	default 0x1000 if ARCH_MESON || ARCH_BMIPS || ARCH_MTMIPS
-	default 0x1800 if ARCH_TEGRA
-	default 0x4000 if SANDBOX || RISCV || ARCH_APPLE || ROCKCHIP_RK3368 || \
-			  ROCKCHIP_RK3399
-	default 0x8000 if RCAR_GEN3
-	default 0x10000 if ARCH_IMX8 || (ARCH_IMX8M && !IMX8MQ)
-	default 0x2000
-	help
-	  Before relocation, memory is very limited on many platforms. Still,
-	  we can provide a small malloc() pool if needed. Driver model in
-	  particular needs this to operate, so that it can allocate the
-	  initial serial device and any others that are needed.
-
-config SYS_MALLOC_LEN
-	hex "Define memory for Dynamic allocation"
-	default 0x4000000 if SANDBOX
-	default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON
-	default 0x200000 if ARCH_BMIPS || X86
-	default 0x120000 if MACH_SUNIV
-	default 0x220000 if MACH_SUN8I_V3S
-	default 0x4020000 if ARCH_SUNXI
-	default 0x400000
-	help
-	  This defines memory to be allocated for Dynamic allocation
-	  TODO: Use for other architectures
-
-config SPL_SYS_MALLOC_F_LEN
-	hex "Size of malloc() pool in SPL"
-	depends on SYS_MALLOC_F && SPL
-	default 0 if !SPL_FRAMEWORK
-	default 0x2800 if RCAR_GEN3
-	default SYS_MALLOC_F_LEN
-	help
-	  In SPL memory is very limited on many platforms. Still,
-	  we can provide a small malloc() pool if needed. Driver model in
-	  particular needs this to operate, so that it can allocate the
-	  initial serial device and any others that are needed.
-
-	  It is possible to enable CONFIG_SYS_SPL_MALLOC_START to start a new
-	  malloc() region in SDRAM once it is inited.
-
-config TPL_SYS_MALLOC_F_LEN
-	hex "Size of malloc() pool in TPL"
-	depends on SYS_MALLOC_F && TPL
-	default SPL_SYS_MALLOC_F_LEN
-	help
-	  In TPL memory is very limited on many platforms. Still,
-	  we can provide a small malloc() pool if needed. Driver model in
-	  particular needs this to operate, so that it can allocate the
-	  initial serial device and any others that are needed.
-
-config VALGRIND
-	bool "Inform valgrind about memory allocations"
-	depends on !RISCV
-	help
-	  Valgrind is an instrumentation framework for building dynamic analysis
-	  tools. In particular, it may be used to detect memory management bugs
-	  in U-Boot. It relies on knowing when heap blocks are allocated in
-	  order to give accurate results. This happens automatically for
-	  standard allocator functions provided by the host OS. However, this
-	  doesn't automatically happen for U-Boot's malloc implementation.
-
-	  Enable this option to annotate U-Boot's malloc implementation so that
-	  it can be handled accurately by Valgrind. If you aren't planning on
-	  using valgrind to debug U-Boot, say 'n'.
-
-config VPL_SYS_MALLOC_F_LEN
-	hex "Size of malloc() pool in VPL before relocation"
-	depends on SYS_MALLOC_F && VPL
-	default SYS_MALLOC_F_LEN
+	default 0x400
 	help
 	  Before relocation, memory is very limited on many platforms. Still,
 	  we can provide a small malloc() pool if needed. Driver model in
@@ -354,19 +116,6 @@ if EXPERT
 	  When disabling this, please check if malloc calls, maybe
 	  should be replaced by calloc - if one expects zeroed memory.
 
-config SYS_MALLOC_DEFAULT_TO_INIT
-	bool "Default malloc to init while reserving the memory for it"
-	help
-	  It may happen that one needs to move the dynamic allocation
-	  from one to another memory range, eg. when moving the malloc
-	  from the limited static to a potentially large dynamic (DDR)
-	  memory.
-
-	  If so then on top of setting the updated memory aside one
-	  needs to bring the malloc init.
-
-	  If such a scenario is sought choose yes.
-
 config TOOLS_DEBUG
 	bool "Enable debug information for tools"
 	help
@@ -375,201 +124,264 @@ config TOOLS_DEBUG
 	  it is possible to set breakpoints on particular lines, single-step
 	  debug through the source code, etc.
 
-endif # EXPERT
+endif
 
 config PHYS_64BIT
 	bool "64bit physical address support"
 	help
 	  Say Y here to support 64bit physical memory address.
 	  This can be used not only for 64bit SoCs, but also for
-	  large physical address extension on 32bit SoCs.
-
-config HAS_ROM
-	bool
-	select BINMAN
-	help
-	  Enables building of a u-boot.rom target. This collects U-Boot and
-	  any necessary binary blobs.
-
-config SPL_IMAGE
-	string "SPL image used in the combined SPL+U-Boot image"
-	default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
-	default "spl/u-boot-spl.bin"
-	depends on SPL
-	help
-	  Select the SPL build target that shall be generated by the SPL
-	  build process (default spl/u-boot-spl.bin). This image will be
-	  used to generate a combined image with SPL and main U-Boot
-	  proper as one single image.
-
-config REMAKE_ELF
-	bool "Recreate an ELF image from raw U-Boot binary"
-	help
-	  Enable this to recreate an ELF image (u-boot.elf) from the raw
-	  U-Boot binary (u-boot.bin), which may already have been statically
-	  relocated and may already have a device-tree appended to it.
-
-config BUILD_TARGET
-	string "Build target special images"
-	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
-	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
-	default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
-	default "u-boot-elf.srec" if RCAR_GEN3
-	default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
-				ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
-	default "u-boot.kwb" if ARCH_KIRKWOOD
-	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
-	default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
-	help
-	  Some SoCs need special image types (e.g. U-Boot binary
-	  with a special header) as build targets. By defining
-	  CONFIG_BUILD_TARGET in the SoC / board header, this
-	  special image will be automatically built upon calling
-	  make / buildman.
-
-config HAS_BOARD_SIZE_LIMIT
-	bool "Define a maximum size for the U-Boot image"
-	default y if RCAR_GEN3
-	help
-	  In some cases, we need to enforce a hard limit on how big the U-Boot
-	  image itself can be.
-
-config BOARD_SIZE_LIMIT
-	int "Maximum size of the U-Boot image in bytes"
-	default 1048576 if RCAR_GEN3
-	depends on HAS_BOARD_SIZE_LIMIT
-	help
-	  Maximum size of the U-Boot image. When defined, the build system
-	  checks that the actual size does not exceed it.  This does not
-	  include SPL nor TPL, on platforms that use that functionality, they
-	  have a separate option to restict size.
-
-config SYS_CUSTOM_LDSCRIPT
-	bool "Use a custom location for the U-Boot linker script"
-	help
-	  Normally when linking U-Boot we will look in the board directory,
-	  the CPU directory and finally the "cpu" directory of the architecture
-	  for the ile "u-boot.lds" and use that as our linker.  However, in
-	  some cases we need to provide a different linker script.  To do so,
-	  enable this option and then provide the location under
-	  CONFIG_SYS_LDSCRIPT.
-
-config SYS_LDSCRIPT
-	depends on SYS_CUSTOM_LDSCRIPT
-	string "Custom ldscript location"
-	help
-	  Path within the source tree to the linker script to use for the
-	  main U-Boot binary.
-
-config SYS_LOAD_ADDR
-	hex "Address in memory to use by default"
-	default 0x01000000 if ARCH_SOCFPGA
-	default 0x02000000 if PPC || X86
-	default 0x81000000 if MACH_SUNIV
-	default 0x22000000 if MACH_SUN9I
-	default 0x42000000 if ARCH_SUNXI
-	default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3
-	default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL  || MX6SX || MX6UL || MX6ULL)
-	default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL  || MX6SX || MX6UL || MX6ULL)
-	default 0x80800000 if ARCH_MX7
-	default 0x90000000 if FSL_LSCH2 || FSL_LSCH3
-	help
-	  Address in memory to use as the default safe load address.
-
-config ERR_PTR_OFFSET
-	hex
-	default 0x0
-	help
-	  Some U-Boot pointers have redundant information, so we can use a
-	  scheme where we can return either an error code or a pointer with the
-	  same return value. The default implementation just casts the pointer
-	  to a number, however, this may fail on platforms where the end of the
-	  address range is used for valid pointers (e.g. 0xffffff00 is a valid
-	  heap pointer in socfpga SPL).
-	  For such platforms, this value provides an upper range of those error
-	  pointer values - up to 'MAX_ERRNO' bytes below this value must be
-	  unused/invalid addresses.
-
-config PLATFORM_ELFENTRY
-	string
-	default "__start" if MIPS
-	default "_start"
-
-config STACK_SIZE
-	hex "Define max stack size that can be used by U-Boot"
-	default 0x4000000 if ARCH_VERSAL || ARCH_ZYNQMP
-	default 0x200000 if MICROBLAZE
-	default 0x1000000
-	help
-	  Define Max stack size that can be used by U-Boot. This value is used
-	  by the UEFI sub-system. On some boards initrd_high is calculated as
-	  base stack pointer minus this stack size.
-
-config SYS_MEM_TOP_HIDE
-	hex "Exclude some memory from U-Boot / OS information"
-	default 0x0
-	help
-	  If set, this specified memory area will get subtracted from the top
-	  (end) of RAM and won't get "touched" at all by U-Boot. By fixing up
-	  gd->ram_size the OS / next stage should gets passed the now
-	  "corrected" memory size and won't touch it either.
-	  WARNING: Please make sure that this value is a multiple of the OS
-	  page size.
-
-config SYS_HAS_SRAM
-	bool
-	default y if TARGET_PIC32MZDASK
-	default y if TARGET_DEVKIT8000
-	default y if TARGET_TRICORDER
-	help
-	  Enable this to allow support for the on board SRAM.
-	  SRAM base address is controlled by CONFIG_SYS_SRAM_BASE.
-	  SRAM size is controlled by CONFIG_SYS_SRAM_SIZE.
-
-config SYS_SRAM_BASE
-	hex
-	default 0x80000000 if TARGET_PIC32MZDASK
-	default 0x40200000 if TARGET_DEVKIT8000
-	default 0x40200000 if TARGET_TRICORDER
-	default 0x0
-
-config SYS_SRAM_SIZE
-	hex
-	default 0x00080000 if TARGET_PIC32MZDASK
-	default 0x10000 if TARGET_DEVKIT8000
-	default 0x10000 if TARGET_TRICORDER
-	default 0x0
-
-config MP
-	bool "Support for multiprocessor"
-	help
-	  This provides an option to bringup different processors
-	  in multiprocessor cases.
-
-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/.
+	  large physical address extention on 32bit SoCs.
 
 endmenu		# General setup
 
-source "api/Kconfig"
+menu "Boot images"
 
-source "boot/Kconfig"
+config SUPPORT_SPL
+	bool
+
+config SUPPORT_TPL
+	bool
+
+config SPL
+	bool
+	depends on SUPPORT_SPL
+	prompt "Enable SPL"
+	help
+	  If you want to build SPL as well as the normal image, say Y.
+
+config SPL_SYS_MALLOC_SIMPLE
+	bool
+	depends on SPL
+	prompt "Only use malloc_simple functions in the SPL"
+	help
+	  Say Y here to only use the *_simple malloc functions from
+	  malloc_simple.c, rather then using the versions from dlmalloc.c;
+	  this will make the SPL binary smaller at the cost of more heap
+	  usage as the *_simple malloc functions do not re-use free-ed mem.
+
+config SPL_STACK_R
+	depends on SPL
+	bool "Enable SDRAM location for SPL stack"
+	help
+	  SPL starts off execution in SRAM and thus typically has only a small
+	  stack available. Since SPL sets up DRAM while in its board_init_f()
+	  function, it is possible for the stack to move there before
+	  board_init_r() is reached. This option enables a special SDRAM
+	  location for the SPL stack. U-Boot SPL switches to this after
+	  board_init_f() completes, and before board_init_r() starts.
+
+config SPL_STACK_R_ADDR
+	depends on SPL_STACK_R
+	hex "SDRAM location for SPL stack"
+	help
+	  Specify the address in SDRAM for the SPL stack. This will be set up
+	  before board_init_r() is called.
+
+config SPL_STACK_R_MALLOC_SIMPLE_LEN
+	depends on SPL_STACK_R && SPL_SYS_MALLOC_SIMPLE
+	hex "Size of malloc_simple heap after switching to DRAM SPL stack"
+	default 0x100000
+	help
+	  Specify the amount of the stack to use as memory pool for
+	  malloc_simple after switching the stack to DRAM. This may be set
+	  to give board_init_r() a larger heap then the initial heap in
+	  SRAM which is limited to SYS_MALLOC_F_LEN bytes.
+
+config SPL_SEPARATE_BSS
+	depends on SPL
+	bool "BSS section is in a different memory region from text"
+	help
+	  Some platforms need a large BSS region in SPL and can provide this
+	  because RAM is already set up. In this case BSS can be moved to RAM.
+	  This option should then be enabled so that the correct device tree
+	  location is used. Normally we put the device tree at the end of BSS
+	  but with this option enabled, it goes at _image_binary_end.
+
+config TPL
+	bool
+	depends on SPL && SUPPORT_TPL
+	prompt "Enable TPL"
+	help
+	  If you want to build TPL as well as the normal image and SPL, say Y.
+
+config FIT
+	bool "Support Flattened Image Tree"
+	help
+	  This option allows to boot the new uImage structrure,
+	  Flattened Image Tree.  FIT is formally a FDT, which can include
+	  images of various types (kernel, FDT blob, ramdisk, etc.)
+	  in a single blob.  To boot this new uImage structure,
+	  pass the address of the blob to the "bootm" command.
+	  FIT is very flexible, supporting compression, multiple images,
+	  multiple configurations, verification through hashing and also
+	  verified boot (secure boot using RSA). This option enables that
+	  feature.
+
+config SPL_FIT
+	bool "Support Flattened Image Tree within SPL"
+	depends on FIT
+	depends on SPL
+
+config FIT_VERBOSE
+	bool "Display verbose messages on FIT boot"
+	depends on FIT
+
+config FIT_SIGNATURE
+	bool "Enable signature verification of FIT uImages"
+	depends on FIT
+	depends on DM
+	select RSA
+	help
+	  This option enables signature verification of FIT uImages,
+	  using a hash signed and verified using RSA. If
+	  CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive
+	  hashing is available using hardware, then then RSA library will use
+	  it. See doc/uImage.FIT/signature.txt for more details.
+
+	  WARNING: When relying on signed FIT images with a required signature
+	  check the legacy image format is disabled by default, so that
+	  unsigned images cannot be loaded. If a board needs the legacy image
+	  format support in this case, enable it using
+	  CONFIG_IMAGE_FORMAT_LEGACY.
+
+config SPL_FIT_SIGNATURE
+	bool "Enable signature verification of FIT firmware within SPL"
+	depends on SPL_FIT
+	depends on SPL_DM
+	select SPL_RSA
+
+config FIT_BEST_MATCH
+	bool "Select the best match for the kernel device tree"
+	depends on FIT
+	help
+	  When no configuration is explicitly selected, default to the
+	  one whose fdt's compatibility field best matches that of
+	  U-Boot itself. A match is considered "best" if it matches the
+	  most specific compatibility entry of U-Boot's fdt's root node.
+	  The order of entries in the configuration's fdt is ignored.
+
+config FIT_VERBOSE
+	bool "Show verbose messages when FIT images fails"
+	depends on FIT
+	help
+	  Generally a system will have valid FIT images so debug messages
+	  are a waste of code space. If you are debugging your images then
+	  you can enable this option to get more verbose information about
+	  failures.
+
+config OF_BOARD_SETUP
+	bool "Set up board-specific details in device tree before boot"
+	depends on OF_LIBFDT
+	help
+	  This causes U-Boot to call ft_board_setup() before booting into
+	  the Operating System. This function can set up various
+	  board-specific information in the device tree for use by the OS.
+	  The device tree is then passed to the OS.
+
+config OF_SYSTEM_SETUP
+	bool "Set up system-specific details in device tree before boot"
+	depends on OF_LIBFDT
+	help
+	  This causes U-Boot to call ft_system_setup() before booting into
+	  the Operating System. This function can set up various
+	  system-specific information in the device tree for use by the OS.
+	  The device tree is then passed to the OS.
+
+config OF_STDOUT_VIA_ALIAS
+	bool "Update the device-tree stdout alias from U-Boot"
+	depends on OF_LIBFDT
+	help
+	  This uses U-Boot's serial alias from the aliases node to update
+	  the device tree passed to the OS. The "linux,stdout-path" property
+	  in the chosen node is set to point to the correct serial node.
+	  This option currently references CONFIG_CONS_INDEX, which is
+	  incorrect when used with device tree as this option does not
+	  exist / should not be used.
+
+config SYS_EXTRA_OPTIONS
+	string "Extra Options (DEPRECATED)"
+	help
+	  The old configuration infrastructure (= mkconfig + boards.cfg)
+	  provided the extra options field. If you have something like
+	  "HAS_BAR,BAZ=64", the optional options
+	    #define CONFIG_HAS
+	    #define CONFIG_BAZ	64
+	  will be defined in include/config.h.
+	  This option was prepared for the smooth migration from the old
+	  configuration to Kconfig. Since this option will be removed sometime,
+	  new boards should not use this option.
+
+config SYS_TEXT_BASE
+	depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
+		(M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
+	depends on !EFI_APP
+	hex "Text Base"
+	help
+	  TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
+
+config SPL_LOAD_FIT
+	bool "Enable SPL loading U-Boot as a FIT"
+	depends on FIT
+	help
+	  Normally with the SPL framework a legacy image is generated as part
+	  of the build. This contains U-Boot along with information as to
+	  where it should be loaded. This option instead enables generation
+	  of a FIT (Flat Image Tree) which provides more flexibility. In
+	  particular it can handle selecting from multiple device tree
+	  and passing the correct one to U-Boot.
+
+config SPL_FIT_IMAGE_POST_PROCESS
+	bool "Enable post-processing of FIT artifacts after loading by the SPL"
+	depends on SPL_LOAD_FIT && TI_SECURE_DEVICE
+	help
+	  Allows doing any sort of manipulation to blobs after they got extracted
+	  from the U-Boot FIT image like stripping off headers or modifying the
+	  size of the blob, verification, authentication, decryption etc. in a
+	  platform or board specific way. In order to use this feature a platform
+	  or board-specific implementation of board_fit_image_post_process() must
+	  be provided. Also, anything done during this post-processing step would
+	  need to be comprehended in how the images were prepared before being
+	  injected into the FIT creation (i.e. the blobs would have been pre-
+	  processed before being added to the FIT image).
+
+config FIT_IMAGE_POST_PROCESS
+	bool "Enable post-processing of FIT artifacts after loading by U-Boot"
+	depends on FIT && TI_SECURE_DEVICE
+	help
+	  Allows doing any sort of manipulation to blobs after they got extracted
+	  from FIT images like stripping off headers or modifying the size of the
+	  blob, verification, authentication, decryption etc. in a platform or
+	  board specific way. In order to use this feature a platform or board-
+	  specific implementation of board_fit_image_post_process() must be
+	  provided. Also, anything done during this post-processing step would
+	  need to be comprehended in how the images were prepared before being
+	  injected into the FIT creation (i.e. the blobs would have been pre-
+	  processed before being added to the FIT image).
+
+config SYS_CLK_FREQ
+	depends on ARC || ARCH_SUNXI
+	int "CPU clock frequency"
+	help
+	  TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
+
+config ARCH_FIXUP_FDT
+	bool "Enable arch_fixup_fdt() call"
+	depends on ARM || MIPS
+	default y
+	help
+	  Enable FDT memory map syncup before OS boot. This feature can be
+	  used for booting OS with different memory setup where the part of
+	  the memory location should be used for different purpose.
+
+endmenu		# Boot images
 
 source "common/Kconfig"
 
 source "cmd/Kconfig"
 
-source "disk/Kconfig"
-
 source "dts/Kconfig"
 
-source "env/Kconfig"
-
 source "net/Kconfig"
 
 source "drivers/Kconfig"
@@ -579,5 +391,3 @@ source "fs/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"
-
-source "tools/Kconfig"

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,8 +0,0 @@
-menu "API"
-
-config API
-	bool "Enable U-Boot API"
-	help
-	  This option enables the U-Boot API. See api/README for more information.
-
-endmenu

api/Makefile

@@ -1,6 +1,8 @@
-# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2007 Semihalf
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
 obj-y += api.o api_display.o api_net.o api_storage.o
 obj-$(CONFIG_ARM) += api_platform-arm.o

api/api.c

@@ -1,20 +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 <common.h>
-#include <env.h>
 #include <malloc.h>
-#include <env_internal.h>
-#include <linux/delay.h>
+#include <environment.h>
 #include <linux/types.h>
 #include <api_public.h>
-#include <u-boot/crc.h>
 
 #include "api_private.h"
 
@@ -57,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;
 }
 
@@ -297,31 +295,27 @@ static int API_dev_close(va_list ap)
 
 
 /*
+ * 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 */
@@ -339,36 +333,23 @@ 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;
@@ -477,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;
 }
@@ -500,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;
 }
@@ -514,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;
 }
 
 /*
@@ -642,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;
@@ -679,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;
@@ -691,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,12 +1,11 @@
-// 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 <lcd.h>
-#include <log.h>
 #include <video_font.h> /* Get font width and height */
 
 /* lcd.h needs BMP_LOGO_HEIGHT to calculate CONSOLE_ROWS */

api/api_net.c

@@ -1,8 +1,9 @@
-// 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>
@@ -11,6 +12,8 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define DEBUG
 #undef DEBUG
 

api/api_platform-arm.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 ARM-dependent sources
  * (bd_info etc.)
  */

api/api_platform-mips.c

@@ -1,7 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
  * (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
  */
 
@@ -24,7 +25,8 @@ DECLARE_GLOBAL_DATA_PTR;
 int platform_sys_info(struct sys_info *si)
 {
 
-	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);
 
 	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.)
  */
@@ -29,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
@@ -42,7 +46,7 @@ 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);
 

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>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
@@ -38,19 +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, "" }, };
 
-#ifndef CONFIG_SYS_MMC_MAX_DEVICE
-#define CONFIG_SYS_MMC_MAX_DEVICE	1
-#endif
 
 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;
@@ -64,7 +60,7 @@ 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;
@@ -72,7 +68,7 @@ void dev_stor_init(void)
 	specs[ENUM_SATA].name = "sata";
 #endif
 #if defined(CONFIG_SCSI)
-	specs[ENUM_SCSI].max_dev = SCSI_MAX_DEVICE;
+	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;
@@ -92,72 +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;
@@ -171,8 +183,9 @@ static int dev_stor_type(struct blk_desc *dd)
 }
 
 
-/* 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;
@@ -203,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) {
@@ -221,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;
@@ -235,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
 			 */
@@ -245,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);
@@ -262,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");
 
@@ -283,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;
@@ -340,38 +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,296 +1,92 @@
-config ARCH_MAP_SYSMEM
-	depends on SANDBOX
-	def_bool y
-
 config CREATE_ARCH_SYMLINK
 	bool
 
 config HAVE_ARCH_IOREMAP
 	bool
 
-config NEEDS_MANUAL_RELOC
-	bool
-
-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 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
-	default 32 if MIPS
-
-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
 
 config ARM
 	bool "ARM architecture"
-	select ARCH_SUPPORTS_LTO
 	select CREATE_ARCH_SYMLINK
 	select HAVE_PRIVATE_LIBGCC if !ARM64
-	select SUPPORT_ACPI
 	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 NEEDS_MANUAL_RELOC
-	select SYS_BOOT_GET_CMDLINE
-	select SYS_BOOT_GET_KBD
-	select SYS_CACHE_SHIFT_4
-	select SUPPORT_OF_CONTROL
 
 config MICROBLAZE
 	bool "MicroBlaze architecture"
-	select NEEDS_MANUAL_RELOC
 	select SUPPORT_OF_CONTROL
-	imply CMD_IRQ
 
 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
-	imply DM_EVENT
-	select OF_CONTROL
 	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_OF_CONTROL
-	select SYS_BOOT_GET_CMDLINE
-	select SYS_BOOT_GET_KBD
-
-config RISCV
-	bool "RISC-V architecture"
-	select CREATE_ARCH_SYMLINK
-	select SUPPORT_OF_CONTROL
-	select OF_CONTROL
-	select DM
-	select SPL_SEPARATE_BSS if SPL
-	imply DM_SERIAL
-	imply DM_ETH
-	imply DM_EVENT
-	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 ARCH_SUPPORTS_LTO
-	select BOARD_LATE_INIT
-	select BZIP2
-	select CMD_POWEROFF
-	select DM
-	select DM_GPIO
-	select DM_I2C
-	select DM_KEYBOARD
-	select DM_MMC
-	select DM_SERIAL
-	select DM_SPI
-	select DM_SPI_FLASH
-	select GZIP_COMPRESSED
-	select HAVE_BLOCK_DEVICE
-	select LZO
-	select OF_BOARD_SETUP
-	select PCI_ENDPOINT
-	select SPI
 	select SUPPORT_OF_CONTROL
-	select SYSRESET_CMD_POWEROFF
-	select SYS_CACHE_SHIFT_4
-	select IRQ
-	select SUPPORT_EXTENSION_SCAN
-	select SUPPORT_ACPI
-	imply BITREVERSE
-	select BLOBLIST
-	imply LTO
-	imply CMD_DM
-	imply CMD_EXCEPTION
-	imply CMD_GETTIME
-	imply CMD_HASH
-	imply CMD_IO
-	imply CMD_IOTRACE
-	imply CMD_LZMADEC
-	imply CMD_SATA
-	imply CMD_SF
-	imply CMD_SF_TEST
-	imply CRC32_VERIFY
-	imply FAT_WRITE
-	imply FIRMWARE
-	imply HASH_VERIFY
-	imply LZMA
-	imply TEE
-	imply AVB_VERIFY
-	imply LIBAVB
-	imply CMD_AVB
-	imply PARTITION_TYPE_GUID
-	imply SCP03
-	imply CMD_SCP03
-	imply UDP_FUNCTION_FASTBOOT
-	imply VIRTIO_MMIO
-	imply VIRTIO_PCI
-	imply VIRTIO_SANDBOX
-	imply VIRTIO_BLK
-	imply VIRTIO_NET
-	imply DM_SOUND
-	imply PCI_SANDBOX_EP
-	imply PCH
-	imply PHYLIB
-	imply DM_MDIO
-	imply DM_MDIO_MUX
-	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 KEYBOARD
-	imply PHYSMEM
-	imply GENERATE_ACPI_TABLE
-	imply BINMAN
+	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 HAVE_PRIVATE_LIBGCC
-	select SUPPORT_OF_CONTROL
+
+config SPARC
+	bool "SPARC architecture"
+	select CREATE_ARCH_SYMLINK
 
 config X86
 	bool "x86 architecture"
-	select SUPPORT_SPL
-	select SUPPORT_TPL
 	select CREATE_ARCH_SYMLINK
-	select DM
-	select HAVE_ARCH_IOMAP
 	select HAVE_PRIVATE_LIBGCC
-	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 CMD_ZBOOT
-	imply DM_ETH
-	imply DM_EVENT
-	imply DM_GPIO
-	imply DM_KEYBOARD
-	imply DM_MMC
-	imply DM_RTC
-	imply DM_SCSI
-	imply DM_SERIAL
-	imply DM_SPI
-	imply DM_SPI_FLASH
-	imply DM_USB
-	imply DM_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 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"
@@ -355,95 +151,19 @@ config SYS_CONFIG_NAME
 	  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 SYS_CCSRBAR_DEFAULT
-	help
-	  Address for the Internal Memory-Mapped Registers (IMMR) window used
-	  to configure the features of many Freescale / NXP SoCs.
-
-config SKIP_LOWLEVEL_INIT
-	bool "Skip the calls to certain low level initialization functions"
-	depends on ARM || MIPS || RISCV
-	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 the calls to certain low level initialization functions"
-	depends on SPL && (ARM || MIPS || RISCV)
-	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 the calls to certain low level initialization functions"
-	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 the 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 the call to lowlevel_init during early 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 the call to lowlevel_init during early 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.
-
 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"
-
-source "board/keymile/Kconfig"

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.
 
@@ -104,83 +104,35 @@ endchoice
 
 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,6 +1,8 @@
-# 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
@@ -9,24 +11,49 @@ 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
 
+ifeq ($(CROSS_COMPILE),)
+CROSS_COMPILE := $(ARC_CROSS_COMPILE)
+endif
+
 ifdef CONFIG_ARC_MMU_VER
 CONFIG_MMU = 1
 endif
 
-PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 -mno-sdata
-PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common
+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_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*)))

arch/arc/dts/.gitignore

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

arch/arc/dts/Makefile

@@ -1,14 +1,10 @@
-# 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)
 

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>;
-			u-boot,dm-pre-reloc;
-		};
-	};
-
 	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>;
-			u-boot,dm-pre-reloc;
-		};
-	};
-};
-

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>;
-			u-boot,dm-pre-reloc;
-		};
-	};
-};
-

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>;
-		u-boot,dm-pre-reloc;
-
-		clocks {
-			compatible = "simple-bus";
-			u-boot,dm-pre-reloc;
-
-			apbclk: apbclk {
-				compatible = "fixed-clock";
-				clock-frequency = <50000000>;
-				#clock-cells = <0>;
-			};
-
-			uartclk: uartclk {
-				compatible = "fixed-clock";
-				clock-frequency = <33333333>;
-				#clock-cells = <0>;
-				u-boot,dm-pre-reloc;
-			};
-
-			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>;
-			u-boot,dm-pre-reloc;
-		};
-	};
-
-	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>;
-			u-boot,dm-pre-reloc;
-		};
-	};
-
-	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>;
-			u-boot,dm-pre-reloc;
-		};
-	};
-
-	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>;
-			u-boot,dm-pre-reloc;
-		};
+	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>;
-		u-boot,dm-pre-reloc;
-
-		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,77 +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__
-
-#include <config.h>
-
-union bcr_di_cache {
-	struct {
-#ifdef CONFIG_CPU_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_CPU_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_CPU_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_CPU_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_CPU_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,13 +1,13 @@
-/* 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
 #define _ASM_ARC_ARCREGS_H
 
 #include <asm/cache.h>
-#include <config.h>
 
 /*
  * ARC architecture has additional address space - auxiliary registers.
@@ -16,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
@@ -44,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 */
@@ -83,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,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_CACHE_H
@@ -29,20 +30,6 @@
 #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,11 +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,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_GLOBAL_DATA_H
@@ -9,10 +10,6 @@
 #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__ */
 

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,130 +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
@@ -184,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))
@@ -249,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

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,80 +1,93 @@
-// 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 <bootstage.h>
-#include <env.h>
-#include <image.h>
-#include <irq_func.h>
-#include <log.h>
-#include <asm/cache.h>
-#include <asm/global_data.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(bootm_headers_t *images) { return 0; }
-
 /* Subcommand: PREP */
-static int boot_prep_linux(bootm_headers_t *images)
+static void boot_prep_linux(bootm_headers_t *images)
 {
-	int ret;
-
-	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(bootm_headers_t *images, int flag)
 {
-	ulong kernel_entry;
+	void (*kernel_entry)(int zero, int arch, uint params);
 	unsigned int r0, r2;
 	int fake = (flag & BOOTM_STATE_OS_FAKE_GO);
 
-	kernel_entry = images->ep;
+	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);
 
 	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 (!fake)
-		board_jump_and_run(kernel_entry, r0, 0, r2);
+		kernel_entry(r0, 0, r2);
 }
 
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
@@ -83,13 +96,17 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	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 <common.h>
-#include <clock_legacy.h>
-#include <init.h>
-#include <malloc.h>
-#include <vsprintf.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
-#include <asm/global_data.h>
-#include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -19,7 +14,7 @@ int arch_cpu_init(void)
 {
 	timer_init();
 
-	gd->cpu_clk = get_board_sys_clk();
+	gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
 	gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
 
 	cache_init();
@@ -27,200 +22,9 @@ int arch_cpu_init(void)
 	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,15 +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 <common.h>
-#include <irq_func.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>

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,18 +1,15 @@
-// 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-generic/sections.h>
-#include <asm/global_data.h>
 
 extern ulong __image_copy_start;
-extern ulong __ivt_start;
 extern ulong __ivt_end;
-extern ulong __text_end;
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -20,9 +17,6 @@ int copy_uboot_to_ram(void)
 {
 	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);
 
 	return 0;
@@ -46,13 +40,10 @@ 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;
-
 	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 {
@@ -61,28 +52,15 @@ int do_elf_reloc_fixups(void)
 
 		/* 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;
+		    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
@@ -92,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,23 +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 <common.h>
-#include <cpu_func.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;
 }

arch/arc/lib/start.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+
  */
 
 #include <asm-offsets.h>
@@ -16,38 +17,26 @@ ENTRY(_start)
 	lr	r5, [ARC_BCR_IC_BUILD]
 	breq	r5, 0, 1f		; I$ doesn't exist
 	lr	r5, [ARC_AUX_IC_CTRL]
-#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)
+#ifndef CONFIG_SYS_ICACHE_OFF
 	bclr	r5, r5, 0		; 0 - Enable, 1 is Disable
 #else
 	bset	r5, r5, 0		; I$ exists, but is not used
 #endif
 	sr	r5, [ARC_AUX_IC_CTRL]
 
-	mov	r5, 1
-	sr	r5, [ARC_AUX_IC_IVIC]
-	; As per ARC HS databook (see chapter 5.3.3.2)
-	; it is required to add 3 NOPs after each write to IC_IVIC.
-	nop
-	nop
-	nop
-
 1:
 	; Disable/enable D-cache according to configuration
 	lr	r5, [ARC_BCR_DC_BUILD]
 	breq	r5, 0, 1f		; D$ doesn't exist
 	lr	r5, [ARC_AUX_DC_CTRL]
 	bclr	r5, r5, 6		; Invalidate (discard w/o wback)
-#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
+#ifndef CONFIG_SYS_DCACHE_OFF
 	bclr	r5, r5, 0		; Enable (+Inv)
 #else
 	bset	r5, r5, 0		; Disable (+Inv)
 #endif
 	sr	r5, [ARC_AUX_DC_CTRL]
 
-	mov	r5, 1
-	sr	r5, [ARC_AUX_DC_IVDC]
-
-
 1:
 #ifdef CONFIG_ISA_ARCV2
 	; Disable System-Level Cache (SLC)
@@ -61,30 +50,6 @@ ENTRY(_start)
 1:
 #endif
 
-#ifdef CONFIG_ISA_ARCV2
-	; In case of DSP extension presence in HW some instructions
-	; (related to integer multiply, multiply-accumulate, and divide
-	; operation) executes on this DSP execution unit. So their
-	; execution will depend on dsp configuration register (DSP_CTRL)
-	; As we want these instructions to execute the same way regardless
-	; of DSP presence we need to set DSP_CTRL properly.
-	lr	r5, [ARC_AUX_DSP_BUILD]
-	bmsk	r5, r5, 7
-	breq    r5, 0, 1f
-	mov	r5, 0
-	sr	r5, [ARC_AUX_DSP_CTRL]
-1:
-#endif
-
-#ifdef __ARC_UNALIGNED__
-	/*
-	 * Enable handling of unaligned access in the CPU as by default
-	 * this HW feature is disabled while GCC starting from 8.1.0
-	 * unconditionally uses it for ARC HS cores.
-	 */
-	flag	1 << STATUS_AD_BIT
-#endif
-
 	/* Establish C runtime stack and frame */
 	mov	%sp, CONFIG_SYS_INIT_SP_ADDR
 	mov	%fp, %sp
@@ -99,20 +64,9 @@ ENTRY(_start)
 	/* Initialize reserved area - note: r0 already contains address */
 	bl	board_init_f_init_reserve
 
-#ifdef CONFIG_DEBUG_UART
-	/* Earliest point to set up early debug uart */
-	bl	debug_uart_init
-#endif
-
 	/* Zero the one and only argument of "board_init_f" */
 	mov_s	%r0, 0
-	bl	board_init_f
-
-	/* We only get here if relocation is disabled by GD_FLG_SKIP_RELOC */
-	/* Make sure we don't lose GD overwritten by zero new GD */
-	mov	%r0, %r25
-	mov	%r1, 0
-	bl	board_init_r
+	j	board_init_f
 ENDPROC(_start)
 
 /*

arch/arc/lib/strchr-700.S

@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * ARC700 has a relatively long pipeline and branch prediction, so we want
+ * to avoid branches that are hard to predict.  On the other hand, the
+ * presence of the norm instruction makes it easier to operate on whole
+ * words branch-free.
+ */
+
+.global strchr
+.align 4
+strchr:
+	extb_s	%r1, %r1
+	asl	%r5, %r1, 8
+	bmsk	%r2, %r0, 1
+	or	%r5, %r5, %r1
+	mov_s	%r3, 0x01010101
+	breq.d	%r2, %r0, .Laligned
+	asl	%r4, %r5, 16
+	sub_s	%r0, %r0, %r2
+	asl	%r7, %r2, 3
+	ld_s	%r2, [%r0]
+#ifdef __LITTLE_ENDIAN__
+	asl	%r7, %r3, %r7
+#else /* __BIG_ENDIAN__ */
+	lsr	%r7, %r3, %r7
+#endif /* _ENDIAN__ */
+	or	%r5, %r5, %r4
+	ror	%r4, %r3
+	sub	%r12, %r2, %r7
+	bic_s	%r12, %r12, %r2
+	and	%r12, %r12, %r4
+	brne.d	%r12, 0, .Lfound0_ua
+	xor	%r6, %r2, %r5
+	ld.a	%r2, [%r0, 4]
+	sub	%r12, %r6, %r7
+	bic	%r12, %r12, %r6
+#ifdef __LITTLE_ENDIAN__
+	and	%r7, %r12, %r4
+	/* For speed, we want this branch to be unaligned. */
+	breq	%r7, 0, .Loop
+	/* Likewise this one */
+	b	.Lfound_char
+#else /* __BIG_ENDIAN__ */
+	and	%r12, %r12, %r4
+	/* For speed, we want this branch to be unaligned. */
+	breq	%r12, 0, .Loop
+	lsr_s	%r12, %r12, 7
+	bic 	%r2, %r7, %r6
+	b.d	.Lfound_char_b
+	and_s	%r2, %r2, %r12
+#endif /* _ENDIAN__ */
+	/* We require this code address to be unaligned for speed...  */
+.Laligned:
+	ld_s	%r2, [%r0]
+	or	%r5, %r5, %r4
+	ror	%r4, %r3
+	/* ... so that this code address is aligned, for itself and ...  */
+.Loop:
+	sub	%r12, %r2, %r3
+	bic_s	%r12, %r12, %r2
+	and	%r12, %r12, %r4
+	brne.d	%r12, 0, .Lfound0
+	xor	%r6, %r2, %r5
+	ld.a	%r2, [%r0, 4]
+	sub	%r12, %r6, %r3
+	bic	%r12, %r12, %r6
+	and	%r7, %r12, %r4
+	breq	%r7, 0, .Loop
+	/*
+	 *... so that this branch is unaligned.
+	 * Found searched-for character.
+	 * r0 has already advanced to next word.
+	 */
+#ifdef __LITTLE_ENDIAN__
+	/*
+	 * We only need the information about the first matching byte
+	 * (i.e. the least significant matching byte) to be exact,
+	 * hence there is no problem with carry effects.
+	 */
+.Lfound_char:
+	sub	%r3, %r7, 1
+	bic	%r3, %r3, %r7
+	norm	%r2, %r3
+	sub_s	%r0, %r0, 1
+	asr_s	%r2, %r2, 3
+	j.d	[%blink]
+	sub_s	%r0, %r0, %r2
+
+	.balign	4
+.Lfound0_ua:
+	mov	%r3, %r7
+.Lfound0:
+	sub	%r3, %r6, %r3
+	bic	%r3, %r3, %r6
+	and	%r2, %r3, %r4
+	or_s	%r12, %r12, %r2
+	sub_s	%r3, %r12, 1
+	bic_s	%r3, %r3, %r12
+	norm	%r3, %r3
+	add_s	%r0, %r0, 3
+	asr_s	%r12, %r3, 3
+	asl.f	0, %r2, %r3
+	sub_s	%r0, %r0, %r12
+	j_s.d	[%blink]
+	mov.pl	%r0, 0
+#else /* __BIG_ENDIAN__ */
+.Lfound_char:
+	lsr	%r7, %r7, 7
+
+	bic	%r2, %r7, %r6
+.Lfound_char_b:
+	norm	%r2, %r2
+	sub_s	%r0, %r0, 4
+	asr_s	%r2, %r2, 3
+	j.d	[%blink]
+	add_s	%r0, %r0, %r2
+
+.Lfound0_ua:
+	mov_s	%r3, %r7
+.Lfound0:
+	asl_s	%r2, %r2, 7
+	or	%r7, %r6, %r4
+	bic_s	%r12, %r12, %r2
+	sub	%r2, %r7, %r3
+	or	%r2, %r2, %r6
+	bic	%r12, %r2, %r12
+	bic.f	%r3, %r4, %r12
+	norm	%r3, %r3
+
+	add.pl	%r3, %r3, 1
+	asr_s	%r12, %r3, 3
+	asl.f	0, %r2, %r3
+	add_s	%r0, %r0, %r12
+	j_s.d	[%blink]
+	mov.mi	%r0, 0
+#endif /* _ENDIAN__ */

arch/arc/lib/strcmp.S

@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * This is optimized primarily for the ARC700.
+ * It would be possible to speed up the loops by one cycle / word
+ * respective one cycle / byte by forcing double source 1 alignment, unrolling
+ * by a factor of two, and speculatively loading the second word / byte of
+ * source 1; however, that would increase the overhead for loop setup / finish,
+ * and strcmp might often terminate early.
+ */
+
+.global strcmp
+.align 4
+strcmp:
+	or	%r2, %r0, %r1
+	bmsk_s	%r2, %r2, 1
+	brne	%r2, 0, .Lcharloop
+	mov_s	%r12, 0x01010101
+	ror	%r5, %r12
+.Lwordloop:
+	ld.ab	%r2, [%r0, 4]
+	ld.ab	%r3, [%r1, 4]
+	nop_s
+	sub	%r4, %r2, %r12
+	bic	%r4, %r4, %r2
+	and	%r4, %r4, %r5
+	brne	%r4, 0, .Lfound0
+	breq	%r2 ,%r3, .Lwordloop
+#ifdef	__LITTLE_ENDIAN__
+	xor	%r0, %r2, %r3	/* mask for difference */
+	sub_s	%r1, %r0, 1
+	bic_s	%r0, %r0, %r1	/* mask for least significant difference bit */
+	sub	%r1, %r5, %r0
+	xor	%r0, %r5, %r1	/* mask for least significant difference byte */
+	and_s	%r2, %r2, %r0
+	and_s	%r3, %r3, %r0
+#endif /* _ENDIAN__ */
+	cmp_s	%r2, %r3
+	mov_s	%r0, 1
+	j_s.d	[%blink]
+	bset.lo	%r0, %r0, 31
+
+	.balign	4
+#ifdef __LITTLE_ENDIAN__
+.Lfound0:
+	xor	%r0, %r2, %r3	/* mask for difference */
+	or	%r0, %r0, %r4	/* or in zero indicator */
+	sub_s	%r1, %r0, 1
+	bic_s	%r0, %r0, %r1	/* mask for least significant difference bit */
+	sub	%r1, %r5, %r0
+	xor	%r0, %r5, %r1	/* mask for least significant difference byte */
+	and_s	%r2, %r2, %r0
+	and_s	%r3, %r3, %r0
+	sub.f	%r0, %r2, %r3
+	mov.hi	%r0, 1
+	j_s.d	[%blink]
+	bset.lo	%r0, %r0, 31
+#else /* __BIG_ENDIAN__ */
+	/*
+	 * The zero-detection above can mis-detect 0x01 bytes as zeroes
+	 * because of carry-propagateion from a lower significant zero byte.
+	 * We can compensate for this by checking that bit0 is zero.
+	 * This compensation is not necessary in the step where we
+	 * get a low estimate for r2, because in any affected bytes
+	 * we already have 0x00 or 0x01, which will remain unchanged
+	 * when bit 7 is cleared.
+	 */
+	.balign	4
+.Lfound0:
+	lsr	%r0, %r4, 8
+	lsr_s	%r1, %r2
+	bic_s	%r2, %r2, %r0	/* get low estimate for r2 and get ... */
+	bic_s	%r0, %r0, %r1	/* <this is the adjusted mask for zeros> */
+	or_s	%r3, %r3, %r0	/* ... high estimate r3 so that r2 > r3 will */
+	cmp_s	%r3, %r2	/* ... be independent of trailing garbage */
+	or_s	%r2, %r2, %r0	/* likewise for r3 > r2 */
+	bic_s	%r3, %r3, %r0
+	rlc	%r0, 0		/* r0 := r2 > r3 ? 1 : 0 */
+	cmp_s	%r2, %r3
+	j_s.d	[%blink]
+	bset.lo	%r0, %r0, 31
+#endif /* _ENDIAN__ */
+
+	.balign	4
+.Lcharloop:
+	ldb.ab	%r2,[%r0,1]
+	ldb.ab	%r3,[%r1,1]
+	nop_s
+	breq	%r2, 0, .Lcmpend
+	breq	%r2, %r3, .Lcharloop
+.Lcmpend:
+	j_s.d	[%blink]
+	sub	%r0, %r2, %r3

arch/arc/lib/strcpy-700.S

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * If dst and src are 4 byte aligned, copy 8 bytes at a time.
+ * If the src is 4, but not 8 byte aligned, we first read 4 bytes to get
+ * it 8 byte aligned.  Thus, we can do a little read-ahead, without
+ * dereferencing a cache line that we should not touch.
+ * Note that short and long instructions have been scheduled to avoid
+ * branch stalls.
+ * The beq_s to r3z could be made unaligned & long to avoid a stall
+ * there, but it is not likely to be taken often, and it would also be likely
+ * to cost an unaligned mispredict at the next call.
+ */
+
+.global strcpy
+.align 4
+strcpy:
+	or	%r2, %r0, %r1
+	bmsk_s	%r2, %r2, 1
+	brne.d	%r2, 0, charloop
+	mov_s	%r10, %r0
+	ld_s	%r3, [%r1, 0]
+	mov	%r8, 0x01010101
+	bbit0.d	%r1, 2, loop_start
+	ror	%r12, %r8
+	sub	%r2, %r3, %r8
+	bic_s	%r2, %r2, %r3
+	tst_s	%r2,%r12
+	bne	r3z
+	mov_s	%r4,%r3
+	.balign 4
+loop:
+	ld.a	%r3, [%r1, 4]
+	st.ab	%r4, [%r10, 4]
+loop_start:
+	ld.a	%r4, [%r1, 4]
+	sub	%r2, %r3, %r8
+	bic_s	%r2, %r2, %r3
+	tst_s	%r2, %r12
+	bne_s	r3z
+	st.ab	%r3, [%r10, 4]
+	sub	%r2, %r4, %r8
+	bic	%r2, %r2, %r4
+	tst	%r2, %r12
+	beq	loop
+	mov_s	%r3, %r4
+#ifdef __LITTLE_ENDIAN__
+r3z:	bmsk.f	%r1, %r3, 7
+	lsr_s	%r3, %r3, 8
+#else /* __BIG_ENDIAN__ */
+r3z:	lsr.f	%r1, %r3, 24
+	asl_s	%r3, %r3, 8
+#endif /* _ENDIAN__ */
+	bne.d	r3z
+	stb.ab	%r1, [%r10, 1]
+	j_s	[%blink]
+
+	.balign	4
+charloop:
+	ldb.ab	%r3, [%r1, 1]
+	brne.d	%r3, 0, charloop
+	stb.ab	%r3, [%r10, 1]
+	j	[%blink]

arch/arc/lib/strlen.S

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+.global strlen
+.align 4
+strlen:
+	or	%r3, %r0, 7
+	ld	%r2, [%r3, -7]
+	ld.a	%r6, [%r3, -3]
+	mov	%r4, 0x01010101
+	/* uses long immediate */
+#ifdef __LITTLE_ENDIAN__
+	asl_s	%r1, %r0, 3
+	btst_s	%r0, 2
+	asl	%r7, %r4, %r1
+	ror	%r5, %r4
+	sub	%r1, %r2, %r7
+	bic_s	%r1, %r1, %r2
+	mov.eq	%r7, %r4
+	sub	%r12, %r6, %r7
+	bic	%r12, %r12, %r6
+	or.eq	%r12, %r12, %r1
+	and	%r12, %r12, %r5
+	brne	%r12, 0, .Learly_end
+#else /* __BIG_ENDIAN__ */
+	ror	%r5, %r4
+	btst_s	%r0, 2
+	mov_s	%r1, 31
+	sub3	%r7, %r1, %r0
+	sub	%r1, %r2, %r4
+	bic_s	%r1, %r1, %r2
+	bmsk	%r1, %r1, %r7
+	sub	%r12, %r6, %r4
+	bic	%r12, %r12, %r6
+	bmsk.ne	%r12, %r12, %r7
+	or.eq	%r12, %r12, %r1
+	and	%r12, %r12, %r5
+	brne	%r12, 0, .Learly_end
+#endif /* _ENDIAN__ */
+
+.Loop:
+	ld_s	%r2, [%r3, 4]
+	ld.a	%r6, [%r3, 8]
+	/* stall for load result */
+	sub	%r1, %r2, %r4
+	bic_s	%r1, %r1, %r2
+	sub	%r12, %r6, %r4
+	bic	%r12, %r12, %r6
+	or	%r12, %r12, %r1
+	and	%r12, %r12, %r5
+	breq	%r12, 0, .Loop
+.Lend:
+	and.f	%r1, %r1, %r5
+	sub.ne	%r3, %r3, 4
+	mov.eq	%r1, %r12
+#ifdef __LITTLE_ENDIAN__
+	sub_s	%r2, %r1, 1
+	bic_s	%r2, %r2, %r1
+	norm	%r1, %r2
+	sub_s	%r0, %r0, 3
+	lsr_s	%r1, %r1, 3
+	sub	%r0, %r3, %r0
+	j_s.d	[%blink]
+	sub	%r0, %r0, %r1
+#else /* __BIG_ENDIAN__ */
+	lsr_s	%r1, %r1, 7
+	mov.eq	%r2, %r6
+	bic_s	%r1, %r1, %r2
+	norm	%r1, %r1
+	sub	%r0, %r3, %r0
+	lsr_s	%r1, %r1, 3
+	j_s.d	[%blink]
+	add	%r0, %r0, %r1
+#endif /* _ENDIAN */
+.Learly_end:
+	b.d	.Lend
+	sub_s.ne %r1, %r1, %r1

arch/arc/lib/timer.c

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <asm/arcregs.h>
+
+#define NH_MODE	(1 << 1)	/* Disable timer if CPU is halted */
+
+int timer_init(void)
+{
+	write_aux_reg(ARC_AUX_TIMER0_CTRL, NH_MODE);
+	/* Set max value for counter/timer */
+	write_aux_reg(ARC_AUX_TIMER0_LIMIT, 0xffffffff);
+	/* Set initial count value and restart counter/timer */
+	write_aux_reg(ARC_AUX_TIMER0_CNT, 0);
+	return 0;
+}
+
+unsigned long timer_read_counter(void)
+{
+	return read_aux_reg(ARC_AUX_TIMER0_CNT);
+}

arch/arm/Makefile

@@ -1,7 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0+
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
 
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy)
-CONFIG_CPU_V7A=
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+CONFIG_CPU_V7=
 CONFIG_CPU_ARM720T=y
 endif
 
@@ -12,21 +14,15 @@ arch-$(CONFIG_CPU_ARM926EJS)	=-march=armv5te
 arch-$(CONFIG_CPU_ARM946ES)	=-march=armv5te
 arch-$(CONFIG_CPU_SA1100)	=-march=armv4
 arch-$(CONFIG_CPU_PXA)		=
-arch-$(CONFIG_CPU_ARM1136)	=-march=armv5t
+arch-$(CONFIG_CPU_ARM1136)	=-march=armv5
 arch-$(CONFIG_CPU_ARM1176)	=-march=armv5t
-arch-$(CONFIG_CPU_V7A)		=$(call cc-option, -march=armv7-a, \
-				 $(call cc-option, -march=armv7))
-arch-$(CONFIG_CPU_V7M)		=-march=armv7-m
-arch-$(CONFIG_CPU_V7R)		=-march=armv7-r
-ifeq ($(CONFIG_ARM64_CRC32),y)
-arch-$(CONFIG_ARM64)		=-march=armv8-a+crc
-else
+arch-$(CONFIG_CPU_V7)		=$(call cc-option, -march=armv7-a, \
+				 $(call cc-option, -march=armv7, -march=armv5))
 arch-$(CONFIG_ARM64)		=-march=armv8-a
-endif
 
 # On Tegra systems we must build SPL for the armv4 core on the device
 # but otherwise we can use the value in CONFIG_SYS_ARM_ARCH
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy)
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
 arch-y += -D__LINUX_ARM_ARCH__=4
 else
 arch-y += -D__LINUX_ARM_ARCH__=$(CONFIG_SYS_ARM_ARCH)
@@ -44,8 +40,7 @@ tune-$(CONFIG_CPU_SA1100)	=-mtune=strongarm1100
 tune-$(CONFIG_CPU_PXA)		=-mcpu=xscale
 tune-$(CONFIG_CPU_ARM1136)	=
 tune-$(CONFIG_CPU_ARM1176)	=
-tune-$(CONFIG_CPU_V7A)		=-mtune=generic-armv7-a
-tune-$(CONFIG_CPU_V7R)		=
+tune-$(CONFIG_CPU_V7)		=
 tune-$(CONFIG_ARM64)		=
 
 # Evaluate tune cc-option calls now
@@ -55,44 +50,29 @@ PLATFORM_CPPFLAGS += $(arch-y) $(tune-y)
 
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
-machine-$(CONFIG_ARCH_APPLE)		+= apple
-machine-$(CONFIG_ARCH_ASPEED)		+= aspeed
 machine-$(CONFIG_ARCH_AT91)		+= at91
 machine-$(CONFIG_ARCH_BCM283X)		+= bcm283x
-machine-$(CONFIG_ARCH_BCMSTB)		+= bcmstb
 machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
 machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
 machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank
-machine-$(CONFIG_ARCH_IPQ40XX)		+= ipq40xx
-machine-$(CONFIG_ARCH_K3)		+= k3
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
-machine-$(CONFIG_ARCH_KIRKWOOD)		+= kirkwood
-machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx
-machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek
+# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
+machine-$(CONFIG_KIRKWOOD)		+= kirkwood
 machine-$(CONFIG_ARCH_MESON)		+= meson
 machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
-machine-$(CONFIG_ARCH_NEXELL)		+= nexell
-machine-$(CONFIG_ARCH_NPCM)             += npcm
-machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
-machine-$(CONFIG_ARCH_ORION5X)		+= orion5x
-machine-$(CONFIG_ARCH_OWL)		+= owl
-machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
-machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
+# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
+# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
+machine-$(CONFIG_ORION5X)		+= orion5x
 machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
+machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
 machine-$(CONFIG_ARCH_SNAPDRAGON)	+= snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
-machine-$(CONFIG_ARCH_STM32)		+= stm32
-machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
-machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
-machine-$(CONFIG_ARCH_TEGRA)		+= tegra
-machine-$(CONFIG_ARCH_U8500)		+= u8500
-machine-$(CONFIG_ARCH_OCTEONTX)		+= octeontx
-machine-$(CONFIG_ARCH_OCTEONTX2)	+= octeontx2
+machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
+machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
+machine-$(CONFIG_STM32)			+= stm32
+machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
-machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
-machine-$(CONFIG_ARCH_ZYNQMP)		+= zynqmp
-machine-$(CONFIG_ARCH_ZYNQMP_R5)	+= zynqmp-r5
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
 
@@ -113,12 +93,12 @@ libs-y += arch/arm/cpu/
 libs-y += arch/arm/lib/
 
 ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 imx8m imx8 imx8ulp imxrt))
-libs-y += arch/arm/mach-imx/
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx31 mx35))
+libs-y += arch/arm/imx-common/
 endif
 else
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs imx8m imx8 imx8ulp imxrt vf610))
-libs-y += arch/arm/mach-imx/
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx31 mx35 mxs vf610))
+libs-y += arch/arm/imx-common/
 endif
 endif