M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fast-servo board support #24

Merged
sb10q merged 1 commits from fsagbuya/nix-servo:fast-servo into master 2024-08-17 17:37:24 +08:00
Conversation 16 Commits 1 Files Changed 2 +34 -36
2 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
fast-servo/dts-support/fast-servo.dts → fast-servo/fast-servo.dts
View File

70
flake.nix
View File

@ -10,7 +10,6 @@
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
not-os-cfg = not-os-configured.config.system; not-os-cfg = not-os-configured.config.system;
fsbl-support = ./fast-servo/fsbl-support; fsbl-support = ./fast-servo/fsbl-support;
dts-support = ./fast-servo/dts-support;
patched-not-os = pkgs.applyPatches { patched-not-os = pkgs.applyPatches {
name = "not-os-patched"; name = "not-os-patched";
@ -214,38 +213,40 @@
dontFixup = true; dontFixup = true;
}; };
u-boot = (pkgs.pkgsCross.armv7l-hf-multiplatform.buildUBoot { u-boot = let
defconfig = "xilinx_zynq_virt_defconfig"; fast-servo-dts = fast-servo/fast-servo.dts;
patches = [] ++ pkgs.lib.optional (board == "fast-servo") ./fast-servo/u-boot.patch; in (pkgs.pkgsCross.armv7l-hf-multiplatform.buildUBoot {
preConfigure = '' defconfig = "xilinx_zynq_virt_defconfig";
export DEVICE_TREE=zynq-${board} patches = [] ++ pkgs.lib.optional (board == "fast-servo") ./fast-servo/u-boot.patch;
''; preConfigure = ''
extraConfig = '' export DEVICE_TREE=zynq-${board}
fsagbuya marked this conversation as resolved Outdated
sb10q commented 2024-01-29 21:04:07 +08:00
Outdated
Review
Copy Link

Purpose of this grossly inconsistent test?

Purpose of this grossly inconsistent test?
fsagbuya commented 2024-01-30 10:16:54 +08:00
Outdated
Review
Copy Link

Updated the name of the device-tree runCommand to device-tree for clarity. This builds the device tree in two ways, one from the dts files committed to the repo and one from not-os build.

Updated the name of the device-tree runCommand to `device-tree` for clarity. This builds the device tree in two ways, one from the dts files committed to the repo and one from `not-os` build.
sb10q commented 2024-01-30 10:18:31 +08:00
Outdated
Review
Copy Link

There should be only one source of truth for the device tree, from which other formats are built using open tools and Nix derivations.

There should be only one source of truth for the device tree, from which other formats are built using open tools and Nix derivations.
fsagbuya commented 2024-01-30 10:21:26 +08:00
Outdated
Review
Copy Link

Ahh.. I get what you mean. Will revise the code to align with a more standard approach.

Ahh.. I get what you mean. Will revise the code to align with a more standard approach.
CONFIG_SYS_PROMPT="${board}-boot> " '';
CONFIG_AUTOBOOT=y extraConfig = ''
CONFIG_BOOTCOMMAND="${builtins.replaceStrings [ "\n" ] [ "; " ] '' CONFIG_SYS_PROMPT="${board}-boot> "
setenv bootargs 'root=/dev/mmcblk0p2 console=ttyPS0,115200n8 systemConfig=${builtins.unsafeDiscardStringContext not-os-cfg.build.toplevel}' CONFIG_AUTOBOOT=y
fatload mmc 0 0x6400000 uImage CONFIG_BOOTCOMMAND="${builtins.replaceStrings [ "\n" ] [ "; " ] ''
fatload mmc 0 0x8000000 ${board}.dtb setenv bootargs 'root=/dev/mmcblk0p2 console=ttyPS0,115200n8 systemConfig=${builtins.unsafeDiscardStringContext not-os-cfg.build.toplevel}'
fatload mmc 0 0xA400000 uRamdisk.image.gz fatload mmc 0 0x6400000 uImage
bootm 0x6400000 0xA400000 0x8000000 fatload mmc 0 0x8000000 ${board}.dtb
''}" fatload mmc 0 0xA400000 uRamdisk.image.gz
CONFIG_BOOTDELAY=0 bootm 0x6400000 0xA400000 0x8000000
CONFIG_USE_BOOTCOMMAND=y ''}"
''; CONFIG_BOOTDELAY=0
extraMeta.platforms = [ "armv7l-linux" ]; CONFIG_USE_BOOTCOMMAND=y
filesToInstall = [ "u-boot.elf" ]; '';
}).overrideAttrs (oldAttrs: { extraMeta.platforms = [ "armv7l-linux" ];
postUnpack = '' filesToInstall = [ "u-boot.elf" ];
cp ${dts-support}/fast-servo.dts $sourceRoot/arch/arm/dts/zynq-fast-servo.dts }).overrideAttrs (oldAttrs: {
''; postUnpack = ''
postInstall = '' cp ${fast-servo-dts} $sourceRoot/arch/arm/dts/zynq-fast-servo.dts
mkdir -p $out/dts '';
cp arch/arm/dts/zynq-fast-servo.dts $out/dts postInstall = ''
cp arch/arm/dts/zynq-zc706.dts $out/dts mkdir -p $out/dts
cp arch/arm/dts/zynq-7000.dtsi $out/dts cp arch/arm/dts/zynq-fast-servo.dts $out/dts
fsagbuya marked this conversation as resolved Outdated
sb10q commented 2024-02-14 15:53:58 +08:00
Outdated
Review
Copy Link

Why does this need to be executable?

Why does this need to be executable?
fsagbuya commented 2024-02-14 16:05:35 +08:00
Outdated
Review
Copy Link

I have added this before because .dtb file from linux kernel nix build is executable. So I did it as well in fast-servo.dtb for consistency. However from testing, it also boots fine without making it executable. Will just remove this.

I have added this before because `.dtb` file from linux kernel nix build is executable. So I did it as well in fast-servo.dtb for consistency. However from testing, it also boots fine without making it executable. Will just remove this.
''; cp arch/arm/dts/zynq-zc706.dts $out/dts
}); cp arch/arm/dts/zynq-7000.dtsi $out/dts
'';
});
bootimage = pkgs.runCommand "${board}-bootimage" bootimage = pkgs.runCommand "${board}-bootimage"
{ {
@ -274,8 +275,6 @@
} }
'' ''
mkdir -p $out mkdir -p $out
sb10q commented 2024-02-16 16:46:00 +08:00
Outdated
Review
Copy Link

Not needed AFAICT? You can always create temporary build files in the current directory in a Nix derivation.

Not needed AFAICT? You can always create temporary build files in the current directory in a Nix derivation.
👍 1
DTSDIR=$(mktemp -d /tmp/dts-XXXXXX)
cd $DTSDIR
cp ${u-boot}/dts/zynq-${board}.dts . cp ${u-boot}/dts/zynq-${board}.dts .
if [ ${board} == "zc706" ]; then if [ ${board} == "zc706" ]; then
@ -286,7 +285,6 @@
dtc -I dts -O dtb -o ${board}.dtb zynq-${board}.dts dtc -I dts -O dtb -o ${board}.dtb zynq-${board}.dts
cp ${board}.dtb $out cp ${board}.dtb $out
rm -rf $DTSDIR
''; '';
sd-image = let sd-image = let