From: Aleksander Jan Bajkowski Date: Sun, 9 Feb 2020 17:27:48 +0000 (+0100) Subject: uboot-sunxi: Banana Pi M2 Ultra switch to mainline defconfig X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9bd89fe18e1414c430e0fe7f4425779d149d540;p=openwrt%2Fstaging%2Fzorun.git uboot-sunxi: Banana Pi M2 Ultra switch to mainline defconfig U-boot also have defconfig for this board. In 2019.01 branch they are identical. Signed-off-by: Aleksander Jan Bajkowski --- diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 69d5d9269b..9bb61b1417 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -253,7 +253,7 @@ define U-Boot/orangepi_pc2 UENV:=a64 endef -define U-Boot/Sinovoip_BPI_M2_Ultra +define U-Boot/Bananapi_M2_Ultra BUILD_SUBTARGET:=cortexa7 NAME:=Bananapi M2 Ultra BUILD_DEVICES:=lemaker_bananapi-m2-ultra @@ -267,6 +267,7 @@ UBOOT_TARGETS := \ A20-OLinuXino-Lime2-eMMC \ A20-OLinuXino_MICRO \ Bananapi \ + Bananapi_M2_Ultra \ Bananapro \ Cubieboard \ Cubieboard2 \ @@ -294,7 +295,6 @@ UBOOT_TARGETS := \ pangolin \ pine64_plus \ Sinovoip_BPI_M2_Plus \ - Sinovoip_BPI_M2_Ultra \ sopine_baseboard \ orangepi_zero_plus diff --git a/package/boot/uboot-sunxi/patches/250-Sinovoip-BPI-M2-Ultra-defconfig.patch b/package/boot/uboot-sunxi/patches/250-Sinovoip-BPI-M2-Ultra-defconfig.patch deleted file mode 100644 index 94606aa846..0000000000 --- a/package/boot/uboot-sunxi/patches/250-Sinovoip-BPI-M2-Ultra-defconfig.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- /dev/null -+++ b/configs/Sinovoip_BPI_M2_Ultra_defconfig -@@ -0,0 +1,22 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_SPL=y -+CONFIG_MACH_SUN8I_R40=y -+CONFIG_DRAM_CLK=576 -+CONFIG_DRAM_ZQ=3881979 -+CONFIG_MACPWR="PA17" -+CONFIG_MMC0_CD_PIN="PH13" -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+CONFIG_AHCI=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_SPL_I2C_SUPPORT=y -+# CONFIG_CMD_FLASH is not set -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra" -+CONFIG_SCSI_AHCI=y -+CONFIG_RGMII=y -+CONFIG_SUN8I_EMAC=y -+CONFIG_AXP_DLDO4_VOLT=2500 -+CONFIG_AXP_ELDO3_VOLT=1200 -+CONFIG_SCSI=y -+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y