aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Pässler <milan@petabyte.dev>2020-10-10 21:34:20 +0200
committerMilan Pässler <milan@petabyte.dev>2020-10-10 21:34:20 +0200
commitd5293e1efbff8f4b7d17de750ffe61e0e98cf845 (patch)
tree05d31e4080401df2c2cbefb41faedceeb5564371
parent59320a0d896200e3c6c9e058d1f8f1ecb94b78ec (diff)
.
-rw-r--r--configs/boards/t440p.nix2
-rw-r--r--configs/boards/t60.nix2
-rw-r--r--configs/boards/x1c.nix2
-rw-r--r--configs/boards/x220.nix2
-rw-r--r--configs/boards/x230.nix2
-rw-r--r--configs/boards/x230t.nix2
-rw-r--r--configs/common.nix2
-rw-r--r--configs/milan-x1c.nix2
-rw-r--r--flake.nix2
-rw-r--r--modules/grub2/default.nix2
-rw-r--r--modules/tianocore/default.nix2
11 files changed, 11 insertions, 11 deletions
diff --git a/configs/boards/t440p.nix b/configs/boards/t440p.nix
index 5bfdd3a86715..a4e9057831ab 100644
--- a/configs/boards/t440p.nix
+++ b/configs/boards/t440p.nix
@@ -1,7 +1,7 @@
{ ... }:
{
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_VENDOR_LENOVO = "y";
CONFIG_BOARD_LENOVO_THINKPAD_T440P = "y";
};
diff --git a/configs/boards/t60.nix b/configs/boards/t60.nix
index f819b24e71eb..b2c073f55664 100644
--- a/configs/boards/t60.nix
+++ b/configs/boards/t60.nix
@@ -1,7 +1,7 @@
{ ... }:
{
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_VENDOR_LENOVO = "y";
CONFIG_BOARD_LENOVO_T60 = "y";
};
diff --git a/configs/boards/x1c.nix b/configs/boards/x1c.nix
index 389c15947de4..e4e969a693e0 100644
--- a/configs/boards/x1c.nix
+++ b/configs/boards/x1c.nix
@@ -1,7 +1,7 @@
{ ... }:
{
- coreboot.corebootConfig = {
+ corenix.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 ab85b6024a80..0a493f82f1c8 100644
--- a/configs/boards/x220.nix
+++ b/configs/boards/x220.nix
@@ -1,7 +1,7 @@
{ ... }:
{
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_VENDOR_LENOVO = "y";
CONFIG_BOARD_LENOVO_X220 = "y";
};
diff --git a/configs/boards/x230.nix b/configs/boards/x230.nix
index d218c2e834e6..fede99dbe9e5 100644
--- a/configs/boards/x230.nix
+++ b/configs/boards/x230.nix
@@ -1,7 +1,7 @@
{ ... }:
{
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_VENDOR_LENOVO = "y";
CONFIG_BOARD_LENOVO_X230 = "y";
};
diff --git a/configs/boards/x230t.nix b/configs/boards/x230t.nix
index 1ad563eb0169..0ef3ea4e9809 100644
--- a/configs/boards/x230t.nix
+++ b/configs/boards/x230t.nix
@@ -1,7 +1,7 @@
{ ... }:
{
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_VENDOR_LENOVO = "y";
CONFIG_BOARD_LENOVO_X230T = "y";
};
diff --git a/configs/common.nix b/configs/common.nix
index 4da6389a62e6..1e091cc29cd4 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -1,7 +1,7 @@
{ lib, ... }:
{
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_PAYLOAD_NONE = "y"; # payload is added later
CONFIG_CBFS_SIZE = lib.mkDefault "0x300000";
CONFIG_USE_OPTION_TABLE = lib.mkDefault "y";
diff --git a/configs/milan-x1c.nix b/configs/milan-x1c.nix
index b88474a210f8..0826aaad3a86 100644
--- a/configs/milan-x1c.nix
+++ b/configs/milan-x1c.nix
@@ -6,7 +6,7 @@
./boards/x1c.nix
];
- coreboot.corebootConfig = {
+ corenix.corebootConfig = {
CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH = "1600";
CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT = "900";
};
diff --git a/flake.nix b/flake.nix
index fa0fcf73356a..cb4a8a3d7195 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
configFile
];
};
- config.coreboot.rom;
+ config.corenix.rom;
in {
inherit (pkgs) coreboot-payload-grub2 coreboot-payload-tianocore coreboot;
diff --git a/modules/grub2/default.nix b/modules/grub2/default.nix
index 91aa378753b3..214eb04d38db 100644
--- a/modules/grub2/default.nix
+++ b/modules/grub2/default.nix
@@ -16,7 +16,7 @@ in {
};
config = lib.mkIf cfg.enable {
- coreboot.extraFiles = {
+ corenix.extraFiles = {
"fallback/payload" = {
type = "payload";
src = "${pkgs.coreboot-payload-grub2}/default_payload.elf";
diff --git a/modules/tianocore/default.nix b/modules/tianocore/default.nix
index d71232519ab3..1ebf3d93d945 100644
--- a/modules/tianocore/default.nix
+++ b/modules/tianocore/default.nix
@@ -10,7 +10,7 @@ in {
};
config = lib.mkIf cfg.enable {
- coreboot.extraFiles = {
+ corenix.extraFiles = {
"fallback/payload" = {
type = "payload";
src = "${pkgs.coreboot-payload-tianocore}/FV/UEFIPAYLOAD.fd";