Unverified Commit bf25d878 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #249069 from amjoseph-nixpkgs/pr/lib/systems/ubootArch 

lib.systems: add ubootArch
parents 6c681f12 a97e8fc2

lib/systems/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ rec { 
        else if final.isLoongArch64 then "loongarch"

        else final.parsed.cpu.name;



      # https://source.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106

      ubootArch =

        if      final.isx86_32 then "x86"    # not i386

        else if final.isMips64 then "mips64" # uboot *does* distinguish between mips32/mips64

        else final.linuxArch;                # other cases appear to agree with linuxArch



      qemuArch =

        if final.isAarch32 then "arm"

        else if final.isS390 && !final.isS390x then null

pkgs/build-support/kernel/make-initrd-ng.nix

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ in 
# guess may not align with u-boot's nomenclature correctly, so it can

# be overridden.

# See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list.

, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch

, uInitrdArch ? stdenvNoCC.hostPlatform.ubootArch



# The name of the compression, as recognised by u-boot.

# See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list.