Skip to content

Commit 42ad073

Browse files
authored
Add markers to faciliate easy parsing of kconfig-inclusion and series (#309)
* [Kconfig] [mellanox] Fix platform specific kconfig logic and consolidate mlnx kconfig Signed-off-by: Vivek Reddy <[email protected]> * Re-org options Signed-off-by: Vivek Reddy <[email protected]> * Include Secure boot cfg Signed-off-by: Vivek Reddy <[email protected]> * Update the option name to mellanox Signed-off-by: Vivek Reddy <[email protected]> * Remove duplicate mlnx options Signed-off-by: Vivek Reddy <[email protected]> * Revert kconfig option changes Signed-off-by: Vivek Reddy <[email protected]> * Added consistent marker format in the inclusions file Signed-off-by: Vivek Reddy <[email protected]> * Update markers and description for series file Signed-off-by: Vivek Reddy <[email protected]> * Fix in series mlnx sdk marker Signed-off-by: Vivek Reddy <[email protected]> * Update marker id Signed-off-by: Vivek Reddy <[email protected]> * Remove manager-config changes Signed-off-by: Vivek Reddy <[email protected]> --------- Signed-off-by: Vivek Reddy <[email protected]>
1 parent 4c2d457 commit 42ad073

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

patch/kconfig-inclusions

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Description: Add kconfig options that has to be included in the kernel
2+
# Note: Markers should start with "###->"
3+
# Header should end with .*-start eg: any_description-start
4+
# Footer must end with .*-end eg: any_description-end
5+
# Markers should not be nested
6+
17
[common]
28
CONFIG_LOG_BUF_SHIFT=20
39

@@ -30,7 +36,8 @@ CONFIG_GPIO_ICH=m
3036
CONFIG_SENSORS_MAX31790=m
3137
# For optoe
3238
CONFIG_EEPROM_OPTOE=m
33-
# For Mellanox
39+
40+
###-> mellanox-start
3441
CONFIG_OF=y
3542
CONFIG_THERMAL_OF=y
3643
CONFIG_CPU_THERMAL=y
@@ -87,6 +94,7 @@ CONFIG_TI_ADS1015=m
8794
CONFIG_SENSORS_EMC2305=m
8895
CONFIG_SENSORS_JC42=m
8996
CONFIG_SENSORS_POWR1220=m
97+
###-> mellanox-end
9098

9199
# For Cisco 8000
92100
CONFIG_PHYLIB=m

patch/series

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# This series applies on GIT commit 18c5597832fcf6988111b05a9a1607ae148723c
2+
# Note: Markers should start with "###->".
3+
# Header should end with .*-start eg: any_description-start
4+
# Footer must end with .*-end eg: any_description-end
5+
# Markers should not be nested
26

37
driver-arista-net-tg3-dma-mask-4g-sb800.patch
48
driver-arista-net-tg3-disallow-broadcom-default-mac.patch
@@ -58,6 +62,10 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
5862
#
5963

6064
# Mellanox patches for 5.10
65+
###-> mellanox_sdk-start
66+
###-> mellanox_sdk-end
67+
68+
###-> mellanox_hw_mgmt-start
6169
0001-i2c-mlxcpld-Update-module-license.patch
6270
0002-i2c-mlxcpld-Decrease-polling-time-for-performan.patch
6371
0003-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-s.patch
@@ -160,6 +168,7 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
160168
0173-core-Add-support-for-OSFP-transceiver-modules.patch
161169
0175-hwmon-pmbus-Add-support-for-Infineon-Digital-Multi-p.patch
162170
0180-hwmon-pmbus-Fix-sensors-readouts-for-MPS-Multi-phase.patch
171+
###-> mellanox_hw_mgmt-end
163172

164173
# Cisco patches for 5.10 kernel
165174
cisco-mtd-part.patch

0 commit comments

Comments
 (0)