Skip to content

Commit

Permalink
Add markers to faciliate easy parsing of kconfig-inclusion and series (
Browse files Browse the repository at this point in the history
…sonic-net#309)

* [Kconfig] [mellanox] Fix platform specific kconfig logic and consolidate mlnx kconfig

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Re-org options

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Include Secure boot cfg

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update the option name to mellanox

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Remove duplicate mlnx options

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Revert kconfig option changes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Added consistent marker format in the inclusions file

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update markers and description for series file

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Fix in series mlnx sdk marker

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update marker id

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Remove manager-config changes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

---------

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
  • Loading branch information
vivekrnv committed Mar 16, 2023
1 parent 4c2d457 commit 42ad073
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
10 changes: 9 additions & 1 deletion patch/kconfig-inclusions
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Description: Add kconfig options that has to be included in the kernel
# Note: Markers should start with "###->"
# Header should end with .*-start eg: any_description-start
# Footer must end with .*-end eg: any_description-end
# Markers should not be nested

[common]
CONFIG_LOG_BUF_SHIFT=20

Expand Down Expand Up @@ -30,7 +36,8 @@ CONFIG_GPIO_ICH=m
CONFIG_SENSORS_MAX31790=m
# For optoe
CONFIG_EEPROM_OPTOE=m
# For Mellanox

###-> mellanox-start
CONFIG_OF=y
CONFIG_THERMAL_OF=y
CONFIG_CPU_THERMAL=y
Expand Down Expand Up @@ -87,6 +94,7 @@ CONFIG_TI_ADS1015=m
CONFIG_SENSORS_EMC2305=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_POWR1220=m
###-> mellanox-end

# For Cisco 8000
CONFIG_PHYLIB=m
Expand Down
9 changes: 9 additions & 0 deletions patch/series
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# This series applies on GIT commit 18c5597832fcf6988111b05a9a1607ae148723c
# Note: Markers should start with "###->".
# Header should end with .*-start eg: any_description-start
# Footer must end with .*-end eg: any_description-end
# Markers should not be nested

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

# Mellanox patches for 5.10
###-> mellanox_sdk-start
###-> mellanox_sdk-end

###-> mellanox_hw_mgmt-start
0001-i2c-mlxcpld-Update-module-license.patch
0002-i2c-mlxcpld-Decrease-polling-time-for-performan.patch
0003-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-s.patch
Expand Down Expand Up @@ -160,6 +168,7 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
0173-core-Add-support-for-OSFP-transceiver-modules.patch
0175-hwmon-pmbus-Add-support-for-Infineon-Digital-Multi-p.patch
0180-hwmon-pmbus-Fix-sensors-readouts-for-MPS-Multi-phase.patch
###-> mellanox_hw_mgmt-end

# Cisco patches for 5.10 kernel
cisco-mtd-part.patch
Expand Down

0 comments on commit 42ad073

Please sign in to comment.