From 2ce35911df2b85275e9e6204365b51e3f4dfb75d Mon Sep 17 00:00:00 2001 From: cshore Date: Sun, 28 Nov 2010 22:04:19 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24185 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/base-files.mk | 5 +++++ .../etc/{config => defconfig/generic}/network | 1 - .../brcm63xx/base-files/etc/init.d/defconfig | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 target/linux/brcm63xx/base-files.mk rename target/linux/brcm63xx/base-files/etc/{config => defconfig/generic}/network (94%) create mode 100755 target/linux/brcm63xx/base-files/etc/init.d/defconfig diff --git a/target/linux/brcm63xx/base-files.mk b/target/linux/brcm63xx/base-files.mk new file mode 100644 index 000000000..d6682bd38 --- /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 similarity index 94% rename from target/linux/brcm63xx/base-files/etc/config/network rename to target/linux/brcm63xx/base-files/etc/defconfig/generic/network index c15fdd81b..bc2c69b7c 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 000000000..dac9c2344 --- /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 +}