소스 검색

fix ag241 make allmodconfig issues

Waldemar Brodkorb 14 년 전
부모
커밋
d6940ecea3
6개의 변경된 파일26개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      mk/build.mk
  2. 18 0
      target/ag241/patches/ar7.patch
  3. 3 0
      target/bulk.lst
  4. 1 0
      target/linux/config/Config.in.block
  5. 1 1
      target/linux/config/Config.in.crypto
  6. 1 1
      target/linux/config/Config.in.netdevice

+ 2 - 2
mk/build.mk

@@ -405,10 +405,10 @@ bulk:
 		echo === building $$target $$libc $$fs on $$(date); \
 		$(GMAKE) prereq && \
 		if [ "x$$p" = xy ];then \
-			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \
 				allmodconfig; \
 		else \
-			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \
 				defconfig; \
 		fi && \
 		$(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \

+ 18 - 0
target/ag241/patches/ar7.patch

@@ -149,3 +149,21 @@ diff -Nur linux-2.6.32.orig/drivers/serial/8250.c linux-2.6.32/drivers/serial/82
  	serial_out(up, UART_TX, ch);
  }
  
+diff -Nur linux-2.6.32.orig/arch/mips/ar7/prom.c linux-2.6.32/arch/mips/ar7/prom.c
+--- linux-2.6.32.orig/arch/mips/ar7/prom.c	2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6.32/arch/mips/ar7/prom.c	2010-01-05 20:39:11.000000000 +0100
+@@ -219,14 +219,6 @@
+ 	if (strstr(prom_getcmdline(), "console="))
+ 		return;
+ 
+-#ifdef CONFIG_KGDB
+-	if (!strstr(prom_getcmdline(), "nokgdb")) {
+-		strcat(prom_getcmdline(), " console=kgdb");
+-		kgdb_enabled = 1;
+-		return;
+-	}
+-#endif
+-
+ 	s = prom_getenv("modetty0");
+ 	if (s) {
+ 		baud = simple_strtoul(s, &p, 10);

+ 3 - 0
target/bulk.lst

@@ -1 +1,4 @@
+alix1c		uclibc		nfsroot		y
+alix1c		eglibc		nfsroot		y
 alix1c		glibc		nfsroot		y
+ag241		uclibc		nfsroot		y

+ 1 - 0
target/linux/config/Config.in.block

@@ -67,6 +67,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on !ADK_KERNEL_SATA_AHCI
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241)
 	default n
 	help
 	  Enables support for AHCI Serial ATA.

+ 1 - 1
target/linux/config/Config.in.crypto

@@ -62,7 +62,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
 endmenu
 
 menu "OpenBSD Cryptographic framework"
-depends on !ADK_LINUX_CRIS_FOXBOARD
+depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241)
 
 config ADK_KPACKAGE_KMOD_OCF_HIFN
 	prompt "kmod-cryptodev-hifn................ hifn engine"

+ 1 - 1
target/linux/config/Config.in.netdevice

@@ -1,5 +1,5 @@
 menu "Network devices support"
-depends on !ADK_LINUX_CRIS_FOXBOARD
+depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241)
 
 config ADK_KERNEL_NETDEVICES
 	boolean