Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add markers to faciliate easy parsing of kconfig-inclusion and series #309

Merged
merged 11 commits into from
Mar 16, 2023
Merged

Add markers to faciliate easy parsing of kconfig-inclusion and series #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1050680
[Kconfig] [mellanox] Fix platform specific kconfig logic and consolid…
vivekrnv Mar 9, 2023
91bf0b4
Re-org options
vivekrnv Mar 9, 2023
e4589f0
Include Secure boot cfg
vivekrnv Mar 9, 2023
c4cf529
Update the option name to mellanox
vivekrnv Mar 10, 2023
07b0183
Remove duplicate mlnx options
vivekrnv Mar 13, 2023
b8f168a
Revert kconfig option changes
vivekrnv Mar 15, 2023
62c18a1
Added consistent marker format in the inclusions file
vivekrnv Mar 15, 2023
eb6048b
Update markers and description for series file
vivekrnv Mar 15, 2023
9c8931a
Fix in series mlnx sdk marker
vivekrnv Mar 15, 2023
97add48
Update marker id
vivekrnv Mar 15, 2023
5edf688
Remove manager-config changes
vivekrnv Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion patch/kconfig-inclusions
View file
Open in desktop
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
View file
Open in desktop
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