From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 6cda03e8316751061b64ba9f1c39f72a13e78818
Date: Mon, 22 Dec 2014 12:38:48 +0100
Message-ID: <20141222113848.7298523B38@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3054782449972283454=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3054782449972283454==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  6cda03e8316751061b64ba9f1c39f72a13e78818 (commit)
       via  15094e71e68dd3f96d61bf62aa9c0f7d170bf787 (commit)
      from  56e211f66eda13d263a9aa4e2aa81c2cfd1bb50f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6cda03e8316751061b64ba9f1c39f72a13e78818
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Dec 21 12:43:45 2014 +0100

    u-boot: auto patch kernel version and change panda dtb in uEnv.txt.

commit 15094e71e68dd3f96d61bf62aa9c0f7d170bf787
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Dec 21 12:17:04 2014 +0100

    flash-images: u-boot dtb folder work around.
   =20
    u-boot cannot find folders that are created later...

-----------------------------------------------------------------------

Summary of changes:
 config/u-boot/uEnv.txt | 5 +++--
 lfs/flash-images       | 3 +++
 lfs/u-boot             | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
 mode change 100644 =3D> 100755 config/u-boot/uEnv.txt

Difference in files:
diff --git a/config/u-boot/uEnv.txt b/config/u-boot/uEnv.txt
old mode 100644
new mode 100755
index b3bfb47..bc3facc
--- a/config/u-boot/uEnv.txt
+++ b/config/u-boot/uEnv.txt
@@ -1,3 +1,4 @@
 uenvcmd=3Dif test "$board" =3D "panda" ;then run bootpanda; else run bootban=
anapi; fi;
-bootpanda=3Dsetenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-i=
pfire-multi; fatload mmc 0:1 ${fdtaddr} omap4-${board_name}.dtb; setenv boota=
rgs video=3D800x600 console=3Dtty1 rootwait smsc95xx.macaddr=3D$usbethaddr ro=
ot=3D/dev/mmcblk0p3 ro; bootz 0x82000000 - ${fdtaddr};
-bootbananapi=3Dsetenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-i=
pfire-multi; fatload mmc 0:1 0x49000000 sun7i-a20-bananapi.dtb;  setenv boota=
rgs console=3DttyS0,115200n8 rootwait root=3D/dev/mmcblk0p3 rootwait;        =
                    bootz 0x46000000 - 0x49000000;
+KVER=3DxxxKVERxxx
+bootpanda=3Dsetenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-i=
pfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile}; =
             setenv bootargs video=3D800x600 console=3Dtty1 rootwait smsc95xx=
.macaddr=3D$usbethaddr root=3D/dev/mmcblk0p3 ro;           bootz 0x82000000 -=
 ${fdtaddr};
+bootbananapi=3Dsetenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-i=
pfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/sun7i-a20-ba=
nanapi.dtb;  setenv bootargs console=3DttyS0,115200n8 rootwait root=3D/dev/mm=
cblk0p3 rootwait;                                      bootz 0x46000000 - 0x4=
9000000;
diff --git a/lfs/flash-images b/lfs/flash-images
index e92a506..f213476 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -121,6 +121,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
 	cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
+	# work around a u-boot bug not find the folders sometimes
+	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi
+	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood
 	sync
 	umount $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
diff --git a/lfs/u-boot b/lfs/u-boot
index 1552566..28f6508 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -126,6 +126,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
=20
 	# config (uEnv.txt)
 	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+	# patch real Kernel version to uEnv.txt
+	sed -e "s/xxxKVERxxx/$(KVER)/g" -i /boot/uEnv.txt
=20
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree

--===============3054782449972283454==--