diff --git a/patch/u-boot/u-boot-default/u-boot-99-opi-change-build-settings.patch b/patch/u-boot/u-boot-default/u-boot-99-opi-change-build-settings.patch
index 3b38c4f3c..23b8b5182 100644
--- a/patch/u-boot/u-boot-default/u-boot-99-opi-change-build-settings.patch
+++ b/patch/u-boot/u-boot-default/u-boot-99-opi-change-build-settings.patch
@@ -1,7 +1,38 @@
+diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
+index aaf0f68..2e346ea 100644
+--- a/configs/orangepi_pc_defconfig
++++ b/configs/orangepi_pc_defconfig
+@@ -14,3 +14,10 @@ CONFIG_SPL=y
+ CONFIG_CMD_GPIO=y
+ CONFIG_SY8106A_POWER=y
+ CONFIG_USB_EHCI_HCD=y
++CONFIG_USB1_VBUS_PIN=""
++CONFIG_USB2_VBUS_PIN=""
++CONFIG_USB3_VBUS_PIN=""
++CONFIG_DM=y
++CONFIG_DM_GPIO=y
++CONFIG_SY8106A_VOUT1_VOLT=1200
++CONFIG_SYS_CLK_FREQ=1008000000
+\ No newline at end of file
+diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
+index e52dcfc..d6b9111 100644
+--- a/configs/orangepi_plus_defconfig
++++ b/configs/orangepi_plus_defconfig
+@@ -14,3 +14,9 @@ CONFIG_SPL=y
+ CONFIG_CMD_GPIO=y
+ CONFIG_SY8106A_POWER=y
+ CONFIG_USB_EHCI_HCD=y
++CONFIG_USB1_VBUS_PIN="PG13"
++CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11)"
++CONFIG_DM=y
++CONFIG_DM_GPIO=y
++CONFIG_SY8106A_VOUT1_VOLT=1200
++CONFIG_SYS_CLK_FREQ=1008000000
+\ No newline at end of file
 diff -Nur a/configs/orangepi_h3_defconfig b/configs/orangepi_h3_defconfig
 --- a/configs/orangepi_h3_defconfig	1970-01-01 01:00:00.000000000 +0100
 +++ b/configs/orangepi_h3_defconfig	2016-02-19 00:58:31.007705977 +0100
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,20 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_MACH_SUN8I_H3=y
@@ -18,25 +49,113 @@ diff -Nur a/configs/orangepi_h3_defconfig b/configs/orangepi_h3_defconfig
 +CONFIG_CMD_GPIO=y
 +CONFIG_SY8106A_POWER=y
 +CONFIG_USB_EHCI_HCD=y
++CONFIG_USB1_VBUS_PIN=""
++CONFIG_USB2_VBUS_PIN=""
++CONFIG_USB3_VBUS_PIN=""
 +CONFIG_DM=y
 +CONFIG_DM_GPIO=y
-diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
-index aaf0f68..b389a0e 100644
---- a/configs/orangepi_pc_defconfig
-+++ b/configs/orangepi_pc_defconfig
-@@ -14,3 +14,5 @@ CONFIG_SPL=y
- CONFIG_CMD_GPIO=y
- CONFIG_SY8106A_POWER=y
- CONFIG_USB_EHCI_HCD=y
++CONFIG_SY8106A_VOUT1_VOLT=1200
++CONFIG_SYS_CLK_FREQ=1008000000
+diff --git a/configs/Sinovoip_BPI_M2_plus_defconfig b/configs/Sinovoip_BPI_M2_plus_defconfig
+new file mode 100644
+index 0000000..2e7c095
+--- /dev/null
++++ b/configs/Sinovoip_BPI_M2_plus_defconfig
+@@ -0,0 +1,18 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=672
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++# CONFIG_VIDEO is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_CMD_GPIO=y
++CONFIG_USB_EHCI_HCD=y
 +CONFIG_DM=y
 +CONFIG_DM_GPIO=y
-diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
-index e52dcfc..c2280e0 100644
---- a/configs/orangepi_plus_defconfig
-+++ b/configs/orangepi_plus_defconfig
-@@ -14,3 +14,5 @@ CONFIG_SPL=y
- CONFIG_CMD_GPIO=y
- CONFIG_SY8106A_POWER=y
- CONFIG_USB_EHCI_HCD=y
++CONFIG_SYS_CLK_FREQ=816000000
+diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
+new file mode 100644
+index 0000000..a69961c
+--- /dev/null
++++ b/configs/orangepi_2_defconfig
+@@ -0,0 +1,21 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=672
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++CONFIG_MMC0_CD_PIN="PF6"
++# CONFIG_VIDEO is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_CMD_GPIO=y
++CONFIG_SY8106A_POWER=y
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB1_VBUS_PIN="PG13"
 +CONFIG_DM=y
 +CONFIG_DM_GPIO=y
++CONFIG_SY8106A_VOUT1_VOLT=1200
++CONFIG_SYS_CLK_FREQ=1008000000
+diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
+new file mode 100644
+index 0000000..a69961c
+--- /dev/null
++++ b/configs/orangepi_one_defconfig
+@@ -0,0 +1,21 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=624
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++# CONFIG_VIDEO is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_CMD_GPIO=y
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB1_VBUS_PIN=""
++CONFIG_USB2_VBUS_PIN=""
++CONFIG_USB3_VBUS_PIN=""
++CONFIG_SYS_CLK_FREQ=1008000000
++CONFIG_DM=y
++CONFIG_DM_GPIO=y
+diff --git a/configs/FriendlyARM_NanoPi_M1_defconfig b/configs/FriendlyARM_NanoPi_M1_defconfig
+new file mode 100644
+index 0000000..2e7c095
+--- /dev/null
++++ b/configs/FriendlyARM_NanoPi_M1_defconfig
+@@ -0,0 +1,18 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=672
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++# CONFIG_VIDEO is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_CMD_GPIO=y
++CONFIG_USB_EHCI_HCD=y
++CONFIG_DM=y
++CONFIG_DM_GPIO=y
++CONFIG_SYS_CLK_FREQ=816000000