From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 9 Mar 2013 13:10:36 +0000 (+0100)
Subject: Merge branch 'core68' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=223fddd97a0f8c58322788f3e0fb6eb2eb7772cf;hp=c1b27582428b8f181a40f1e36a095e23d753422d

Merge branch 'core68' into next

Conflicts:
	make.sh
---

diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware
index 073639920..3024548c1 100644
--- a/config/rootfiles/common/armv5tel/rpi-firmware
+++ b/config/rootfiles/common/armv5tel/rpi-firmware
@@ -5,7 +5,5 @@ boot/config.txt
 #boot/first32k.bin
 boot/start.elf
 boot/start_cd.elf
-boot/start_x.elf
 boot/fixup.dat
 boot/fixup_cd.dat
-boot/fixup_x.dat
diff --git a/config/rootfiles/core/67/exclude b/config/rootfiles/core/67/exclude
index 321a931ca..18141fd3e 100644
--- a/config/rootfiles/core/67/exclude
+++ b/config/rootfiles/core/67/exclude
@@ -1,5 +1,4 @@
 srv/web/ipfire/html/proxy.pac
-boot/config.txt
 etc/udev/rules.d/30-persistent-network.rules
 etc/collectd.custom
 etc/shadow
diff --git a/config/rootfiles/core/67/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/67/filelists/armv5tel/rpi-firmware
deleted file mode 120000
index 428fdf88f..000000000
--- a/config/rootfiles/core/67/filelists/armv5tel/rpi-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/rpi-firmware
\ No newline at end of file
diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt
index 47bfc802d..266cfb444 100644
--- a/config/rpi-firmware/config.txt
+++ b/config/rpi-firmware/config.txt
@@ -9,8 +9,31 @@
 # GPU Memory Settings (16,32,64 ... )
 # 16MB has a issue at reboot so we use 32MB memory split
 ###############################################################################
-gpu_mem_256=32
-gpu_mem_512=32
+gpu_mem=16
+
+###############################################################################
+#
+# hdmi/video options
+#
+###############################################################################
+#
+# Set this if monitor was not detected at reboot.
+#hdmi_force_hotplug=1
+#
+# hdmi_drive: 0 auto, 1 DVI (no Sound), 2 HDMI (Sound)
+#hdmi_drive=1
+#
+# sdtv_mode: 0 NTSC, 1 NTSC (JP), 3 PAL, 4 PAL (Brazil)
+#sdtv_mode=2
+# sdtv_ascpect: 0 4:3, 1 14:9, 2 16:9
+#sdtv_aspect=0
+#
+# overscan
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+#
 
 ###############################################################################
 #
@@ -24,9 +47,10 @@ gpu_mem_512=32
 #sdram_freq_min=250
 #
 # use following paramters to overclock at load
-#arm_freq=1000
+#arm_freq=900
 #core_freq=450
 #sdram_freq=450
+# higher clock than 900Mhz most need over voltage. Use with care.
 #over_voltage=3
 
 ################################################################################
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index a50ced779..c02d5cc5f 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2012  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 98e5704
+VER        = 855e997
 THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 255bb0e5360d6625e31de3383f1cc528
+$(DL_FILE)_MD5 = c73700a10d792517b2b87fd28a6c9800
 
 install : $(TARGET)
 
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index cc6b6190e..b6dd7d5bd 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -252,9 +252,8 @@ case "$1" in
 	# upnp chain for our upnp daemon
 	/sbin/iptables -t nat -N UPNPFW
 	/sbin/iptables -t nat -A PREROUTING -j UPNPFW
-	/sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
-	# This chain only contains dummy rules.
 	/sbin/iptables -N UPNPFW
+	/sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
 
 	# Custom mangle chain (for port fowarding)
 	/sbin/iptables -t mangle -N PORTFWMANGLE