From 3d09a0b546618677d8fd02d3a1a18593eab748e1 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Wed, 26 Jun 2024 13:44:16 -0600 Subject: [PATCH] Conditionally compile dGPU support Signed-off-by: Tim Crawford --- src/board/system76/addw1/board.mk | 8 +++----- src/board/system76/addw2/board.mk | 8 +++----- src/board/system76/addw3/board.mk | 8 +++----- src/board/system76/addw4/board.mk | 2 +- src/board/system76/bonw14/board.mk | 8 +++----- src/board/system76/bonw15/board.mk | 8 +++----- src/board/system76/common/acpi.c | 4 ++-- src/board/system76/common/common.mk | 6 +++++- src/board/system76/common/dgpu.c | 13 ------------- src/board/system76/common/include/board/dgpu.h | 16 +++++++++++----- src/board/system76/common/main.c | 2 +- src/board/system76/common/scratch.c | 2 +- src/board/system76/galp5/board.mk | 8 +++----- src/board/system76/gaze15/board.mk | 8 +++----- src/board/system76/gaze16-3050/board.mk | 8 +++----- src/board/system76/gaze16-3060-b/board.mk | 8 +++----- src/board/system76/gaze16-3060/board.mk | 8 +++----- src/board/system76/gaze17-3050/board.mk | 8 +++----- src/board/system76/gaze17-3060-b/board.mk | 8 +++----- src/board/system76/gaze17-3060/board.mk | 8 +++----- src/board/system76/gaze18/board.mk | 8 +++----- src/board/system76/oryp10/board.mk | 8 +++----- src/board/system76/oryp11/board.mk | 8 +++----- src/board/system76/oryp12/board.mk | 2 +- src/board/system76/oryp5/board.mk | 8 +++----- src/board/system76/oryp6/board.mk | 8 +++----- src/board/system76/oryp7/board.mk | 8 +++----- src/board/system76/oryp8/board.mk | 8 +++----- src/board/system76/oryp9/board.mk | 8 +++----- src/board/system76/serw13/board.mk | 8 +++----- 30 files changed, 88 insertions(+), 135 deletions(-) diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk index 43bf23b..91bfea4 100644 --- a/src/board/system76/addw1/board.mk +++ b/src/board/system76/addw1/board.mk @@ -14,9 +14,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_0 @@ -45,8 +42,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(60, 40), \ FAN_POINT(65, 60), \ diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk index 2466b08..ca256cb 100644 --- a/src/board/system76/addw2/board.mk +++ b/src/board/system76/addw2/board.mk @@ -14,9 +14,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -45,8 +42,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(60, 40), \ FAN_POINT(65, 60), \ diff --git a/src/board/system76/addw3/board.mk b/src/board/system76/addw3/board.mk index d41d7ad..524d5ad 100644 --- a/src/board/system76/addw3/board.mk +++ b/src/board/system76/addw3/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -56,8 +53,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/addw4/board.mk b/src/board/system76/addw4/board.mk index e508f47..29bc9de 100644 --- a/src/board/system76/addw4/board.mk +++ b/src/board/system76/addw4/board.mk @@ -52,7 +52,7 @@ CFLAGS += -DBOARD_FAN_POINTS="\ " # Enable DGPU support -CFLAGS += -DHAVE_DGPU=1 +CONFIG_HAVE_DGPU = y CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS += -DBOARD_DGPU_HEATUP=5 CFLAGS += -DBOARD_DGPU_COOLDOWN=20 diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk index 86a6859..ab86422 100644 --- a/src/board/system76/bonw14/board.mk +++ b/src/board/system76/bonw14/board.mk @@ -14,9 +14,6 @@ KEYBOARD=15in_102_nkey CONFIG_HAVE_KBLED = y KBLED=bonw14 -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -45,8 +42,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(60, 40), \ FAN_POINT(65, 60), \ diff --git a/src/board/system76/bonw15/board.mk b/src/board/system76/bonw15/board.mk index 77123a3..d2163bf 100644 --- a/src/board/system76/bonw15/board.mk +++ b/src/board/system76/bonw15/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=bonw14 -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -61,8 +58,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/common/acpi.c b/src/board/system76/common/acpi.c index df0f746..7486d75 100644 --- a/src/board/system76/common/acpi.c +++ b/src/board/system76/common/acpi.c @@ -164,12 +164,12 @@ uint8_t acpi_read(uint8_t addr) { ACPI_8(0xCE, DCR2); ACPI_8(0xD0, F1TLRR); ACPI_8(0xD1, F1TMRR); -#if HAVE_DGPU +#if CONFIG_HAVE_DGPU ACPI_8(0xCD, dgpu_temp); ACPI_8(0xCF, DCR4); ACPI_8(0xD2, F2TLRR); ACPI_8(0xD3, F2TMRR); -#endif // HAVE_DGPU +#endif // CONFIG_HAVE_DGPU #if HAVE_LED_AIRPLANE_N // Airplane mode LED diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk index d7addce..4a25c9a 100644 --- a/src/board/system76/common/common.mk +++ b/src/board/system76/common/common.mk @@ -3,7 +3,7 @@ board-common-y += acpi.c board-common-y += battery.c board-common-y += config.c -board-common-y += dgpu.c +board-common-$(CONFIG_HAVE_DGPU) += dgpu.c board-common-y += ecpm.c board-common-$(CONFIG_BUS_ESPI) += espi.c board-common-y += fan.c @@ -58,6 +58,10 @@ CFLAGS += -DCONFIG_PECI_OVER_ESPI=1 endif endif +ifeq ($(CONFIG_HAVE_DGPU),y) +CFLAGS += -DCONFIG_HAVE_DGPU=1 +endif + # Include system76 common source SYSTEM76_COMMON_DIR=src/board/system76/common INCLUDE += $(SYSTEM76_COMMON_DIR)/common.mk diff --git a/src/board/system76/common/dgpu.c b/src/board/system76/common/dgpu.c index 5e009d7..063ed14 100644 --- a/src/board/system76/common/dgpu.c +++ b/src/board/system76/common/dgpu.c @@ -2,9 +2,6 @@ #include #include - -#if HAVE_DGPU - #include #include #include @@ -95,13 +92,3 @@ uint8_t dgpu_get_fan_duty(void) { TRACE("DGPU temp=%d\n", dgpu_temp); return duty; } - -#else - -void dgpu_init(void) {} - -uint8_t dgpu_get_fan_duty(void) { - return PWM_DUTY(0); -} - -#endif // HAVE_DGPU diff --git a/src/board/system76/common/include/board/dgpu.h b/src/board/system76/common/include/board/dgpu.h index f5625b7..7bdf309 100644 --- a/src/board/system76/common/include/board/dgpu.h +++ b/src/board/system76/common/include/board/dgpu.h @@ -5,15 +5,21 @@ #include -#ifndef HAVE_DGPU -#define HAVE_DGPU 0 -#endif +#if CONFIG_HAVE_DGPU -#if HAVE_DGPU extern int16_t dgpu_temp; -#endif // HAVE_DGPU void dgpu_init(void); uint8_t dgpu_get_fan_duty(void); +#else + +static inline void dgpu_init(void) {} + +static inline uint8_t dgpu_get_fan_duty(void) { + return 0; +} + +#endif // CONFIG_HAVE_DGPU + #endif // _BOARD_DGPU_H diff --git a/src/board/system76/common/main.c b/src/board/system76/common/main.c index 4ecb438..f1d0e9a 100644 --- a/src/board/system76/common/main.c +++ b/src/board/system76/common/main.c @@ -57,7 +57,7 @@ void init(void) { gpio_init(); // Can happen in any order -#if HAVE_DGPU +#if CONFIG_HAVE_DGPU dgpu_init(); #endif ecpm_init(); diff --git a/src/board/system76/common/scratch.c b/src/board/system76/common/scratch.c index 5237df3..118f958 100644 --- a/src/board/system76/common/scratch.c +++ b/src/board/system76/common/scratch.c @@ -21,7 +21,7 @@ void scratch_trampoline(void) { #if HAVE_CPU_FAN2 DCR3 = 0xFF; #endif -#if HAVE_DGPU +#if CONFIG_HAVE_DGPU DCR4 = 0xFF; #endif diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk index 036f1f3..73df828 100644 --- a/src/board/system76/galp5/board.mk +++ b/src/board/system76/galp5/board.mk @@ -18,9 +18,6 @@ CONFIG_HAVE_KBLED = y KBLED=white_dac CFLAGS+=-DKBLED_DAC=2 -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -51,8 +48,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(88, 100) \ " -# DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(70, 25), \ FAN_POINT(75, 40), \ diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk index 477a57d..8a98b7d 100644 --- a/src/board/system76/gaze15/board.mk +++ b/src/board/system76/gaze15/board.mk @@ -14,9 +14,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -45,8 +42,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(60, 40), \ FAN_POINT(65, 60), \ diff --git a/src/board/system76/gaze16-3050/board.mk b/src/board/system76/gaze16-3050/board.mk index c0a9685..d65af7b 100644 --- a/src/board/system76/gaze16-3050/board.mk +++ b/src/board/system76/gaze16-3050/board.mk @@ -17,9 +17,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -52,8 +49,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/gaze16-3060-b/board.mk b/src/board/system76/gaze16-3060-b/board.mk index f32aa1b..03fe152 100644 --- a/src/board/system76/gaze16-3060-b/board.mk +++ b/src/board/system76/gaze16-3060-b/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -55,8 +52,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/gaze16-3060/board.mk b/src/board/system76/gaze16-3060/board.mk index d79bf61..0943323 100644 --- a/src/board/system76/gaze16-3060/board.mk +++ b/src/board/system76/gaze16-3060/board.mk @@ -17,9 +17,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -52,8 +49,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/gaze17-3050/board.mk b/src/board/system76/gaze17-3050/board.mk index 902e9e1..0adcd45 100644 --- a/src/board/system76/gaze17-3050/board.mk +++ b/src/board/system76/gaze17-3050/board.mk @@ -17,9 +17,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -57,8 +54,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/gaze17-3060-b/board.mk b/src/board/system76/gaze17-3060-b/board.mk index 851e813..eda21c3 100644 --- a/src/board/system76/gaze17-3060-b/board.mk +++ b/src/board/system76/gaze17-3060-b/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -56,8 +53,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/gaze17-3060/board.mk b/src/board/system76/gaze17-3060/board.mk index 8bed3a6..b1ae519 100644 --- a/src/board/system76/gaze17-3060/board.mk +++ b/src/board/system76/gaze17-3060/board.mk @@ -17,9 +17,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -53,8 +50,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/gaze18/board.mk b/src/board/system76/gaze18/board.mk index 685294b..d572999 100644 --- a/src/board/system76/gaze18/board.mk +++ b/src/board/system76/gaze18/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -55,8 +52,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/oryp10/board.mk b/src/board/system76/oryp10/board.mk index 2e37e08..939b381 100644 --- a/src/board/system76/oryp10/board.mk +++ b/src/board/system76/oryp10/board.mk @@ -23,9 +23,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -64,8 +61,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(87, 100), \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/oryp11/board.mk b/src/board/system76/oryp11/board.mk index 5dd7dbf..83af05f 100644 --- a/src/board/system76/oryp11/board.mk +++ b/src/board/system76/oryp11/board.mk @@ -22,9 +22,6 @@ KEYBOARD=18H9LHA04 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -67,8 +64,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(90, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/oryp12/board.mk b/src/board/system76/oryp12/board.mk index eca59a7..7fb6cac 100644 --- a/src/board/system76/oryp12/board.mk +++ b/src/board/system76/oryp12/board.mk @@ -58,7 +58,7 @@ CFLAGS += -DBOARD_FAN_POINTS="\ " # Enable DGPU support -CFLAGS += -DHAVE_DGPU=1 +CONFIG_HAVE_DGPU = y CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS += -DBOARD_DGPU_HEATUP=5 CFLAGS += -DBOARD_DGPU_COOLDOWN=20 diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk index 464c0b5..354d044 100644 --- a/src/board/system76/oryp5/board.mk +++ b/src/board/system76/oryp5/board.mk @@ -15,9 +15,6 @@ CONFIG_HAVE_KBLED = y KBLED=oryp5 CFLAGS+=-DI2C_KBLED=I2C_1 -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_0 @@ -46,8 +43,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(80, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(60, 40), \ FAN_POINT(65, 60), \ diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk index 8cef633..d4f5e00 100644 --- a/src/board/system76/oryp6/board.mk +++ b/src/board/system76/oryp6/board.mk @@ -14,9 +14,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -50,8 +47,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(90, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(55, 25), \ FAN_POINT(65, 30), \ diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk index 8cef633..d4f5e00 100644 --- a/src/board/system76/oryp7/board.mk +++ b/src/board/system76/oryp7/board.mk @@ -14,9 +14,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -50,8 +47,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(90, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(55, 25), \ FAN_POINT(65, 30), \ diff --git a/src/board/system76/oryp8/board.mk b/src/board/system76/oryp8/board.mk index e70992b..9fcc034 100644 --- a/src/board/system76/oryp8/board.mk +++ b/src/board/system76/oryp8/board.mk @@ -17,9 +17,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -53,8 +50,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(90, 100) \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ FAN_POINT(55, 25), \ FAN_POINT(65, 30), \ diff --git a/src/board/system76/oryp9/board.mk b/src/board/system76/oryp9/board.mk index b6d7034..8047330 100644 --- a/src/board/system76/oryp9/board.mk +++ b/src/board/system76/oryp9/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -61,8 +58,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(87, 100), \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ diff --git a/src/board/system76/serw13/board.mk b/src/board/system76/serw13/board.mk index 2e499cd..4aa7d7e 100644 --- a/src/board/system76/serw13/board.mk +++ b/src/board/system76/serw13/board.mk @@ -20,9 +20,6 @@ KEYBOARD=15in_102 CONFIG_HAVE_KBLED = y KBLED=rgb_pwm -# Set discrete GPU I2C bus -CFLAGS+=-DI2C_DGPU=I2C_1 - # Set battery I2C bus CFLAGS+=-DI2C_SMBUS=I2C_4 @@ -63,8 +60,9 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ FAN_POINT(87, 100), \ " -# Enable DGPU support -CFLAGS+=-DHAVE_DGPU=1 +# Enable dGPU support +CONFIG_HAVE_DGPU = y +CFLAGS += -DI2C_DGPU=I2C_1 CFLAGS+=-DBOARD_DGPU_HEATUP=5 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\