boards: Replace CFLAGS defines with Make variables

docs/adding-a-new-board.md

@@ -24,18 +24,18 @@ Its charger has:
 DC OUTPUT (输出/輸出): 19.5V⎓9.23A 180W
 ```
 
-The schematics show it uses a 0.005 ohm sense resistor for both the adapter and
-the battery.
+The schematics show it has a TI BQ24780S smart charger and uses a 0.005 ohm
+sense resistor for both the adapter and the battery.
 
 This gives:
 
 ```
-CFLAGS+=\
-	-DCHARGER_ADAPTER_RSENSE=5 \
-	-DCHARGER_BATTERY_RSENSE=5 \
-	-DCHARGER_CHARGE_CURRENT=3072 \
-	-DCHARGER_CHARGE_VOLTAGE=16800 \
-	-DCHARGER_INPUT_CURRENT=9230
+CONFIG_CHARGER = bq24780s
+CONFIG_CHARGER_ADAPTER_RSENSE = 5
+CONFIG_CHARGER_BATTERY_RSENSE = 5
+CONFIG_CHARGER_CHARGE_CURRENT = 3072
+CONFIG_CHARGER_CHARGE_VOLTAGE = 16800
+CONFIG_CHARGER_INPUT_CURRENT = 9230
 ```
 
 ## GPIOs

src/board/system76/addw1/board.mk

@@ -3,55 +3,54 @@
 board-y += board.c
 board-y += gpio.c
 
-EC=ite
-CONFIG_EC_ITE_IT8587E=y
+EC = ite
+CONFIG_EC_ITE_IT8587E = y
 CONFIG_EC_FLASH_SIZE_128K = y
 
 # Intel-based host
 CONFIG_PLATFORM_INTEL = y
 
 # Include keyboard
-KEYBOARD=15in_102
+KEYBOARD = 15in_102
 
 # Set keyboard LED mechanism
 CONFIG_HAVE_KBLED = y
-KBLED=rgb_pwm
+CONFIG_KBLED = rgb_pwm
 
 # Set battery I2C bus
-CFLAGS+=-DI2C_SMBUS=I2C_0
+CONFIG_I2C_SMBUS = I2C_0
 
 # Set touchpad PS2 bus
-CFLAGS+=-DPS2_TOUCHPAD=PS2_3
+CONFIG_PS2_TOUCHPAD = PS2_3
 
 # Set smart charger parameters
-CFLAGS+=\
-	-DCHARGER_ADAPTER_RSENSE=5 \
-	-DCHARGER_BATTERY_RSENSE=10 \
-	-DCHARGER_CHARGE_CURRENT=3072 \
-	-DCHARGER_CHARGE_VOLTAGE=12600 \
-	-DCHARGER_INPUT_CURRENT=11800
+CONFIG_CHARGER = bq24780s
+CONFIG_CHARGER_ADAPTER_RSENSE = 5
+CONFIG_CHARGER_BATTERY_RSENSE = 10
+CONFIG_CHARGER_CHARGE_CURRENT = 3072
+CONFIG_CHARGER_CHARGE_VOLTAGE = 12600
+CONFIG_CHARGER_INPUT_CURRENT = 11800
 
 # Set CPU power limits in watts
-CFLAGS+=\
-	-DPOWER_LIMIT_AC=180 \
-	-DPOWER_LIMIT_DC=45
+CONFIG_POWER_LIMIT_AC = 180
+CONFIG_POWER_LIMIT_DC = 45
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
+CONFIG_I2C_DGPU = I2C_1
 
 # Fan configs
-CFLAGS += -DFAN1_PWM=DCR2
-CFLAGS += -DBOARD_FAN1_POINTS="\
+CONFIG_FAN1_PWM = DCR2
+CONFIG_FAN1_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
 
-CFLAGS += -DFAN2_PWM=DCR4
-CFLAGS += -DBOARD_FAN2_POINTS="\
+CONFIG_FAN2_PWM = DCR4
+CONFIG_FAN2_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \

src/board/system76/addw2/board.mk

@@ -3,55 +3,54 @@
 board-y += board.c
 board-y += gpio.c
 
-EC=ite
-CONFIG_EC_ITE_IT5570E=y
+EC = ite
+CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_128K = y
 
 # Intel-based host
 CONFIG_PLATFORM_INTEL = y
 
 # Include keyboard
-KEYBOARD=15in_102
+KEYBOARD = 15in_102
 
 # Set keyboard LED mechanism
 CONFIG_HAVE_KBLED = y
-KBLED=rgb_pwm
+CONFIG_KBLED = rgb_pwm
 
 # Set battery I2C bus
-CFLAGS+=-DI2C_SMBUS=I2C_4
+CONFIG_I2C_SMBUS = I2C_4
 
 # Set touchpad PS2 bus
-CFLAGS+=-DPS2_TOUCHPAD=PS2_3
+CONFIG_PS2_TOUCHPAD = PS2_3
 
 # Set smart charger parameters
-CFLAGS+=\
-	-DCHARGER_ADAPTER_RSENSE=5 \
-	-DCHARGER_BATTERY_RSENSE=10 \
-	-DCHARGER_CHARGE_CURRENT=3072 \
-	-DCHARGER_CHARGE_VOLTAGE=12600 \
-	-DCHARGER_INPUT_CURRENT=11800
+CONFIG_CHARGER = bq24780s
+CONFIG_CHARGER_ADAPTER_RSENSE = 5
+CONFIG_CHARGER_BATTERY_RSENSE = 10
+CONFIG_CHARGER_CHARGE_CURRENT = 3072
+CONFIG_CHARGER_CHARGE_VOLTAGE = 12600
+CONFIG_CHARGER_INPUT_CURRENT = 11800
 
 # Set CPU power limits in watts
-CFLAGS+=\
-	-DPOWER_LIMIT_AC=180 \
-	-DPOWER_LIMIT_DC=45
+CONFIG_POWER_LIMIT_AC = 180
+CONFIG_POWER_LIMIT_DC = 45
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
+CONFIG_I2C_DGPU = I2C_1
 
 # Fan configs
-CFLAGS += -DFAN1_PWM=DCR2
-CFLAGS += -DBOARD_FAN1_POINTS="\
+CONFIG_FAN1_PWM = DCR2
+CONFIG_FAN1_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
 
-CFLAGS += -DFAN2_PWM=DCR4
-CFLAGS += -DBOARD_FAN2_POINTS="\
+CONFIG_FAN2_PWM = DCR4
+CONFIG_FAN2_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \

src/board/system76/addw3/board.mk

@@ -3,62 +3,60 @@
 board-y += board.c
 board-y += gpio.c
 
-EC=ite
-CONFIG_EC_ITE_IT5570E=y
+EC = ite
+CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_128K = y
 
 # Intel-based host
 CONFIG_PLATFORM_INTEL = y
-CONFIG_BUS_ESPI=y
+CONFIG_BUS_ESPI = y
 
 # Enable firmware security
-CONFIG_SECURITY=y
+CONFIG_SECURITY = y
 
 # Include keyboard
-KEYBOARD=15in_102
+KEYBOARD = 15in_102
 
 # Set keyboard LED mechanism
 CONFIG_HAVE_KBLED = y
-KBLED=rgb_pwm
+CONFIG_KBLED = rgb_pwm
 
 # Set battery I2C bus
-CFLAGS+=-DI2C_SMBUS=I2C_4
+CONFIG_I2C_SMBUS = I2C_4
 
 # Set touchpad PS2 bus
-CFLAGS+=-DPS2_TOUCHPAD=PS2_3
+CONFIG_PS2_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=14000
+CONFIG_CHARGER = bq24780s
+CONFIG_CHARGER_ADAPTER_RSENSE = 5
+CONFIG_CHARGER_BATTERY_RSENSE = 10
+CONFIG_CHARGER_CHARGE_CURRENT = 1536
+CONFIG_CHARGER_CHARGE_VOLTAGE = 17600
+CONFIG_CHARGER_INPUT_CURRENT = 14000
 
 # Set CPU power limits in watts
-CFLAGS+=\
-	-DPOWER_LIMIT_AC=280 \
-	-DPOWER_LIMIT_DC=55
+CONFIG_POWER_LIMIT_AC = 280
+CONFIG_POWER_LIMIT_DC = 55
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
+CONFIG_I2C_DGPU = I2C_1
 
 # Fan configs
-CFLAGS += -DFAN1_PWM=DCR2
-CFLAGS += -DBOARD_FAN1_POINTS="\
+CONFIG_FAN1_PWM = DCR2
+CONFIG_FAN1_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
 
-CFLAGS += -DFAN2_PWM=DCR4
-CFLAGS += -DBOARD_FAN2_POINTS="\
+CONFIG_FAN2_PWM = DCR4
+CONFIG_FAN2_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \

src/board/system76/addw4/board.mk

@@ -19,33 +19,31 @@ CONFIG_SECURITY = y
 KEYBOARD = 18H9LHA04
 
 CONFIG_HAVE_KBLED = y
-KBLED = rgb_pwm
+CONFIG_KBLED = rgb_pwm
 
 # Set touchpad PS2 bus
-CFLAGS += -DPS2_TOUCHPAD=PS2_3
+CONFIG_PS2_TOUCHPAD = PS2_3
 
 # Set smart charger parameters
-CHARGER = oz26786
-CFLAGS += -DI2C_SMBUS=I2C_4
-CFLAGS += \
-	-DCHARGER_ADAPTER_RSENSE=5 \
-	-DCHARGER_BATTERY_RSENSE=10 \
-	-DCHARGER_CHARGE_CURRENT=3072 \
-	-DCHARGER_CHARGE_VOLTAGE=17400 \
-	-DCHARGER_INPUT_CURRENT=11500
+CONFIG_CHARGER = oz26786
+CONFIG_I2C_SMBUS = I2C_4
+CONFIG_CHARGER_ADAPTER_RSENSE = 5
+CONFIG_CHARGER_BATTERY_RSENSE = 10
+CONFIG_CHARGER_CHARGE_CURRENT = 3072
+CONFIG_CHARGER_CHARGE_VOLTAGE = 17400
+CONFIG_CHARGER_INPUT_CURRENT = 11500
 
 # Set CPU power limits in watts
-CFLAGS += \
-	-DPOWER_LIMIT_AC=230 \
-	-DPOWER_LIMIT_DC=45
+CONFIG_POWER_LIMIT_AC = 230
+CONFIG_POWER_LIMIT_DC = 45
 
 # Enable DGPU support
 CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
+CONFIG_I2C_DGPU = I2C_1
 
 # Fan configs
-CFLAGS += -DFAN1_PWM=DCR2
-CFLAGS += -DBOARD_FAN1_POINTS="\
+CONFIG_FAN1_PWM = DCR2
+CONFIG_FAN1_POINTS = " \
 	FAN_POINT(60, 28), \
 	FAN_POINT(65, 28), \
 	FAN_POINT(70, 40), \
@@ -55,8 +53,8 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(90, 100), \
 "
 
-CFLAGS += -DFAN2_PWM=DCR4
-CFLAGS += -DBOARD_FAN2_POINTS="\
+CONFIG_FAN2_PWM = DCR4
+CONFIG_FAN2_POINTS = " \
 	FAN_POINT(60, 28), \
 	FAN_POINT(65, 28), \
 	FAN_POINT(70, 40), \

src/board/system76/bonw14/board.mk

@@ -3,55 +3,54 @@
 board-y += board.c
 board-y += gpio.c
 
-EC=ite
-CONFIG_EC_ITE_IT5570E=y
+EC = ite
+CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_128K = y
 
 # Intel-based host
 CONFIG_PLATFORM_INTEL = y
 
 # Include keyboard
-KEYBOARD=15in_102_nkey
+KEYBOARD = 15in_102_nkey
 
 # Set keyboard LED mechanism
 CONFIG_HAVE_KBLED = y
-KBLED=bonw14
+CONFIG_KBLED = bonw14
 
 # Set battery I2C bus
-CFLAGS+=-DI2C_SMBUS=I2C_4
+CONFIG_I2C_SMBUS = I2C_4
 
 # Set touchpad PS2 bus
-CFLAGS+=-DPS2_TOUCHPAD=PS2_3
+CONFIG_PS2_TOUCHPAD = PS2_3
 
 # Set smart charger parameters
-CFLAGS+=\
-	-DCHARGER_ADAPTER_RSENSE=5 \
-	-DCHARGER_BATTERY_RSENSE=10 \
-	-DCHARGER_CHARGE_CURRENT=3072 \
-	-DCHARGER_CHARGE_VOLTAGE=16800 \
-	-DCHARGER_INPUT_CURRENT=14000
+CONFIG_CHARGER = bq24780s
+CONFIG_CHARGER_ADAPTER_RSENSE = 5
+CONFIG_CHARGER_BATTERY_RSENSE = 10
+CONFIG_CHARGER_CHARGE_CURRENT = 3072
+CONFIG_CHARGER_CHARGE_VOLTAGE = 16800
+CONFIG_CHARGER_INPUT_CURRENT = 14000
 
 # Set CPU power limits in watts
-CFLAGS+=\
-	-DPOWER_LIMIT_AC=180 \
-	-DPOWER_LIMIT_DC=45
+CONFIG_POWER_LIMIT_AC = 180
+CONFIG_POWER_LIMIT_DC = 45
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
-CFLAGS += -DI2C_DGPU=I2C_1
+CONFIG_I2C_DGPU = I2C_1
 
 # Fan configs
-CFLAGS += -DFAN1_PWM=DCR2
-CFLAGS += -DBOARD_FAN1_POINTS="\
+CONFIG_FAN1_PWM = DCR2
+CONFIG_FAN1_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
 
-CFLAGS += -DFAN2_PWM=DCR4
-CFLAGS += -DBOARD_FAN2_POINTS="\
+CONFIG_FAN2_PWM = DCR4
+CONFIG_FAN2_POINTS = " \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \