Permalink
Browse files

Update mainline u-boot to v2017.01

  • Loading branch information...
1 parent 2479d35 commit ed5bf217b6f037b406bba2d6ff0d3cb94199bea3 @zador-blood-stained zador-blood-stained committed Jan 9, 2017
View
@@ -49,7 +49,7 @@ else
MAINLINE_UBOOT_SOURCE='git://git.denx.de/u-boot.git'
fi
#MAINLINE_UBOOT_BRANCH="v$(git ls-remote git://git.denx.de/u-boot.git | grep -v rc | grep -v '\^' | tail -1 | cut -d'v' -f 2)"
-MAINLINE_UBOOT_BRANCH='tag:v2016.11'
+MAINLINE_UBOOT_BRANCH='tag:v2017.01'
MAINLINE_UBOOT_DIR='u-boot'
# Let's set default data if not defined in board configuration above
@@ -12,12 +12,19 @@ index 836a8c4d..9d2da6e0 100644
sun8i-h3-orangepi-lite.dtb \
diff --git a/arch/arm/dts/sun8i-h2plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2plus-orangepi-zero.dts
new file mode 100644
-index 00000000..9e468904
+index 000000000..64b834438
--- /dev/null
+++ b/arch/arm/dts/sun8i-h2plus-orangepi-zero.dts
-@@ -0,0 +1,2 @@
+@@ -0,0 +1,8 @@
+
+#include "sun8i-h3-orangepi-one.dts"
++
++/ {
++ model = "Xunlong Orange Pi Zero";
++ compatible = "xunlong,orangepi-zero", "allwinner,sun8i-h2plus", "allwinner,sun8i-h3";
++
++};
+\ No newline at end of file
diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
new file mode 100644
index 00000000..bdaffa88
@@ -1,12 +1,20 @@
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e63309a..f443bc7 100644
+index 0ed36cded..0882209ef 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -659,7 +659,6 @@ config ARCH_SUNXI
+@@ -581,7 +581,6 @@ config ARCH_SUNXI
+ select DM
+ select DM_ETH
+ select DM_GPIO
+- select DM_KEYBOARD
+ select DM_SERIAL
+ select DM_USB if DISTRO_DEFAULTS
+ select OF_BOARD_SETUP
+@@ -592,7 +591,6 @@ config ARCH_SUNXI
select SYS_NS16550
- select USB
- select USB_STORAGE
-- select USB_KEYBOARD
+ select USB if DISTRO_DEFAULTS
+ select USB_STORAGE if DISTRO_DEFAULTS
+- select USB_KEYBOARD if DISTRO_DEFAULTS
select USE_TINY_PRINTF
- config TARGET_TS4800
+ config TARGET_TS4600
@@ -0,0 +1,10 @@
+diff --git a/drivers/mtd/spi/sunxi_spi_spl.c b/drivers/mtd/spi/sunxi_spi_spl.c
+index e70064c67..a24c11517 100644
+--- a/drivers/mtd/spi/sunxi_spi_spl.c
++++ b/drivers/mtd/spi/sunxi_spi_spl.c
+@@ -284,4 +284,4 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
+ return 0;
+ }
+ /* Use priorty 0 to override the default if it happens to be linked in */
+-SPL_LOAD_IMAGE_METHOD("sunxi SPI" 0, BOOT_DEVICE_SPI, spl_spi_load_image);
++SPL_LOAD_IMAGE_METHOD("sunxi SPI", 0, BOOT_DEVICE_SPI, spl_spi_load_image);

5 comments on commit ed5bf21

@gabegundy
Contributor

Just a heads up (and before I create an issue), this commit seems to have broken the build (at least for OPi).

I did my own bisecting to get here.

A pic is worth a 1000 words ;)

broken

@zador-blood-stained
Collaborator

@gabegundy
For what board exactly?

@dodolloh
dodolloh commented on ed5bf21 Jan 12, 2017 edited

yes, me too. same problem as @gabegundy my board
opi pc
before update, is fine

@zador-blood-stained
Collaborator

Stop. Please try to install python and try again. I'll add it to build dependencies it this fixes the build.

@dodolloh

yeah...it's work
thx @zador-blood-stained

Please sign in to comment.