From 28b9bb54087371e558e97e3beeccac1f6f5362cd Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 16 Oct 2021 08:58:04 -0700 Subject: [PATCH] ubootQemuX86: init --- pkgs/misc/uboot/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 21 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2d234aa9e003..dec567f1ccde 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -352,6 +352,26 @@ in { filesToInstall = ["u-boot.bin"]; }; + ubootQemuX86 = buildUBoot { + defconfig = "qemu-x86_defconfig"; + extraConfig = '' + CONFIG_USB_UHCI_HCD=y + CONFIG_USB_EHCI_HCD=y + CONFIG_USB_EHCI_GENERIC=y + CONFIG_USB_XHCI_HCD=y + ''; + extraPatches = [ + # https://patchwork.ozlabs.org/project/uboot/list/?series=268007&state=%2A&archive=both + # Remove when upgrading to 2022.01 + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/268007/mbox/"; + sha256 = "sha256-xn4Q959dgoB63zlmJepI41AXAf1kCycIGcmu4IIVjmE="; + }) + ]; + extraMeta.platforms = [ "i686-linux" "x86_64-linux" ]; + filesToInstall = [ "u-boot.rom" ]; + }; + ubootRaspberryPi = buildUBoot { defconfig = "rpi_defconfig"; extraMeta.platforms = ["armv6l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6dc7344b9f..0ca58a636903 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23047,6 +23047,7 @@ with pkgs; ubootQemuAarch64 ubootQemuArm ubootQemuRiscv64Smode + ubootQemuX86 ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit