Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

uboot: ubootBeagleboneBlack -> ubootAmx335xEVM

See u-boot@8fa7f65dd02c176ee6021eaf40114560b8954ba2

> configs: Remove am335x_boneblack_defconfig
>
> The am335x_evm_defconfig supports all am335x_boneblack variants. Remove
> the redundant am335x_boneblack_defconfig.

+8 -7
+6 -6
pkgs/misc/uboot/default.nix
··· 112 filesToInstall = ["u-boot-sunxi-with-spl.bin"]; 113 }; 114 115 ubootBananaPi = buildUBoot { 116 defconfig = "Bananapi_defconfig"; 117 extraMeta.platforms = ["armv7l-linux"]; ··· 129 extraMeta.platforms = ["aarch64-linux"]; 130 BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; 131 filesToInstall = ["u-boot-sunxi-with-spl.bin"]; 132 - }; 133 - 134 - ubootBeagleboneBlack = buildUBoot { 135 - defconfig = "am335x_boneblack_defconfig"; 136 - extraMeta.platforms = ["armv7l-linux"]; 137 - filesToInstall = ["MLO" "u-boot.img"]; 138 }; 139 140 # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
··· 112 filesToInstall = ["u-boot-sunxi-with-spl.bin"]; 113 }; 114 115 + ubootAmx335xEVM = buildUBoot { 116 + defconfig = "am335x_evm_defconfig"; 117 + extraMeta.platforms = ["armv7l-linux"]; 118 + filesToInstall = ["MLO" "u-boot.img"]; 119 + }; 120 + 121 ubootBananaPi = buildUBoot { 122 defconfig = "Bananapi_defconfig"; 123 extraMeta.platforms = ["armv7l-linux"]; ··· 135 extraMeta.platforms = ["aarch64-linux"]; 136 BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; 137 filesToInstall = ["u-boot-sunxi-with-spl.bin"]; 138 }; 139 140 # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
+1
pkgs/top-level/aliases.nix
··· 442 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 443 truecrypt = veracrypt; # added 2018-10-24 444 tshark = wireshark-cli; # added 2018-04-25 445 ucsFonts = ucs-fonts; # added 2016-07-15 446 ultrastardx-beta = ultrastardx; # added 2017-08-12 447 usb_modeswitch = usb-modeswitch; # added 2016-05-10
··· 442 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 443 truecrypt = veracrypt; # added 2018-10-24 444 tshark = wireshark-cli; # added 2018-04-25 445 + ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 446 ucsFonts = ucs-fonts; # added 2016-07-15 447 ultrastardx-beta = ultrastardx; # added 2017-08-12 448 usb_modeswitch = usb-modeswitch; # added 2016-05-10
+1 -1
pkgs/top-level/all-packages.nix
··· 17084 ubootBananaPi 17085 ubootBananaPim3 17086 ubootBananaPim64 17087 - ubootBeagleboneBlack 17088 ubootClearfog 17089 ubootGuruplug 17090 ubootJetsonTK1
··· 17084 ubootBananaPi 17085 ubootBananaPim3 17086 ubootBananaPim64 17087 + ubootAmx335xEVM 17088 ubootClearfog 17089 ubootGuruplug 17090 ubootJetsonTK1