diff --git a/patch/u-boot/u-boot-sun50i-dev/add-nanopineo2.patch b/patch/u-boot/u-boot-sun50i-dev/add-nanopineo2.patch new file mode 100644 index 0000000000..7e2899c540 --- /dev/null +++ b/patch/u-boot/u-boot-sun50i-dev/add-nanopineo2.patch @@ -0,0 +1,20 @@ +diff --git a/u-boot/configs/nanopi_neo2_defconfig b/u-boot/configs/nanopi_neo2_defconfig +new file mode 100644 +index 0000000..6e550c8 +--- /dev/null ++++ b/u-boot/configs/nanopi_neo2_defconfig +@@ -0,0 +1,14 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN50I_H5_64=y ++CONFIG_SPL=y ++CONFIG_DRAM_CLK=672 ++CONFIG_DRAM_ZQ=3881977 ++CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi2" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_CONSOLE_MUX=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 diff --git a/patch/u-boot/u-boot-sun50i-dev/add_nanopineo2.patch b/patch/u-boot/u-boot-sun50i-dev/add_nanopineo2.patch deleted file mode 100644 index c177b04818..0000000000 --- a/patch/u-boot/u-boot-sun50i-dev/add_nanopineo2.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/u-boot/configs/nanopi_neo2_defconfig b/u-boot/configs/nanopi_neo2_defconfig -new file mode 100755 -index 0000000..6e550c8 ---- /dev/null -+++ b/u-boot/configs/nanopi_neo2_defconfig -@@ -0,0 +1,14 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_MACH_SUN50I_H5_64=y -+CONFIG_SPL=y -+CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_ZQ=3881977 -+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi2" -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_CONSOLE_MUX=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 -diff --git a/Makefile b/Makefile -old mode 100644 -new mode 100755 -index d88b305..d425337 ---- a/Makefile -+++ b/Makefile -@@ -57,6 +57,11 @@ orangepipc2: u_boot_h5 arm_trusted_firmware - @u-boot/tools/mkimage -E -f config.its u-boot.itb - @aarch64-linux-gnu-objcopy --gap-fill=0xff -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn -j .efi_runtime -j .efi_runtime_rel -I binary -O binary --pad-to=32768 --gap-fill=0xff sunxi-spl.bin u-boot-sunxi-with-spl.bin && cat u-boot.itb >> u-boot-sunxi-with-spl.bin - -+.PHONY: nanopineo2 -+nanopineo2: u_boot_h5 arm_trusted_firmware -+ @u-boot/tools/mkimage -E -f config.its u-boot.itb -+ @aarch64-linux-gnu-objcopy --gap-fill=0xff -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn -j .efi_runtime -j .efi_runtime_rel -I binary -O binary --pad-to=32768 --gap-fill=0xff sunxi-spl.bin u-boot-sunxi-with-spl.bin && cat u-boot.itb >> u-boot-sunxi-with-spl.bin -+ - .PHONY: pine64 - pine64: u_boot_a64 arm_trusted_firmware - @u-boot/tools/mkimage -E -f config.its u-boot.itb -@@ -84,3 +89,7 @@ pine64_so_defconfig: - .PHONY: orangepi_pc2_defconfig - orangepi_pc2_defconfig: - @cp blobs/sun50i_h5.its config.its -+ -+ .PHONY: orangepi_pc2_defconfig -+nanopi_neo2_defconfig: -+ @cp blobs/sun50i_h5.its config.its -\ No newline at end of file