Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 14 years ago
parent
commit
6cefb4fbff
2 changed files with 8 additions and 3 deletions
  1. 1 1
      mk/build.mk
  2. 7 2
      target/Config.in

+ 1 - 1
mk/build.mk

@@ -394,7 +394,7 @@ menuconfig: $(CONFIG)/mconf defconfig .menu
 
 _config: $(CONFIG)/conf .menu
 	-@touch .config
-	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null
+	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
 
 .NOTPARALLEL: _mconfig

+ 7 - 2
target/Config.in

@@ -287,6 +287,7 @@ config ADK_LINUX_XSCALE_ZAURUS
 	select ADK_zaurus
 	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_WITH_INPUT
+	depends on ADK_BROKEN
 	help
 	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
 	 Status: development
@@ -361,12 +362,14 @@ config ADK_LINUX_X86_RESCUE
 config ADK_LINUX_MIPSEL_RESCUE
 	bool "mips (little endian)"
 	select ADK_mipsel_rescue
+	depends on ADK_BROKEN
 	help
 	 MIPS LE architecture.
 
 config ADK_LINUX_MIPS_RESCUE
 	bool "mips (big endian)"
 	select ADK_mips_rescue
+	depends on ADK_BROKEN
 	help
 	 MIPS BE architecture.
 
@@ -628,7 +631,7 @@ endchoice
 
 choice
 prompt "Routerboard model"
-default ADK_LINUX_MIPS_RB433
+default ADK_LINUX_MIPS_RB532
 depends on ADK_LINUX_MIKROTIK
 
 config ADK_LINUX_MIPS_RB411
@@ -639,6 +642,7 @@ config ADK_LINUX_MIPS_RB411
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_MINIPCI
+	depends on ADK_BROKEN
 	help
 	 Support for Mikrotik RB411.
 	 Status: development
@@ -651,6 +655,7 @@ config ADK_LINUX_MIPS_RB433
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_MINIPCI
+	depends on ADK_BROKEN
 	help
 	 Support for Mikrotik RB433.
 	 Status: development
@@ -701,7 +706,7 @@ depends on ! ADK_NATIVE
 config ADK_TARGET_LIB_UCLIBC
 	bool "uClibc embedded C library"
 	# broken, because of 16kB pagesize
-	#depends on !ADK_LINUX_MIPS64_LEMOTE
+	depends on !ADK_LINUX_MIPS64_LEMOTE
 	select ADK_uclibc
 	help
  	 http://uclibc.org