Skip to content

Sync Nexthop patches-sonic, scripts, and config onto 6.12.94-update #28

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

Closed
chander-nexthop wants to merge 1 commit into from
Closed

Sync Nexthop patches-sonic, scripts, and config onto 6.12.94-update #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions config.local/amd64/config.sonic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ CONFIG_SENSORS_TMP464=m
CONFIG_I2C_XILINX=m
CONFIG_PCI_STUB=y
CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_Q54SJ108A2=m
CONFIG_SENSORS_TMP464=m
CONFIG_SPI_XILINX=m

Expand Down
4 changes: 3 additions & 1 deletion config.local/arm64/config.sonic-aspeed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CONFIG_ARCH_ASPEED=y
CONFIG_NET_VENDOR_FARADAY=y
CONFIG_NET_NCSI=y
CONFIG_NCSI_OEM_CMD_KEEP_PHY=y
CONFIG_FTGMAC100=y
CONFIG_UNICODE=y
CONFIG_BLOCK=y
Expand Down Expand Up @@ -34,6 +35,7 @@ CONFIG_SENSORS_ASPEED=y
CONFIG_SENSORS_ASPEED_G6=m
CONFIG_SENSORS_ASPEED_CHASSIS=m
CONFIG_ASPEED_WATCHDOG=y
CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_VIDEO_DEV=m
CONFIG_DVB_CORE=m
Expand Down Expand Up @@ -108,6 +110,7 @@ CONFIG_CRYPTO_DEV_ASPEED=y
###-> nvidia_aspeed_bmc-start
CONFIG_MODVERSIONS=y
CONFIG_MCTP=y
CONFIG_MTD_PHRAM=y
CONFIG_CHR_DEV_SG=y
CONFIG_REALTEK_PHY=m
CONFIG_USB_USBNET=y
Expand Down Expand Up @@ -156,7 +159,6 @@ CONFIG_ASPEED_MCTP=y
CONFIG_JTAG=y
CONFIG_JTAG_ASPEED=y
CONFIG_COMMON_CLK_AST2700=y
CONFIG_AST2700_RTC_OVER_ESPI=y
CONFIG_AST2700_MBOX=y
CONFIG_RTL_RGMII_SGMII_3809=y
CONFIG_HID_CP2112=m
Expand Down
4 changes: 2 additions & 2 deletions patches-sonic/0001-Add-device-tree-for-Nokia-BMC-H6-128-platform.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ index 3e904b273f1f..5caf80a7ff69 100644
ast2700-evb.dtb \
nexthop-b27-r0.dtb \
+ nokia-ast2700-h6-128-r0.dtb \
ast2700-evb_ast1700-evb.dtb \
ast2700-evb_ast1700-evb-dual.dtb \
ast2700-raw.dtb \
ast2700-evb-s0.dtb \
ast2700-evb-s1.dtb \
diff --git a/arch/arm64/boot/dts/aspeed/nokia-ast2700-h6-128-r0.dts b/arch/arm64/boot/dts/aspeed/nokia-ast2700-h6-128-r0.dts
new file mode 100644
index 000000000000..79b5bd7fb94a
Expand Down
Loading