Merge tag 'JH7110_515_SDK_v4.0.0-rc2' into vf2-devel

version JH7110_515_SDK_v4.0.0-rc2 for JH7110 EVB board 1. Fix hibernation issue: spdif, pwmdac, tdm, pdm, wave511, wave420l, jpu, can, isp, clk tree, gmac, gpio 2. Porting the upstream opensbi and add pm patch for hibernation 3. #3120 omx fix low probability of segment fault when decoding finish
starfive-tech · Jan 11, 2023 · f1d959f · f1d959f
2 parents 676a17d + 8571717
commit f1d959f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/arch/riscv/dts/starfive_evb.dts b/arch/riscv/dts/starfive_evb.dts
@@ -24,6 +24,7 @@
 
 	chosen {
 			stdout-path = "/soc/serial@10000000:115200";
+			starfive,boot-hart-id = <1>;
 	};
 
 

diff --git a/configs/starfive_evb_defconfig b/configs/starfive_evb_defconfig
@@ -77,6 +77,10 @@ CONFIG_DM_ETH_PHY=y
 CONFIG_DWC_ETH_QOS=y
 CONFIG_DWC_ETH_QOS_STARFIVE=y
 CONFIG_RGMII=y
+CONFIG_PINCTRL=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL_STARFIVE=y
+CONFIG_PINCTRL_STARFIVE_JH7110=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 # CONFIG_RAM_SIFIVE is not set
@@ -93,9 +97,5 @@ CONFIG_USB_CDNS3_HOST=y
 CONFIG_USB_CDNS3_STARFIVE=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_PINCTRL=y
-CONFIG_PINCONF=y
-CONFIG_PINCTRL_STARFIVE=y
-CONFIG_PINCTRL_STARFIVE_JH7110=y
 # CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2 is not set
 # CONFIG_EFI_LOAD_FILE2_INITRD is not set