diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk
index f8765bd..f337d40 100644
--- a/src/board/system76/addw1/board.mk
+++ b/src/board/system76/addw1/board.mk
@@ -33,7 +33,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
@@ -43,10 +47,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk
index e87a60a..98b41ff 100644
--- a/src/board/system76/addw2/board.mk
+++ b/src/board/system76/addw2/board.mk
@@ -33,7 +33,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
@@ -43,10 +47,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
diff --git a/src/board/system76/addw3/board.mk b/src/board/system76/addw3/board.mk
index 752ac35..264499e 100644
--- a/src/board/system76/addw3/board.mk
+++ b/src/board/system76/addw3/board.mk
@@ -42,7 +42,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=280 \
 	-DPOWER_LIMIT_DC=55
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -54,10 +58,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/addw4/board.mk b/src/board/system76/addw4/board.mk
index e757f22..8976245 100644
--- a/src/board/system76/addw4/board.mk
+++ b/src/board/system76/addw4/board.mk
@@ -38,7 +38,11 @@ CFLAGS += \
 	-DPOWER_LIMIT_AC=230 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable DGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -52,10 +56,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-# Enable DGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk
index 32565c6..dadf006 100644
--- a/src/board/system76/bonw14/board.mk
+++ b/src/board/system76/bonw14/board.mk
@@ -33,7 +33,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
@@ -43,10 +47,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
diff --git a/src/board/system76/bonw15/board.mk b/src/board/system76/bonw15/board.mk
index fcdd7bc..6ef4b76 100644
--- a/src/board/system76/bonw15/board.mk
+++ b/src/board/system76/bonw15/board.mk
@@ -47,7 +47,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=330 \
 	-DPOWER_LIMIT_DC=55
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -59,10 +63,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/common/fan.c b/src/board/system76/common/fan.c
index 1d59b08..e98966d 100644
--- a/src/board/system76/common/fan.c
+++ b/src/board/system76/common/fan.c
@@ -40,19 +40,15 @@ static uint8_t FAN1_HEATUP[BOARD_FAN1_HEATUP] = { 0 };
 static uint8_t FAN1_COOLDOWN[BOARD_FAN1_COOLDOWN] = { 0 };
 
 // Fan curve with temperature in degrees C, duty cycle in percent
