From 6a782a29a50b3c4ad52e5aa855f8b6708cdc84cd Mon Sep 17 00:00:00 2001 From: ThomasKaiser Date: Fri, 24 Nov 2017 05:26:43 -0800 Subject: [PATCH] Prepare upstream NEO Plus 2 u-boot submission Commit 4a4485b789895ee331f44d1856cb71d5a1ac9805 uses 408 MHz DRAM clockspeed --- patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch | 6 ++---- .../adjust-default-dram-clockspeeds.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch b/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch index 1e3ff481d4..01d53e2c25 100644 --- a/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch +++ b/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch @@ -16,12 +16,11 @@ new file mode 100644 index 0000000..ff99213 --- /dev/null +++ b/configs/nanopi_neo_plus2_defconfig -@@ -0,0 +1,21 @@ +@@ -0,0 +1,19 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y -+CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_MACH_SUN50I_H5=y -+CONFIG_DRAM_CLK=624 ++CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=3881977 +CONFIG_MACPWR="PD6" +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2" @@ -33,7 +32,6 @@ index 0000000..ff99213 +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set -+CONFIG_SPL_SPI_SUNXI=y +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch b/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch index 50fd0b2ea5..6f993968c9 100644 --- a/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch +++ b/patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch @@ -115,6 +115,19 @@ index c7db07a..38b6646 100644 CONFIG_DRAM_ZQ=3881977 CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo2" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig +index f6b4ca7..34437fc 100644 +--- a/configs/nanopi_neo_plus2_defconfig ++++ b/configs/nanopi_neo_plus2_defconfig +@@ -1,7 +1,7 @@ + CONFIG_ARM=y + CONFIG_ARCH_SUNXI=y + CONFIG_MACH_SUN50I_H5=y +-CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_CLK=624 + CONFIG_DRAM_ZQ=3881977 + CONFIG_MACPWR="PD6" + CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2" diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index b8c1ea4d7c..b4b20372aa 100644 --- a/configs/Orangepi_defconfig