From ebc5168cb0aa3e28a71b4118cb34a520ce1cc41c Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Mon, 24 Jul 2023 10:20:21 -0600 Subject: [PATCH] Remove the use of symlinks Replace symlinks with directories with `board.mk`, using relative paths to include the files rather than duplicate them. This allows making board-specific changes without affecting other boards, such as when firmware security had to be enabled on galp6 when it was enabled on galp7 (2d5cbadf7124). Signed-off-by: Tim Crawford --- src/board/system76/darp6 | 1 - src/board/system76/darp6/board.mk | 39 ++++++++++++ src/board/system76/galp4 | 1 - src/board/system76/galp4/board.mk | 40 ++++++++++++ src/board/system76/galp7 | 1 - src/board/system76/galp7/board.mk | 47 ++++++++++++++ src/board/system76/gaze16-3060-b | 1 - src/board/system76/gaze16-3060-b/board.mk | 69 ++++++++++++++++++++ src/board/system76/gaze17-3060-b | 1 - src/board/system76/gaze17-3060-b/board.mk | 70 +++++++++++++++++++++ src/board/system76/oryp10 | 1 - src/board/system76/oryp10/board.mk | 76 +++++++++++++++++++++++ 12 files changed, 341 insertions(+), 6 deletions(-) delete mode 120000 src/board/system76/darp6 create mode 100644 src/board/system76/darp6/board.mk delete mode 120000 src/board/system76/galp4 create mode 100644 src/board/system76/galp4/board.mk delete mode 120000 src/board/system76/galp7 create mode 100644 src/board/system76/galp7/board.mk delete mode 120000 src/board/system76/gaze16-3060-b create mode 100644 src/board/system76/gaze16-3060-b/board.mk delete mode 120000 src/board/system76/gaze17-3060-b create mode 100644 src/board/system76/gaze17-3060-b/board.mk delete mode 120000 src/board/system76/oryp10 create mode 100644 src/board/system76/oryp10/board.mk diff --git a/src/board/system76/darp6 b/src/board/system76/darp6 deleted file mode 120000 index d769939..0000000 --- a/src/board/system76/darp6 +++ /dev/null @@ -1 +0,0 @@ -darp5 \ No newline at end of file diff --git a/src/board/system76/darp6/board.mk b/src/board/system76/darp6/board.mk new file mode 100644 index 0000000..7e3bb21 --- /dev/null +++ b/src/board/system76/darp6/board.mk @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-3.0-only + +board-y += ../darp5/board.c +board-y += ../darp5/gpio.c + +# FIXME: Handle this better +CFLAGS += -I$(BOARD_DIR)/../darp5/include + +EC=ite +CONFIG_EC_ITE_IT8587E=y + +# Include keyboard +KEYBOARD=15in_102 + +# Set keyboard LED mechanism +KBLED=darp5 +CFLAGS+=-DI2C_KBLED=I2C_1 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_0 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +CFLAGS+=\ + -DCHARGER_ADAPTER_RSENSE=10 \ + -DCHARGER_BATTERY_RSENSE=10 \ + -DCHARGER_CHARGE_CURRENT=3072 \ + -DCHARGER_CHARGE_VOLTAGE=17600 \ + -DCHARGER_INPUT_CURRENT=3420 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + +# Add system76 common code +include src/board/system76/common/common.mk diff --git a/src/board/system76/galp4 b/src/board/system76/galp4 deleted file mode 120000 index 23e22ea..0000000 --- a/src/board/system76/galp4 +++ /dev/null @@ -1 +0,0 @@ -galp3-c \ No newline at end of file diff --git a/src/board/system76/galp4/board.mk b/src/board/system76/galp4/board.mk new file mode 100644 index 0000000..b676baa --- /dev/null +++ b/src/board/system76/galp4/board.mk @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-3.0-only + +board-y += ../galp3-c/board.c +board-y += ../galp3-c/gpio.c + +# FIXME: Handle this better +CFLAGS += -I$(BOARD_DIR)/../galp3-c/include + +EC=ite +CONFIG_EC_ITE_IT8587E=y + +# Include keyboard +KEYBOARD=14in_86 + +# Set keyboard LED mechanism +KBLED=white_dac +CFLAGS+=-DKBLED_DAC=5 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_0 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +# FIXME: Verify parts and values. +CFLAGS+=\ + -DCHARGER_ADAPTER_RSENSE=10 \ + -DCHARGER_BATTERY_RSENSE=10 \ + -DCHARGER_CHARGE_CURRENT=1536 \ + -DCHARGER_CHARGE_VOLTAGE=13056 \ + -DCHARGER_INPUT_CURRENT=2100 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=40 \ + -DPOWER_LIMIT_DC=28 + +# Add system76 common code +include src/board/system76/common/common.mk diff --git a/src/board/system76/galp7 b/src/board/system76/galp7 deleted file mode 120000 index 0bc5787..0000000 --- a/src/board/system76/galp7 +++ /dev/null @@ -1 +0,0 @@ -galp6 \ No newline at end of file diff --git a/src/board/system76/galp7/board.mk b/src/board/system76/galp7/board.mk new file mode 100644 index 0000000..a3e5679 --- /dev/null +++ b/src/board/system76/galp7/board.mk @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: GPL-3.0-only + +board-y += ../galp6/board.c +board-y += ../galp6/gpio.c + +# FIXME: Handle this better +CFLAGS += -I$(BOARD_DIR)/../galp6/include + +EC=ite +CONFIG_EC_ITE_IT5570E=y + +# Enable eSPI +CONFIG_BUS_ESPI=y + +# Enable firmware security +CONFIG_SECURITY=y + +# Include keyboard +KEYBOARD=14in_83 + +# Set keyboard LED mechanism +KBLED=white_dac +CFLAGS+=-DKBLED_DAC=2 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_4 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +# TODO: actually bq24800 +# FIXME: Verify parts and values. +CFLAGS+=\ + -DCHARGER_ADAPTER_RSENSE=5 \ + -DCHARGER_BATTERY_RSENSE=10 \ + -DCHARGER_CHARGE_CURRENT=1536 \ + -DCHARGER_CHARGE_VOLTAGE=17400 \ + -DCHARGER_INPUT_CURRENT=4740 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + +# Add system76 common code +include src/board/system76/common/common.mk diff --git a/src/board/system76/gaze16-3060-b b/src/board/system76/gaze16-3060-b deleted file mode 120000 index 7aa1fbf..0000000 --- a/src/board/system76/gaze16-3060-b +++ /dev/null @@ -1 +0,0 @@ -gaze16-3060 \ No newline at end of file diff --git a/src/board/system76/gaze16-3060-b/board.mk b/src/board/system76/gaze16-3060-b/board.mk new file mode 100644 index 0000000..a22865d --- /dev/null +++ b/src/board/system76/gaze16-3060-b/board.mk @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: GPL-3.0-only + +board-y += ../gaze16-3060/board.c +board-y += ../gaze16-3060/gpio.c + +# FIXME: Handle this better +CFLAGS += -I$(BOARD_DIR)/../gaze16-3060/include + +EC=ite +CONFIG_EC_ITE_IT5570E=y + +# Enable eSPI +CONFIG_BUS_ESPI=y + +# Include keyboard +KEYBOARD=15in_102 + +# Set keyboard LED mechanism +KBLED=rgb_pwm + +# Set discrete GPU I2C bus +CFLAGS+=-DI2C_DGPU=I2C_1 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_4 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +# FIXME: Verify parts and values. +CHARGER=oz26786 +CFLAGS+=\ + -DCHARGER_ADAPTER_RSENSE=5 \ + -DCHARGER_BATTERY_RSENSE=10 \ + -DCHARGER_CHARGE_CURRENT=1536 \ + -DCHARGER_CHARGE_VOLTAGE=16800 \ + -DCHARGER_INPUT_CURRENT=9230 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=180 \ + -DPOWER_LIMIT_DC=45 + +# Custom fan curve +CFLAGS+=-DBOARD_HEATUP=5 +CFLAGS+=-DBOARD_COOLDOWN=20 +CFLAGS+=-DBOARD_FAN_POINTS="\ + FAN_POINT(60, 40), \ + FAN_POINT(65, 60), \ + FAN_POINT(70, 75), \ + FAN_POINT(75, 90), \ + FAN_POINT(80, 100) \ +" + +# Enable DGPU support +CFLAGS+=-DHAVE_DGPU=1 +CFLAGS+=-DBOARD_DGPU_HEATUP=5 +CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 +CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ + FAN_POINT(60, 40), \ + FAN_POINT(65, 60), \ + FAN_POINT(70, 75), \ + FAN_POINT(75, 90), \ + FAN_POINT(80, 100) \ +" + +# Add system76 common code +include src/board/system76/common/common.mk diff --git a/src/board/system76/gaze17-3060-b b/src/board/system76/gaze17-3060-b deleted file mode 120000 index ddfc45b..0000000 --- a/src/board/system76/gaze17-3060-b +++ /dev/null @@ -1 +0,0 @@ -gaze17-3060 \ No newline at end of file diff --git a/src/board/system76/gaze17-3060-b/board.mk b/src/board/system76/gaze17-3060-b/board.mk new file mode 100644 index 0000000..06e0e38 --- /dev/null +++ b/src/board/system76/gaze17-3060-b/board.mk @@ -0,0 +1,70 @@ +# SPDX-License-Identifier: GPL-3.0-only + +board-y += ../gaze17-3060/board.c +board-y += ../gaze17-3060/gpio.c + +# FIXME: Handle this better +CFLAGS += -I$(BOARD_DIR)/../gaze17-3060/include + +EC=ite +CONFIG_EC_ITE_IT5570E=y + +# Enable eSPI +CONFIG_BUS_ESPI=y + +# Include keyboard +KEYBOARD=15in_102 + +# Set keyboard LED mechanism +KBLED=rgb_pwm + +# Set discrete GPU I2C bus +CFLAGS+=-DI2C_DGPU=I2C_1 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_4 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +# TODO: actually bq24800 +# FIXME: Verify parts and values. +CHARGER=bq24780s +CFLAGS+=\ + -DCHARGER_ADAPTER_RSENSE=5 \ + -DCHARGER_BATTERY_RSENSE=10 \ + -DCHARGER_CHARGE_CURRENT=1536 \ + -DCHARGER_CHARGE_VOLTAGE=17600 \ + -DCHARGER_INPUT_CURRENT=7500 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=180 \ + -DPOWER_LIMIT_DC=45 + +# Custom fan curve +CFLAGS+=-DBOARD_HEATUP=5 +CFLAGS+=-DBOARD_COOLDOWN=20 +CFLAGS+=-DBOARD_FAN_POINTS="\ + FAN_POINT(60, 40), \ + FAN_POINT(65, 60), \ + FAN_POINT(70, 75), \ + FAN_POINT(75, 90), \ + FAN_POINT(80, 100) \ +" + +# Enable DGPU support +CFLAGS+=-DHAVE_DGPU=1 +CFLAGS+=-DBOARD_DGPU_HEATUP=5 +CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 +CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ + FAN_POINT(60, 40), \ + FAN_POINT(65, 60), \ + FAN_POINT(70, 75), \ + FAN_POINT(75, 90), \ + FAN_POINT(80, 100) \ +" + +# Add system76 common code +include src/board/system76/common/common.mk diff --git a/src/board/system76/oryp10 b/src/board/system76/oryp10 deleted file mode 120000 index 766b595..0000000 --- a/src/board/system76/oryp10 +++ /dev/null @@ -1 +0,0 @@ -oryp9 \ No newline at end of file diff --git a/src/board/system76/oryp10/board.mk b/src/board/system76/oryp10/board.mk new file mode 100644 index 0000000..668cadb --- /dev/null +++ b/src/board/system76/oryp10/board.mk @@ -0,0 +1,76 @@ +# SPDX-License-Identifier: GPL-3.0-only + +board-y += ../oryp9/board.c +board-y += ../oryp9/gpio.c + +# FIXME: Handle this better +CFLAGS += -I$(BOARD_DIR)/../oryp9/include + +EC=ite +CONFIG_EC_ITE_IT5570E=y + +# Enable eSPI +CONFIG_BUS_ESPI=y + +# Enable firmware security +CONFIG_SECURITY=y + +# Include keyboard +KEYBOARD=15in_102 + +# Set keyboard LED mechanism +KBLED=rgb_pwm + +# Set discrete GPU I2C bus +CFLAGS+=-DI2C_DGPU=I2C_1 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_4 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +# TODO: actually bq24800 +# FIXME: Verify parts and values. +CFLAGS+=\ + -DCHARGER_ADAPTER_RSENSE=5 \ + -DCHARGER_BATTERY_RSENSE=10 \ + -DCHARGER_CHARGE_CURRENT=2048 \ + -DCHARGER_CHARGE_VOLTAGE=13050 \ + -DCHARGER_INPUT_CURRENT=11500 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=180 \ + -DPOWER_LIMIT_DC=45 + +# Disable syncing fan speeds +#CFLAGS+=-DSYNC_FANS=0 + +# Custom fan curve +CFLAGS+=-DBOARD_HEATUP=5 +CFLAGS+=-DBOARD_COOLDOWN=20 +CFLAGS+=-DBOARD_FAN_POINTS="\ + FAN_POINT(50, 40), \ + FAN_POINT(55, 40), \ + FAN_POINT(60, 55), \ + FAN_POINT(69, 55), \ + FAN_POINT(74, 68), \ + FAN_POINT(79, 68), \ + FAN_POINT(80, 72), \ + FAN_POINT(87, 100), \ +" + +# Enable DGPU support +CFLAGS+=-DHAVE_DGPU=1 +CFLAGS+=-DBOARD_DGPU_HEATUP=5 +CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 +CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ + FAN_POINT(50, 40), \ + FAN_POINT(56, 40), \ + FAN_POINT(72, 100), \ +" + +# Add system76 common code +include src/board/system76/common/common.mk