Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 1da25dd10457
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 91b09422cf6f
Choose a head ref
  • 17 commits
  • 10 files changed
  • 3 contributors

Commits on Mar 25, 2018

  1. uboot: 2017.11 -> 2018.03, cross fixes 

    (cherry picked from commit 5804547)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    7c46833 View commit details
    Browse the repository at this point in the history

  2. uboot: add Rock64 support 

    The bootloader is currently non-functional because it lacks the ARM Trusted
Firmware image (bl31.elf).

(cherry picked from commit 6f5a0bd)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    dc01b66 View commit details
    Browse the repository at this point in the history

  3. maintainers: add lopsided98 

    (cherry picked from commit 0264c9b)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    e794f9a View commit details
    Browse the repository at this point in the history

  4. arm-trusted-firmware: init 

    ARM trusted firmware is required as part of the boot process on some ARMv8-A
boards. Currently, only the RK3328 is supported in nixpkgs.

This makes the Rock64 u-boot image bootable.

(cherry picked from commit 0ab76c5)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    94c403f View commit details
    Browse the repository at this point in the history

  5. uboot: add patch to increase maximum path length in extlinux.conf 

    This fixes problems with cross compiled kernels failing to boot.

(cherry picked from commit 1f4bb8c)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    828fdd6 View commit details
    Browse the repository at this point in the history

  6. uboot: rock64: use binary blob for TPL 

    This stops the kernel from crashing immediately after boot.

(cherry picked from commit ba3e470)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    b0abe78 View commit details
    Browse the repository at this point in the history

  7. uboot: sheevplug and guruplug: use mainline U-Boot 

    These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    48ade50 View commit details
    Browse the repository at this point in the history

  8. uboot: fix cross-build of ubootTools 

    (cherry picked from commit 28fd7d9)
    @lopsided98 @dezgeg
    lopsided98 authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    4c669db View commit details
    Browse the repository at this point in the history

  9. U-Boot: Add AArch64 QEMU build 

    See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c6)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    eff6d96 View commit details
    Browse the repository at this point in the history

  10. arm-trusted-firmware: Inits at various versions 

    For qemu, at 1.4 from upstream.

For Sopine / Pine A64-LTS, at 1.0 from fork.

(cherry picked from commit f2175e1)
    @samueldr @dezgeg
    samueldr authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    cf87889 View commit details
    Browse the repository at this point in the history

  11. U-Boot: Add SOPINE Baseboard build 

    This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]

(cherry picked from commit 2ff31f7)
    @samueldr @dezgeg
    samueldr authored and dezgeg committed Mar 25, 2018
    Copy the full SHA
    176d151 View commit details
    Browse the repository at this point in the history

  12. U-Boot: Add Pine64 build 

    (cherry picked from commit 4b77663)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    1896fcf View commit details
    Browse the repository at this point in the history

  13. U-Boot: Make ubootJetsonTK1 install even more files 

    (cherry picked from commit 4fe75d1)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    a68e60f View commit details
    Browse the repository at this point in the history

  14. armTrustedFirmware: Remove targetPlatforms like was done in U-Boot 

    Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289

(cherry picked from commit a2d8a9a)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    298ea40 View commit details
    Browse the repository at this point in the history

  15. armTrustedFirmwareQemu: 1.4 -> 1.5, fixes build with GCC7 

    (cherry picked from commit 107eaa8)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    f2c9a25 View commit details
    Browse the repository at this point in the history

  16. armTrustedFirmware: Disable parallel build 

    I think https://hydra.nixos.org/build/71541345 is parallel build
related.

(cherry picked from commit bab5a06)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    c4597d2 View commit details
    Browse the repository at this point in the history

  17. U-Boot: Disable parallel build 

    https://hydra.nixos.org/build/71880710
(cherry picked from commit 50dc85e)
    @dezgeg
    dezgeg committed Mar 25, 2018
    Copy the full SHA
    91b0942 View commit details
    Browse the repository at this point in the history