add missing MMC_SUNXI_SLOT_EXTRA in both SPL and U-Boot

This commit is contained in:
Martin Ayotte 2017-04-26 10:36:47 -04:00
parent 5ad09a5c06
commit fe7eec4eb0
2 changed files with 9 additions and 3 deletions

View File

@ -8,7 +8,7 @@ diff --git a/u-boot/configs/sun50i_h5_spl32_defconfig b/u-boot/configs/sun50i_h5
index c73efd5..5783a72 100644
--- a/u-boot/configs/sun50i_h5_spl32_defconfig
+++ b/u-boot/configs/sun50i_h5_spl32_defconfig
@@ -4,12 +4,14 @@ CONFIG_MACH_SUN50I_H5_32=y
@@ -4,12 +4,15 @@ CONFIG_MACH_SUN50I_H5_32=y
CONFIG_DRAM_CLK=672
CONFIG_DRAM_ZQ=3881977
CONFIG_DRAM_ODT_EN=y
@ -24,6 +24,7 @@ index c73efd5..5783a72 100644
+CONFIG_SPL_SPI_SUNXI=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set

View File

@ -3,7 +3,7 @@ new file mode 100644
index 0000000..68f889d
--- /dev/null
+++ b/u-boot/arch/arm/dts/sun50i-h5-orangepi-zeroplus.dts
@@ -0,0 +1,135 @@
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 ARM Ltd.
+ *
@ -121,6 +121,10 @@ index 0000000..68f889d
+ };
+};
+
+&emac {
+ status = "disabled";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
@ -160,13 +164,14 @@ new file mode 100644
index 0000000..68f889d
--- /dev/null
+++ b/u-boot/configs/orangepi_zeroplus_defconfig
@@ -0,0 +1,16 @@
@@ -0,0 +1,17 @@
+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_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-zeroplus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y