-static struct FanPoint __code FAN1_POINTS[] = {
-#ifdef BOARD_FAN1_POINTS
-    BOARD_FAN1_POINTS
+static const struct FanPoint __code FAN1_POINTS[] = {
+#ifndef BOARD_FAN1_POINTS
+#error Board must declare fan points
 #else
-    FAN_POINT(70, 40),
-    FAN_POINT(75, 50),
-    FAN_POINT(80, 60),
-    FAN_POINT(85, 65),
-    FAN_POINT(90, 65),
+    BOARD_FAN1_POINTS
 #endif
 };
 
-static struct Fan __code FAN1 = {
+static const struct Fan __code FAN1 = {
     .points = FAN1_POINTS,
     .points_size = ARRAY_SIZE(FAN1_POINTS),
     .heatup = FAN1_HEATUP,
@@ -79,19 +75,15 @@ static uint8_t FAN2_HEATUP[BOARD_FAN2_HEATUP] = { 0 };
 static uint8_t FAN2_COOLDOWN[BOARD_FAN2_COOLDOWN] = { 0 };
 
 // Fan curve with temperature in degrees C, duty cycle in percent
-static struct FanPoint __code FAN2_POINTS[] = {
-#ifdef BOARD_FAN2_POINTS
-    BOARD_FAN2_POINTS
+static const struct FanPoint __code FAN2_POINTS[] = {
+#ifndef BOARD_FAN2_POINTS
+#error Board must declare fan points
 #else
-    FAN_POINT(70, 40),
-    FAN_POINT(75, 50),
-    FAN_POINT(80, 60),
-    FAN_POINT(85, 65),
-    FAN_POINT(90, 65),
+    BOARD_FAN2_POINTS
 #endif
 };
 
-static struct Fan __code FAN2 = {
+static const struct Fan __code FAN2 = {
     .points = FAN2_POINTS,
     .points_size = ARRAY_SIZE(FAN2_POINTS),
     .heatup = FAN2_HEATUP,
diff --git a/src/board/system76/darp10-b/board.mk b/src/board/system76/darp10-b/board.mk
index 1ef9069..efeb062 100644
--- a/src/board/system76/darp10-b/board.mk
+++ b/src/board/system76/darp10-b/board.mk
@@ -41,8 +41,24 @@ CFLAGS += \
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
+
 CFLAGS += -DFAN2_PWM=DCR3
+CFLAGS += -DBOARD_FAN2_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp10/board.mk b/src/board/system76/darp10/board.mk
index 0e91c63..4af71f1 100644
--- a/src/board/system76/darp10/board.mk
+++ b/src/board/system76/darp10/board.mk
@@ -39,8 +39,24 @@ CFLAGS += \
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
+
 CFLAGS += -DFAN2_PWM=DCR3
+CFLAGS += -DBOARD_FAN2_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk
index 47a4881..a53a2ad 100644
--- a/src/board/system76/darp5/board.mk
+++ b/src/board/system76/darp5/board.mk
@@ -34,7 +34,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp6/board.mk b/src/board/system76/darp6/board.mk
index 6c60e38..f68b5f5 100644
--- a/src/board/system76/darp6/board.mk
+++ b/src/board/system76/darp6/board.mk
@@ -37,7 +37,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp7/board.mk b/src/board/system76/darp7/board.mk
index 9ac5257..41d3ca8 100644
--- a/src/board/system76/darp7/board.mk
+++ b/src/board/system76/darp7/board.mk
@@ -36,7 +36,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp8/board.mk b/src/board/system76/darp8/board.mk
index 0b6768c..a23351c 100644
--- a/src/board/system76/darp8/board.mk
+++ b/src/board/system76/darp8/board.mk
@@ -37,7 +37,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp9/board.mk b/src/board/system76/darp9/board.mk
index e8641ed..bf1da6e 100644
--- a/src/board/system76/darp9/board.mk
+++ b/src/board/system76/darp9/board.mk
@@ -39,7 +39,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index da4d126..2ab9d57 100644
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -35,7 +35,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=40 \
 	-DPOWER_LIMIT_DC=28
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp4/board.mk b/src/board/system76/galp4/board.mk
index 4f912f7..67dda9b 100644
--- a/src/board/system76/galp4/board.mk
+++ b/src/board/system76/galp4/board.mk
@@ -38,7 +38,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=40 \
 	-DPOWER_LIMIT_DC=28
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk
index ec3e961..9fc38b6 100644
--- a/src/board/system76/galp5/board.mk
+++ b/src/board/system76/galp5/board.mk
@@ -39,7 +39,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(70, 25), \
@@ -49,10 +53,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(88, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(70, 25), \
diff --git a/src/board/system76/galp6/board.mk b/src/board/system76/galp6/board.mk
index 1784ecf..4fdf5de 100644
--- a/src/board/system76/galp6/board.mk
+++ b/src/board/system76/galp6/board.mk
@@ -42,7 +42,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp7/board.mk b/src/board/system76/galp7/board.mk
index 4384092..074bbcf 100644
--- a/src/board/system76/galp7/board.mk
+++ b/src/board/system76/galp7/board.mk
@@ -45,7 +45,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk
index 23460c8..4506b0e 100644
--- a/src/board/system76/gaze15/board.mk
+++ b/src/board/system76/gaze15/board.mk
@@ -33,7 +33,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
@@ -43,10 +47,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
diff --git a/src/board/system76/gaze16-3050/board.mk b/src/board/system76/gaze16-3050/board.mk
index 589d211..730676a 100644
--- a/src/board/system76/gaze16-3050/board.mk
+++ b/src/board/system76/gaze16-3050/board.mk
@@ -38,7 +38,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -50,10 +54,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/gaze16-3060-b/board.mk b/src/board/system76/gaze16-3060-b/board.mk
index 2aa5baf..9b96f00 100644
--- a/src/board/system76/gaze16-3060-b/board.mk
+++ b/src/board/system76/gaze16-3060-b/board.mk
@@ -41,7 +41,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -53,10 +57,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS+=-DBOARD_FAN2_HEATUP=5
 CFLAGS+=-DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/gaze16-3060/board.mk b/src/board/system76/gaze16-3060/board.mk
index c29734c..59825d9 100644
--- a/src/board/system76/gaze16-3060/board.mk
+++ b/src/board/system76/gaze16-3060/board.mk
@@ -38,7 +38,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -50,10 +54,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/gaze17-3050/board.mk b/src/board/system76/gaze17-3050/board.mk
index 82200b9..85c3180 100644
--- a/src/board/system76/gaze17-3050/board.mk
+++ b/src/board/system76/gaze17-3050/board.mk
@@ -41,7 +41,11 @@ CFLAGS+=\
 
 CFLAGS+=-DSMOOTH_FANS_MIN=20
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -55,10 +59,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/gaze17-3060-b/board.mk b/src/board/system76/gaze17-3060-b/board.mk
index d1f0098..5bab437 100644
--- a/src/board/system76/gaze17-3060-b/board.mk
+++ b/src/board/system76/gaze17-3060-b/board.mk
@@ -42,7 +42,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -54,10 +58,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/gaze17-3060/board.mk b/src/board/system76/gaze17-3060/board.mk
index 2964ba0..05b4df5 100644
--- a/src/board/system76/gaze17-3060/board.mk
+++ b/src/board/system76/gaze17-3060/board.mk
@@ -39,7 +39,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -51,10 +55,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/gaze18/board.mk b/src/board/system76/gaze18/board.mk
index cf06f02..7bbdbd9 100644
--- a/src/board/system76/gaze18/board.mk
+++ b/src/board/system76/gaze18/board.mk
@@ -41,7 +41,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=150 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -53,10 +57,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/lemp10/board.mk b/src/board/system76/lemp10/board.mk
index 219b613..1ad67c9 100644
--- a/src/board/system76/lemp10/board.mk
+++ b/src/board/system76/lemp10/board.mk
@@ -37,7 +37,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp11/board.mk b/src/board/system76/lemp11/board.mk
index f274f2c..63525e4 100644
--- a/src/board/system76/lemp11/board.mk
+++ b/src/board/system76/lemp11/board.mk
@@ -38,7 +38,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp12/board.mk b/src/board/system76/lemp12/board.mk
index 53a5031..b60c25a 100644
--- a/src/board/system76/lemp12/board.mk
+++ b/src/board/system76/lemp12/board.mk
@@ -43,7 +43,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp13-b/board.mk b/src/board/system76/lemp13-b/board.mk
index 299a015..a4a46f4 100644
--- a/src/board/system76/lemp13-b/board.mk
+++ b/src/board/system76/lemp13-b/board.mk
@@ -41,7 +41,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp13/board.mk b/src/board/system76/lemp13/board.mk
index 6fcdc80..b571acb 100644
--- a/src/board/system76/lemp13/board.mk
+++ b/src/board/system76/lemp13/board.mk
@@ -40,7 +40,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk
index ff88004..98e4309 100644
--- a/src/board/system76/lemp9/board.mk
+++ b/src/board/system76/lemp9/board.mk
@@ -34,7 +34,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DBOARD_FAN1_POINTS="\
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 50), \
+	FAN_POINT(80, 60), \
+	FAN_POINT(85, 65), \
+	FAN_POINT(90, 65), \
+"
 
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/oryp10/board.mk b/src/board/system76/oryp10/board.mk
index 5c75098..06e98e6 100644
--- a/src/board/system76/oryp10/board.mk
+++ b/src/board/system76/oryp10/board.mk
@@ -44,7 +44,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -59,10 +63,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(87, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/oryp11/board.mk b/src/board/system76/oryp11/board.mk
index 9be322d..065fda2 100644
--- a/src/board/system76/oryp11/board.mk
+++ b/src/board/system76/oryp11/board.mk
@@ -51,7 +51,11 @@ CFLAGS+=\
 
 CFLAGS+=-DSMOOTH_FANS_MIN=28
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -65,10 +69,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/oryp12/board.mk b/src/board/system76/oryp12/board.mk
index 7c5fe11..24c62b3 100644
--- a/src/board/system76/oryp12/board.mk
+++ b/src/board/system76/oryp12/board.mk
@@ -44,7 +44,11 @@ CFLAGS += \
 	-DPOWER_LIMIT_AC=230 \
 	-DPOWER_LIMIT_DC=55
 
-# Custom fan curve
+# Enable DGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -58,10 +62,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-# Enable DGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk
index d2baf00..561e942 100644
--- a/src/board/system76/oryp5/board.mk
+++ b/src/board/system76/oryp5/board.mk
@@ -34,7 +34,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
@@ -44,10 +48,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(80, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index b45744c..8461a41 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -36,7 +36,11 @@ CFLAGS+=\
 # Don't smooth fan speed changes below 25% to mitigate buzzing
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
@@ -48,10 +52,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index b45744c..8461a41 100644
--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -36,7 +36,11 @@ CFLAGS+=\
 # Don't smooth fan speed changes below 25% to mitigate buzzing
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
@@ -48,10 +52,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
diff --git a/src/board/system76/oryp8/board.mk b/src/board/system76/oryp8/board.mk
index d630e05..7df7931 100644
--- a/src/board/system76/oryp8/board.mk
+++ b/src/board/system76/oryp8/board.mk
@@ -39,7 +39,11 @@ CFLAGS+=\
 # Don't smooth fan speed changes below 25% to mitigate buzzing
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
@@ -51,10 +55,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
diff --git a/src/board/system76/oryp9/board.mk b/src/board/system76/oryp9/board.mk
index 23ab629..8287f6b 100644
--- a/src/board/system76/oryp9/board.mk
+++ b/src/board/system76/oryp9/board.mk
@@ -41,7 +41,11 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -56,10 +60,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(87, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
diff --git a/src/board/system76/serw13/board.mk b/src/board/system76/serw13/board.mk
index ee131af..149a97d 100644
--- a/src/board/system76/serw13/board.mk
+++ b/src/board/system76/serw13/board.mk
@@ -48,7 +48,11 @@ CFLAGS+=\
 
 CFLAGS+=-DSMOOTH_FANS_MIN=28
 
-# Custom fan curve
+# Enable dGPU support
+CONFIG_HAVE_DGPU = y
+CFLAGS += -DI2C_DGPU=I2C_1
+
+# Fan configs
 CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
@@ -61,10 +65,6 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(87, 100), \
 "
 
-# Enable dGPU support
-CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
-
 CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20