From 5b51aa0826fe3a8f1f22609b377557b28d0f3d69 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sat, 11 Feb 2023 13:28:25 +0000 Subject: [PATCH] tftp load address is per-device, IP addresses are local config --- devices/gl-ar750/default.nix | 2 -- devices/gl-mt300a/default.nix | 3 +++ devices/gl-mt300n-v2/default.nix | 3 +++ vanilla-configuration.nix | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix index 262ead1..65dc16f 100644 --- a/devices/gl-ar750/default.nix +++ b/devices/gl-ar750/default.nix @@ -41,8 +41,6 @@ }; boot.tftp = { loadAddress = "0x00A00000"; - serverip = "192.168.8.148"; - ipaddr = "192.168.8.251"; }; kernel = { src = pkgs.pkgsBuildBuild.fetchurl { diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix index 61ac10f..1cdfec3 100644 --- a/devices/gl-mt300a/default.nix +++ b/devices/gl-mt300a/default.nix @@ -26,6 +26,9 @@ loadAddress = "0x80000000"; entryPoint = "0x80000000"; }; + boot.tftp = { + loadAddress = "0x00A00000"; + }; kernel = { src = pkgs.fetchurl { diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix index 5b907a0..a47d12a 100644 --- a/devices/gl-mt300n-v2/default.nix +++ b/devices/gl-mt300n-v2/default.nix @@ -26,6 +26,9 @@ loadAddress = "0x80000000"; entryPoint = "0x80000000"; }; + boot.tftp = { + loadAddress = "0x00A00000"; + }; kernel = { src = pkgs.fetchurl { diff --git a/vanilla-configuration.nix b/vanilla-configuration.nix index e42baec..4f0b3cc 100644 --- a/vanilla-configuration.nix +++ b/vanilla-configuration.nix @@ -64,5 +64,10 @@ in rec { contents = with services; [ loopback ntp defaultroute4 ]; }; + boot.tftp = { + serverip = "192.168.8.148"; + ipaddr = "192.168.8.251"; + }; + defaultProfile.packages = [ pkgs.hello ] ; }