Update defaults

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@202 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 files changed, 8 insertions, 233 deletions

diff --git a/.config b/.config
deleted file mode 100644
index aba64ee53..000000000
--- a/.config
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_cris is not set
-# BR2_i386 is not set
-# BR2_m68k is not set
-# BR2_mips is not set
-BR2_mipsel=y
-# BR2_powerpc is not set
-# BR2_sh3 is not set
-# BR2_sh3eb is not set
-# BR2_sh4 is not set
-# BR2_sh4eb is not set
-# BR2_sparc is not set
-BR2_ARCH="mipsel"
-
-#
-# Build options
-#
-BR2_WGET="wget --passive-ftp"
-# BR2_TAR_VERBOSITY is not set
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_JLEVEL=1
-
-#
-# Toolchain Options
-#
-
-#
-# uClibc Options
-#
-BR2_UCLIBC_VERSION_SNAPSHOT=y
-BR2_USE_UCLIBC_SNAPSHOT="snapshot"
-# BR2_ENABLE_LOCALE is not set
-
-#
-# Binutils Options
-#
-# BR2_BINUTILS_VERSION_2_14_90_0_6 is not set
-# BR2_BINUTILS_VERSION_2_14_90_0_7 is not set
-# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
-# BR2_BINUTILS_VERSION_2_15 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_1 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_1_1 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_2 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_15_91_0_1 is not set
-# BR2_BINUTILS_VERSION_2_15_91_0_2 is not set
-# BR2_BINUTILS_VERSION_2_15_92_0_2 is not set
-# BR2_BINUTILS_VERSION_2_15_94_0_1 is not set
-BR2_BINUTILS_VERSION_2_15_94_0_2=y
-BR2_BINUTILS_VERSION="2.15.94.0.2"
-
-#
-# Gcc Options
-#
-# BR2_GCC_VERSION_2_95 is not set
-# BR2_GCC_VERSION_3_3_3 is not set
-# BR2_GCC_VERSION_3_3_4 is not set
-# BR2_GCC_VERSION_3_3_5 is not set
-# BR2_GCC_VERSION_3_4_0 is not set
-# BR2_GCC_VERSION_3_4_1 is not set
-# BR2_GCC_VERSION_3_4_2 is not set
-BR2_GCC_VERSION_3_4_3=y
-BR2_GCC_VERSION="3.4.3"
-BR2_GCC_USE_SJLJ_EXCEPTIONS="--enable-sjlj-exceptions"
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_INSTALL_LIBSTDCPP is not set
-
-#
-# Ccache Options
-#
-BR2_CCACHE=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-
-#
-# Common Toolchain Options
-#
-# BR2_ENABLE_MULTILIB is not set
-# BR2_LARGEFILE is not set
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-
-#
-# OpenWrt Package Selection
-#
-
-#
-# The default set
-#
-BR2_PACKAGE_BUSYBOX=y
-BR2_PACKAGE_BUSYBOX_SNAPSHOT=y
-# BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_LINUX is not set
-# BR2_PACKAGE_IPTABLES is not set
-# BR2_PACKAGE_BRIDGE is not set
-
-#
-# Suggested Extras
-#
-# BR2_PACKAGE_DROPBEAR_SSHD is not set
-
-#
-# Target Filesystem
-#
-# BR2_TARGET_ROOTFS_JFFS2 is not set
diff --git a/.defconfig b/.defconfig
deleted file mode 100644
index aba64ee53..000000000
--- a/.defconfig
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_cris is not set
-# BR2_i386 is not set
-# BR2_m68k is not set
-# BR2_mips is not set
-BR2_mipsel=y
-# BR2_powerpc is not set
-# BR2_sh3 is not set
-# BR2_sh3eb is not set
-# BR2_sh4 is not set
-# BR2_sh4eb is not set
-# BR2_sparc is not set
-BR2_ARCH="mipsel"
-
-#
-# Build options
-#
-BR2_WGET="wget --passive-ftp"
-# BR2_TAR_VERBOSITY is not set
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_JLEVEL=1
-
-#
-# Toolchain Options
-#
-
-#
-# uClibc Options
-#
-BR2_UCLIBC_VERSION_SNAPSHOT=y
-BR2_USE_UCLIBC_SNAPSHOT="snapshot"
-# BR2_ENABLE_LOCALE is not set
-
-#
-# Binutils Options
-#
-# BR2_BINUTILS_VERSION_2_14_90_0_6 is not set
-# BR2_BINUTILS_VERSION_2_14_90_0_7 is not set
-# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
-# BR2_BINUTILS_VERSION_2_15 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_1 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_1_1 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_2 is not set
-# BR2_BINUTILS_VERSION_2_15_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_15_91_0_1 is not set
-# BR2_BINUTILS_VERSION_2_15_91_0_2 is not set
-# BR2_BINUTILS_VERSION_2_15_92_0_2 is not set
-# BR2_BINUTILS_VERSION_2_15_94_0_1 is not set
-BR2_BINUTILS_VERSION_2_15_94_0_2=y
-BR2_BINUTILS_VERSION="2.15.94.0.2"
-
-#
-# Gcc Options
-#
-# BR2_GCC_VERSION_2_95 is not set
-# BR2_GCC_VERSION_3_3_3 is not set
-# BR2_GCC_VERSION_3_3_4 is not set
-# BR2_GCC_VERSION_3_3_5 is not set
-# BR2_GCC_VERSION_3_4_0 is not set
-# BR2_GCC_VERSION_3_4_1 is not set
-# BR2_GCC_VERSION_3_4_2 is not set
-BR2_GCC_VERSION_3_4_3=y
-BR2_GCC_VERSION="3.4.3"
-BR2_GCC_USE_SJLJ_EXCEPTIONS="--enable-sjlj-exceptions"
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_INSTALL_LIBSTDCPP is not set
-
-#
-# Ccache Options
-#
-BR2_CCACHE=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-
-#
-# Common Toolchain Options
-#
-# BR2_ENABLE_MULTILIB is not set
-# BR2_LARGEFILE is not set
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-
-#
-# OpenWrt Package Selection
-#
-
-#
-# The default set
-#
-BR2_PACKAGE_BUSYBOX=y
-BR2_PACKAGE_BUSYBOX_SNAPSHOT=y
-# BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_LINUX is not set
-# BR2_PACKAGE_IPTABLES is not set
-# BR2_PACKAGE_BRIDGE is not set
-
-#
-# Suggested Extras
-#
-# BR2_PACKAGE_DROPBEAR_SSHD is not set
-
-#
-# Target Filesystem
-#
-# BR2_TARGET_ROOTFS_JFFS2 is not set
diff --git a/Config.in b/Config.in
index 2b335e68b..7d0631363 100644
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 choice
 	prompt "Target Architecture"
