From 40061e1ff7f2f8d7cda06060aa840df1d7b0e580 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Tue, 9 May 2017 15:50:37 +0300 Subject: [PATCH] Readd OPi Zero+2-H3 u-boot defconfig --- .../add-opizeroplus2-h3.patch | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) rename patch/u-boot/u-boot-sunxi/{unresolved => }/add-opizeroplus2-h3.patch (94%) diff --git a/patch/u-boot/u-boot-sunxi/unresolved/add-opizeroplus2-h3.patch b/patch/u-boot/u-boot-sunxi/add-opizeroplus2-h3.patch similarity index 94% rename from patch/u-boot/u-boot-sunxi/unresolved/add-opizeroplus2-h3.patch rename to patch/u-boot/u-boot-sunxi/add-opizeroplus2-h3.patch index 7ea7aa5572..1bb5a51325 100644 --- a/patch/u-boot/u-boot-sunxi/unresolved/add-opizeroplus2-h3.patch +++ b/patch/u-boot/u-boot-sunxi/add-opizeroplus2-h3.patch @@ -1,41 +1,18 @@ -diff --git a/configs/orangepi-zeroplus_defconfig b/configs/orangepi-zeroplus_defconfig -new file mode 100644 -index 0000000..61fe8c6 ---- /dev/null -+++ b/configs/orangepi-zeroplus_defconfig -@@ -0,0 +1,17 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_MACH_SUN8I_H3=y -+CONFIG_DRAM_CLK=408 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_DRAM_ODT_EN=y -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-zeroplus" -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_CONSOLE_MUX=y -+CONFIG_SPL=y -+# CONFIG_CMD_IMLS is not set -+# CONFIG_CMD_FLASH is not set -+# CONFIG_CMD_FPGA is not set -+CONFIG_SUN8I_EMAC=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_SYS_CLK_FREQ=480000000 -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index eb68c20..ee14b41 100644 +index f3f53f3e29..7a666ef045 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -293,6 +293,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ +@@ -303,6 +303,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h3-orangepi-pc-plus.dtb \ sun8i-h3-orangepi-plus.dtb \ sun8i-h3-orangepi-plus2e.dtb \ + sun8i-h3-orangepi-zeroplus.dtb \ - sun8i-h3-nanopi-neo.dtb - dtb-$(CONFIG_MACH_SUN50I) += \ - sun50i-a64-pine64-plus.dtb \ + sun8i-h3-nanopi-neo.dtb \ + sun8i-h3-nanopi-neo-air.dtb + dtb-$(CONFIG_MACH_SUN8I_R40) += \ diff --git a/arch/arm/dts/sun8i-h3-orangepi-zeroplus.dts b/arch/arm/dts/sun8i-h3-orangepi-zeroplus.dts new file mode 100644 -index 0000000..61fe8c6 +index 0000000000..9cc48c2536 --- /dev/null +++ b/arch/arm/dts/sun8i-h3-orangepi-zeroplus.dts @@ -0,0 +1,149 @@ @@ -188,3 +165,26 @@ index 0000000..61fe8c6 + status = "okay"; +}; + +diff --git a/configs/orangepi-zeroplus_defconfig b/configs/orangepi-zeroplus_defconfig +new file mode 100644 +index 0000000000..3bfcf619b1 +--- /dev/null ++++ b/configs/orangepi-zeroplus_defconfig +@@ -0,0 +1,17 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_SPL_SPI_FLASH_SUPPORT=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-zeroplus" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_CONSOLE_MUX=y ++CONFIG_SPL=y ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_SPL_SPI_SUNXI=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_SYS_CLK_FREQ=480000000