diff --git a/config/boards/lime2-emmc.conf b/config/boards/lime2-emmc.conf new file mode 100644 index 0000000000..054f972aa7 --- /dev/null +++ b/config/boards/lime2-emmc.conf @@ -0,0 +1,9 @@ +# A20 dual core 1Gb SoC eMMC +BOARD_NAME="Lime 2 eMMC" +LINUXFAMILY=sun7i +BOOTCONFIG=A20-OLinuXino-Lime2-eMMC_defconfig +MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp" +MODULES_NEXT="bonding" +CLI_TARGET="" +DESKTOP_TARGET="" +KERNEL_TARGET="default,next,dev" diff --git a/patch/u-boot/u-boot-next/add-emmc-lime2.patch.disabled b/patch/u-boot/u-boot-next/add-emmc-lime2.patch.disabled deleted file mode 100644 index 21cbd581e9..0000000000 --- a/patch/u-boot/u-boot-next/add-emmc-lime2.patch.disabled +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts -index 8acff78..3cdc5d1 100644 ---- a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts -+++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts -@@ -182,6 +182,15 @@ - status = "okay"; - }; - -+&mmc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc2_pins_a>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+}; -+ - &ohci0 { - status = "okay"; - }; -diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig -index c9d0f47..1b1ea27 100644 ---- a/configs/A20-OLinuXino-Lime2_defconfig -+++ b/configs/A20-OLinuXino-Lime2_defconfig -@@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y - CONFIG_MACH_SUN7I=y - CONFIG_DRAM_CLK=480 - CONFIG_MMC0_CD_PIN="PH1" -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - CONFIG_USB0_VBUS_PIN="PC17" - CONFIG_USB0_VBUS_DET="PH5" - CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2" diff --git a/patch/u-boot/u-boot-next/add-lime2-emmc.patch b/patch/u-boot/u-boot-next/add-lime2-emmc.patch new file mode 100644 index 0000000000..465acbc2bd --- /dev/null +++ b/patch/u-boot/u-boot-next/add-lime2-emmc.patch @@ -0,0 +1,26 @@ +diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig +new file mode 100644 +index 0000000..8eb70ae +--- /dev/null ++++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig +@@ -0,0 +1,20 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN7I=y ++CONFIG_DRAM_CLK=480 ++CONFIG_MMC0_CD_PIN="PH1" ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++CONFIG_USB0_VBUS_PIN="PC17" ++CONFIG_USB0_VBUS_DET="PH5" ++CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2-emmc" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)" ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_RTL8211X_PHY_FORCE_MASTER=y ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_AXP_ALDO3_VOLT=2800 ++CONFIG_AXP_ALDO4_VOLT=2800 ++CONFIG_USB_EHCI_HCD=y