u-boot: update to 2014.4. and add BPi support.

config/rootfiles/common/armv5tel/u-boot

@@ -1,16 +1,16 @@
 #boot/MLO
-boot/boot.scr
-boot/boot.script
-boot/convert_bootscript
 #boot/u-boot.img
+boot/uEnv.txt
 usr/bin/mkimage
 #usr/share/u-boot
+#usr/share/u-boot/banana_pi
+usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin
 #usr/share/u-boot/pandaboard
-#usr/share/u-boot/pandaboard/MLO
+usr/share/u-boot/pandaboard/MLO
-#usr/share/u-boot/pandaboard/u-boot.img
+usr/share/u-boot/pandaboard/u-boot.img
 #usr/share/u-boot/wandboard_dl
-#usr/share/u-boot/wandboard_dl/u-boot.imx
+usr/share/u-boot/wandboard_dl/u-boot.imx
 #usr/share/u-boot/wandboard_quad
-#usr/share/u-boot/wandboard_quad/u-boot.imx
+usr/share/u-boot/wandboard_quad/u-boot.imx
 #usr/share/u-boot/wandboard_solo
-#usr/share/u-boot/wandboard_solo/u-boot.imx
+usr/share/u-boot/wandboard_solo/u-boot.imx

config/rootfiles/core/86/filelists/armv5tel/u-boot

@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot

config/u-boot/boot.script

@@ -1,7 +0,0 @@
-setenv initrd_high 90000000
-fatload mmc 0:1 0x82000000 zImage-ipfire-multi
-#fatload mmc 0:1 0x85000000 uInit-ipfire-multi
-fatload mmc 0:1 ${fdtaddr} omap4-${board_name}.dtb
-setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
-#bootz 0x82000000 0x85000000 ${fdtaddr}
-bootz 0x82000000 - ${fdtaddr}

config/u-boot/convert_bootscript

@@ -1 +0,0 @@
-mkimage -A arm -T script -C none -d boot.script boot.scr

config/u-boot/uEnv.txt

@@ -0,0 +1,3 @@
+uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootbananapi; fi;
+bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} omap4-${board_name}.dtb; setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro; bootz 0x82000000 - ${fdtaddr};
+bootbananapi=setenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 sun7i-a20-bananapi.dtb;  setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait;                            bootz 0x46000000 - 0x49000000;

lfs/flash-images

@@ -116,7 +116,7 @@ endif
 	mkdir -pv $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
 
-	# Install MLO and uboot first
+	# Install Pandaboard MLO and uboot first
 ifeq "$(MACHINE_TYPE)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
@@ -148,8 +148,7 @@ ifeq "$(SCON)" "1"
 
 ifeq "$(MACHINE_TYPE)" "arm"
 	sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
-	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/boot.script
+	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/uEnv.txt
-	cd $(MNThdd)/boot && ./convert_bootscript
 endif
 endif
 
@@ -216,6 +215,11 @@ endif
 	# not copied to a block device)
 	dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
 
+ifeq "$(MACHINE_TYPE)" "arm"
+	# Install u-boot for LeMaker Banana Pi into image 8KB
+	dd if=/usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+endif
+
 	# Compress Image
 	pigz -f9 < $(IMG) > $(IMAGE_FILE)
 	rm -rf $(IMG) $(MNThdd)

lfs/u-boot

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2013.10
+VER        = 2014.04
 
 THISAPP    = u-boot-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a076a044b64371edc52f7e562b13f6b2
+$(DL_FILE)_MD5 = 6d2116d1385a66e9a59742caa9d62a54
 
 install : $(TARGET)
 
@@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Install pandaboard uboot as default
 	cd $(DIR_APP) && install MLO /boot/
 	cd $(DIR_APP) && install u-boot.img /boot/
-	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
 	cd $(DIR_APP) && make distclean
 
 	# Wandboard Quad
@@ -111,9 +110,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		/usr/share/u-boot/wandboard_solo
 	cd $(DIR_APP) && make distclean
 
+	# LeMaker Banana Pi
+	-mkdir -pv /usr/share/u-boot/banana_pi
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/002-uboot-jwrdegoede-psci-support.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
+	cd $(DIR_APP) && make CROSS_COMPILE="" Bananapi_config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \
+		/usr/share/u-boot/banana_pi
+
 	# mkimage
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
 	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
 
+	# config (uEnv.txt)
+	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

src/patches/u-boot/sunxi/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch

@@ -0,0 +1,20 @@
+diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
+index e7ff952..f58c963 100644
+--- a/board/sunxi/gmac.c
++++ b/board/sunxi/gmac.c
+@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
+ 		CCM_GMAC_CTRL_GPIT_MII);
+ #endif
+ 
++	/*
++	 * HdG: this is necessary to get GMAC to work reliable on the
++	 * Bananapi. We don't know what these undocumented bits do, so this
++	 * is a Bananapi specific hack for now.
++	 */
++#ifdef CONFIG_BANANAPI
++	setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
++#endif
++
+ 	/* Configure pin mux settings for GMAC */
+ 	for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
+ #ifdef CONFIG_RGMII