diff options
Diffstat (limited to 'pkgs/misc/uboot/default.nix')
-rw-r--r-- | pkgs/misc/uboot/default.nix | 85 |
1 files changed, 60 insertions, 25 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index f3b6c6aa676..29dfb6558a9 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex -, openssl, swig, armTrustedFirmwareAllwinner, armTrustedFirmwareRK3328 -, armTrustedFirmwareRK3399 +, openssl, swig, meson-tools, armTrustedFirmwareAllwinner +, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399 +, armTrustedFirmwareS905 , buildPackages }: let - defaultVersion = "2019.10"; + defaultVersion = "2020.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; + sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida"; }; buildUBoot = { version ? null @@ -27,19 +28,7 @@ let src = if src == null then defaultSrc else src; - patches = [ - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/ - (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; - sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8"; - }) - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/ - (fetchpatch { - name = "rockchip-allow-loading-larger-kernels.patch"; - url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw"; - sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p"; - }) - ] ++ extraPatches; + patches = extraPatches; postPatch = '' patchShebangs tools @@ -52,7 +41,7 @@ let dtc flex openssl - (buildPackages.python2.withPackages (p: [ p.libfdt ])) + (buildPackages.python3.withPackages (p: [ p.libfdt ])) swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -94,7 +83,7 @@ let homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = with maintainers; [ dezgeg samueldr ]; + maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); @@ -123,6 +112,12 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootAmx335xEVM = buildUBoot { + defconfig = "am335x_evm_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["MLO" "u-boot.img"]; + }; + ubootBananaPi = buildUBoot { defconfig = "Bananapi_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -142,12 +137,6 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBeagleboneBlack = buildUBoot { - defconfig = "am335x_boneblack_defconfig"; - extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["MLO" "u-boot.img"]; - }; - # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master ubootClearfog = buildUBoot { defconfig = "clearfog_defconfig"; @@ -178,6 +167,52 @@ in { filesToInstall = ["u-boot.bin" "SPL"]; }; + # Flashing instructions: + # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=1 count=442 + # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=512 skip=1 seek=1 + # dd if=u-boot.gxbb of=<device> conv=fsync bs=512 seek=97 + ubootOdroidC2 = let + firmwareBlobs = fetchFromGitHub { + owner = "armbian"; + repo = "odroidc2-blobs"; + rev = "47c5aac4bcac6f067cebe76e41fb9924d45b429c"; + sha256 = "1ns0a130yxnxysia8c3q2fgyjp9k0nkr689dxk88qh2vnibgchnp"; + meta.license = lib.licenses.unfreeRedistributableFirmware; + }; + in buildUBoot { + defconfig = "odroid-c2_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin" "u-boot.gxbb" "${firmwareBlobs}/bl1.bin.hardkernel"]; + postBuild = '' + # BL301 image needs at least 64 bytes of padding after it to place + # signing headers (with amlbootsig) + truncate -s 64 bl301.padding.bin + cat '${firmwareBlobs}/gxb/bl301.bin' bl301.padding.bin > bl301.padded.bin + # The downstream fip_create tool adds a custom TOC entry with UUID + # AABBCCDD-ABCD-EFEF-ABCD-12345678ABCD for the BL301 image. It turns out + # that the firmware blob does not actually care about UUIDs, only the + # order the images appear in the file. Because fiptool does not know + # about the BL301 UUID, we would have to use the --blob option, which adds + # the image to the end of the file, causing the boot to fail. Instead, we + # take advantage of the fact that UUIDs are ignored and just put the + # images in the right order with the wrong UUIDs. In the command below, + # --tb-fw is really --scp-fw and --scp-fw is the BL301 image. + # + # See https://github.com/afaerber/meson-tools/issues/3 for more + # information. + '${buildPackages.armTrustedFirmwareTools}/bin/fiptool' create \ + --align 0x4000 \ + --tb-fw '${firmwareBlobs}/gxb/bl30.bin' \ + --scp-fw bl301.padded.bin \ + --soc-fw '${armTrustedFirmwareS905}/bl31.bin' \ + --nt-fw u-boot.bin \ + fip.bin + cat '${firmwareBlobs}/gxb/bl2.package' fip.bin > boot_new.bin + '${buildPackages.meson-tools}/bin/amlbootsig' boot_new.bin u-boot.img + dd if=u-boot.img of=u-boot.gxbb bs=512 skip=96 + ''; + }; + ubootOdroidXU3 = buildUBoot { defconfig = "odroid-xu3_defconfig"; extraMeta.platforms = ["armv7l-linux"]; |