From 5246a06e6ccc94cb176253eeb797b8ef71cefad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 10 Oct 2020 17:04:04 +0200 Subject: . --- config.nix | 7 ------- configs/boards/t440p.nix | 6 ++++-- configs/boards/t60.nix | 6 ++++-- configs/boards/x1c.nix | 6 ++++-- configs/boards/x220.nix | 6 ++++-- configs/boards/x230.nix | 6 ++++-- configs/boards/x230t.nix | 8 ++++++-- configs/common.nix | 2 +- devices/t440p.nix | 8 -------- devices/t60.nix | 6 ------ devices/x1c.nix | 6 ------ devices/x220.nix | 6 ------ devices/x230-fhd.nix | 9 --------- devices/x230.nix | 6 ------ devices/x230t.nix | 4 ---- flake.nix | 3 ++- modules/grub2/default.nix | 2 +- result | 1 - 18 files changed, 30 insertions(+), 68 deletions(-) delete mode 100644 config.nix delete mode 100644 devices/t440p.nix delete mode 100644 devices/t60.nix delete mode 100644 devices/x1c.nix delete mode 100644 devices/x220.nix delete mode 100644 devices/x230-fhd.nix delete mode 100644 devices/x230.nix delete mode 100644 devices/x230t.nix delete mode 120000 result diff --git a/config.nix b/config.nix deleted file mode 100644 index 738f7b2ba426..000000000000 --- a/config.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - CONFIG_PAYLOAD_NONE = "y"; # payload is added later - CONFIG_CBFS_SIZE = lib.mkDefault "0x300000"; - CONFIG_USE_OPTION_TABLE = lib.mkDefault "y"; - CONFIG_PCIEXP_CLK_PM = lib.mkDefault "y"; - CONFIG_GENERIC_LINEAR_FRAMEBUFFER = lib.mkDefault "y"; -} diff --git a/configs/boards/t440p.nix b/configs/boards/t440p.nix index 5d3f29e7e68f..5bfdd3a86715 100644 --- a/configs/boards/t440p.nix +++ b/configs/boards/t440p.nix @@ -1,8 +1,10 @@ { ... }: { - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_THINKPAD_T440P = "y"; + coreboot.corebootConfig = { + CONFIG_VENDOR_LENOVO = "y"; + CONFIG_BOARD_LENOVO_THINKPAD_T440P = "y"; + }; # TODO: fetch mrc.bin } diff --git a/configs/boards/t60.nix b/configs/boards/t60.nix index 9af80af158ff..f819b24e71eb 100644 --- a/configs/boards/t60.nix +++ b/configs/boards/t60.nix @@ -1,6 +1,8 @@ { ... }: { - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_T60 = "y"; + coreboot.corebootConfig = { + CONFIG_VENDOR_LENOVO = "y"; + CONFIG_BOARD_LENOVO_T60 = "y"; + }; } diff --git a/configs/boards/x1c.nix b/configs/boards/x1c.nix index c2a3774dadc2..389c15947de4 100644 --- a/configs/boards/x1c.nix +++ b/configs/boards/x1c.nix @@ -1,6 +1,8 @@ { ... }: { - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 = "y"; + coreboot.corebootConfig = { + CONFIG_VENDOR_LENOVO = "y"; + CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 = "y"; + }; } diff --git a/configs/boards/x220.nix b/configs/boards/x220.nix index 4db72bcbb94d..ab85b6024a80 100644 --- a/configs/boards/x220.nix +++ b/configs/boards/x220.nix @@ -1,6 +1,8 @@ { ... }: { - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X220 = "y"; + coreboot.corebootConfig = { + CONFIG_VENDOR_LENOVO = "y"; + CONFIG_BOARD_LENOVO_X220 = "y"; + }; } diff --git a/configs/boards/x230.nix b/configs/boards/x230.nix index 5563f11fdbad..d218c2e834e6 100644 --- a/configs/boards/x230.nix +++ b/configs/boards/x230.nix @@ -1,6 +1,8 @@ { ... }: { - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X230 = "y"; + coreboot.corebootConfig = { + CONFIG_VENDOR_LENOVO = "y"; + CONFIG_BOARD_LENOVO_X230 = "y"; + }; } diff --git a/configs/boards/x230t.nix b/configs/boards/x230t.nix index 884b314b96b3..1ad563eb0169 100644 --- a/configs/boards/x230t.nix +++ b/configs/boards/x230t.nix @@ -1,4 +1,8 @@ +{ ... }: + { - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X230T = "y"; + coreboot.corebootConfig = { + CONFIG_VENDOR_LENOVO = "y"; + CONFIG_BOARD_LENOVO_X230T = "y"; + }; } diff --git a/configs/common.nix b/configs/common.nix index 113860f7ea7e..4da6389a62e6 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { coreboot.corebootConfig = { diff --git a/devices/t440p.nix b/devices/t440p.nix deleted file mode 100644 index 5d3f29e7e68f..000000000000 --- a/devices/t440p.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_THINKPAD_T440P = "y"; - - # TODO: fetch mrc.bin -} diff --git a/devices/t60.nix b/devices/t60.nix deleted file mode 100644 index 9af80af158ff..000000000000 --- a/devices/t60.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_T60 = "y"; -} diff --git a/devices/x1c.nix b/devices/x1c.nix deleted file mode 100644 index c2a3774dadc2..000000000000 --- a/devices/x1c.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 = "y"; -} diff --git a/devices/x220.nix b/devices/x220.nix deleted file mode 100644 index 4db72bcbb94d..000000000000 --- a/devices/x220.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X220 = "y"; -} diff --git a/devices/x230-fhd.nix b/devices/x230-fhd.nix deleted file mode 100644 index bb198aba4826..000000000000 --- a/devices/x230-fhd.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - imports = [ - ./x230.nix - ]; - - # TODO: modify vbt to hide LVDS -} diff --git a/devices/x230.nix b/devices/x230.nix deleted file mode 100644 index 5563f11fdbad..000000000000 --- a/devices/x230.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X230 = "y"; -} diff --git a/devices/x230t.nix b/devices/x230t.nix deleted file mode 100644 index 884b314b96b3..000000000000 --- a/devices/x230t.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - CONFIG_VENDOR_LENOVO = "y"; - CONFIG_BOARD_LENOVO_X230T = "y"; -} diff --git a/flake.nix b/flake.nix index 99be3070f2ee..9c87b8a66d23 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ + (nixpkgs + "nixos/modules/misc/nixpkgs.nix") (import ./pkgs/overlay.nix) ]; }; @@ -24,7 +25,7 @@ configFile ]; }; - system.config.coreboot.rom; + config.coreboot.rom; in { inherit (pkgs) coreboot-payload-grub2 coreboot-payload-tianocore coreboot; diff --git a/modules/grub2/default.nix b/modules/grub2/default.nix index c8790b880081..8d0c60f3e50e 100644 --- a/modules/grub2/default.nix +++ b/modules/grub2/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/result b/result deleted file mode 120000 index 6f6205ff0393..000000000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/pmmavhwnwrlfsxh9jsm58qx76zc2xl2m-coreboot-4.12 \ No newline at end of file -- cgit v1.2.3