pi4 stuff
This commit is contained in:
@@ -68,7 +68,7 @@ let
|
||||
};
|
||||
ubootBuilder = import ./uboot-builder.nix {
|
||||
inherit pkgs;
|
||||
ubootPackage = pkgs.${namespace}.uboot-pi5;
|
||||
ubootPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
|
||||
};
|
||||
@@ -93,7 +93,7 @@ let
|
||||
populateUbootBuilder = import ./uboot-builder.nix {
|
||||
inherit ubootBinName;
|
||||
pkgs = pkgs.buildPackages;
|
||||
ubootPackage = pkgs.${namespace}.uboot-pi5;
|
||||
ubootPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
|
||||
};
|
||||
@@ -167,7 +167,7 @@ in
|
||||
loader = {
|
||||
generic-extlinux-compatible = {
|
||||
enable = lib.mkDefault true;
|
||||
useGenerationDeviceTree = true;
|
||||
useGenerationDeviceTree = lib.mkOverride 60 true;
|
||||
};
|
||||
grub.enable = lib.mkForce false;
|
||||
};
|
||||
@@ -214,7 +214,7 @@ in
|
||||
/plugin/;
|
||||
|
||||
/ {
|
||||
compatible = "raspberrypi,4-model-b";
|
||||
compatible = "brcm,bcm2711";
|
||||
|
||||
fragment@0 {
|
||||
target-path = "/";
|
||||
@@ -227,24 +227,24 @@ in
|
||||
};
|
||||
'';
|
||||
}
|
||||
{
|
||||
name = "enable-xhci";
|
||||
dtsText = ''
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
# {
|
||||
# name = "enable-xhci";
|
||||
# dtsText = ''
|
||||
# /dts-v1/;
|
||||
# /plugin/;
|
||||
|
||||
/ {
|
||||
compatible = "brcm,bcm2711";
|
||||
fragment@0 {
|
||||
//target-path = "/scb/xhci@7e9c0000";
|
||||
target = <&xhci>;
|
||||
__overlay__ {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
'';
|
||||
}
|
||||
# / {
|
||||
# compatible = "brcm,bcm2711";
|
||||
# fragment@0 {
|
||||
# //target-path = "/scb/xhci@7e9c0000";
|
||||
# target = <&xhci>;
|
||||
# __overlay__ {
|
||||
# status = "okay";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# '';
|
||||
# }
|
||||
] else
|
||||
[
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user