-	default BR2_i386
+	default BR2_mips
 	help
 	  Stuff
 
diff --git a/package/bridge/Config.in b/package/bridge/Config.in
index 8a5ebce0e..5856e3f79 100644
--- a/package/bridge/Config.in
+++ b/package/bridge/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_BRIDGE
 	bool "bridge"
-	default n
+	default y
 	help
 	  Manage ethernet bridging; a way to connect networks together to 
 	  form a larger network.
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index 05e40f34e..c0f05088e 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DNSMASQ
 	bool "dnsmasq"
-	default n
+	default y
 	help
 	  A lightweight DNS and DHCP server.  It is intended to provide 
 	  coupled DNS and DHCP service to a LAN.
diff --git a/package/iptables/Config.in b/package/iptables/Config.in
index f1e5ef631..11fdc5ecd 100644
--- a/package/iptables/Config.in
+++ b/package/iptables/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_IPTABLES
 	bool "iptables"
-	default n
+	default y
 	help
 	  Linux kernel (2.4+) firewall, NAT, and packet mangling tools.
 
diff --git a/package/linux/Config.in b/package/linux/Config.in
index 4588e48ef..22809cd7f 100644
--- a/package/linux/Config.in
+++ b/package/linux/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LINUX
 	bool "linux"
-	default n
+	default y
 	help
 	  The Linux kernel.
 
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 22a11e7d6..bbde429e9 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -14,14 +14,14 @@ comment "Common Toolchain Options"
 
 config BR2_ENABLE_MULTILIB
 	bool "Enable multilib support?"
-	default y
+	default n
 	help
 	    If you want multilib enabled, enable this...
 
 config BR2_LARGEFILE
 	bool "Enable large file (files > 2 GB) support?"
 	depends on !BR2_cris
-	default y
+	default n
 	help
 	    Enable large file (files > 2 GB) support
 
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
new file mode 100644
index 000000000..30392fc1b
--- /dev/null
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -0,0 +1 @@
+LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux