aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2010-11-28 22:04:19 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2010-11-28 22:04:19 +0000
commitb1b318750a87f665b2614cd2baff3921f3d34936 (patch)
tree77869b0ca9231eb14b23e4224ac9df721d75bcaf
parentdd5c6a97de2e10df409f826bc949323021d3f678 (diff)
downloadupstream-b1b318750a87f665b2614cd2baff3921f3d34936.tar.gz
upstream-b1b318750a87f665b2614cd2baff3921f3d34936.tar.bz2
upstream-b1b318750a87f665b2614cd2baff3921f3d34936.zip
bcm63xx: Add defconfigs.
Port the mechanism for different default configurations from ar71xx and use the old configuration as the default configuration. This should have no functional differences to before. While we are at it, remove the obsolete nat option. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 24185
-rw-r--r--target/linux/brcm63xx/base-files.mk5
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/generic/network (renamed from target/linux/brcm63xx/base-files/etc/config/network)1
-rwxr-xr-xtarget/linux/brcm63xx/base-files/etc/init.d/defconfig18
3 files changed, 23 insertions, 1 deletions
diff --git a/target/linux/brcm63xx/base-files.mk b/target/linux/brcm63xx/base-files.mk
new file mode 100644
index 0000000000..d6682bd388
--- /dev/null
+++ b/target/linux/brcm63xx/base-files.mk
@@ -0,0 +1,5 @@
+define Package/base-files/install-target
+ rm -f $(1)/etc/config/network
+endef
+
+
diff --git a/target/linux/brcm63xx/base-files/etc/config/network b/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
index c15fdd81b3..bc2c69b7c9 100644
--- a/target/linux/brcm63xx/base-files/etc/config/network
+++ b/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
@@ -12,7 +12,6 @@ config interface lan
option proto static
option ipaddr 192.168.1.1
option netmask 255.255.255.0
- option nat 1
config interface wan
option ifname eth0
diff --git a/target/linux/brcm63xx/base-files/etc/init.d/defconfig b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
new file mode 100755
index 0000000000..dac9c23440
--- /dev/null
+++ b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
@@ -0,0 +1,18 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+START=05
+
+start() {
+ local board=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo)
+
+ [ ! -d /etc/defconfig/$board ] && board="generic"
+
+ for f in $( ls /etc/defconfig/$board ); do
+ if [ ! -e /etc/config/$f ]; then
+ cp /etc/defconfig/$board/$f /etc/config/
+ fi
+ done
+}