summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-21 13:04:18 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-21 13:04:18 +0100
commit7f87000741f4061aeb28c10105beb751eb9ee639 (patch)
treec94976669d7ed66a64fd85f4c3665a4266cfd293 /target
parent7cc1307c17dd9dfc907580b7b3320554848a10de (diff)
parent33f92f3466c9959e73e01f50861495162f681164 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/Config.in3
-rw-r--r--target/linux/config/Config.in.network1
-rw-r--r--target/linux/patches/2.6.32/cygwin-compat.patch52
3 files changed, 4 insertions, 52 deletions
diff --git a/target/Config.in b/target/Config.in
index 5eea50e1e..71a44b11d 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -255,6 +255,9 @@ config ADK_LINUX_MIPS_AG241
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_MII
+ select ADK_PACKAGE_KMOD_SANGAM_ATM
+ select ADK_KPACKAGE_KMOD_ATM_BR2684
+ select ADK_PACKAGE_BR2684CTL
select ADK_ag241
help
Linksys AG241 DSL router.
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 68d8f2d8a..bbee048e7 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -61,6 +61,7 @@ config ADK_KPACKAGE_KMOD_ATM
config ADK_KPACKAGE_KMOD_ATM_BR2684
prompt "kmod-atm-br2684................... BR2684 ATM module"
tristate
+ select ADK_KPACKAGE_KMOD_ATM
default n
help
diff --git a/target/linux/patches/2.6.32/cygwin-compat.patch b/target/linux/patches/2.6.32/cygwin-compat.patch
index 8d087dddf..17258e565 100644
--- a/target/linux/patches/2.6.32/cygwin-compat.patch
+++ b/target/linux/patches/2.6.32/cygwin-compat.patch
@@ -12,55 +12,3 @@ diff -Nur linux-2.6.30.orig/scripts/mod/file2alias.c linux-2.6.30/scripts/mod/fi
+#endif
typedef uint16_t __u16;
typedef unsigned char __u8;
-
-diff -Nur linux-2.6.30.orig/scripts/mod/modpost.h linux-2.6.30/scripts/mod/modpost.h
---- linux-2.6.30.orig/scripts/mod/modpost.h 2009-06-10 05:05:27.000000000 +0200
-+++ linux-2.6.30/scripts/mod/modpost.h 2009-06-11 09:17:10.000000000 +0200
-@@ -9,6 +9,11 @@
- #include <unistd.h>
- #include <elf.h>
-
-+#ifdef __CYGWIN__
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+#endif
-+
- #include "elfconfig.h"
-
- #if KERNEL_ELFCLASS == ELFCLASS32
-@@ -19,13 +24,17 @@
- #define Elf_Addr Elf32_Addr
- #define Elf_Sword Elf64_Sword
- #define Elf_Section Elf32_Half
-+#ifndef __CYGWIN__
- #define ELF_ST_BIND ELF32_ST_BIND
- #define ELF_ST_TYPE ELF32_ST_TYPE
-+#endif
-
- #define Elf_Rel Elf32_Rel
- #define Elf_Rela Elf32_Rela
-+#ifndef __CYGWIN__
- #define ELF_R_SYM ELF32_R_SYM
- #define ELF_R_TYPE ELF32_R_TYPE
-+#endif
- #else
-
- #define Elf_Ehdr Elf64_Ehdr
-@@ -43,6 +52,17 @@
- #define ELF_R_TYPE ELF64_R_TYPE
- #endif
-
-+#define R_386_32 1 /* Direct 32 bit */
-+#define R_386_PC32 2 /* PC relative 32 bit */
-+
-+#define R_ARM_PC24 1 /* PC relative 26 bit branch */
-+#define R_ARM_ABS32 2 /* Direct 32 bit */
-+
-+#define R_MIPS_32 2 /* Direct 32 bit */
-+#define R_MIPS_26 4 /* Direct 26 bit shifted */
-+#define R_MIPS_HI16 5 /* High 16 bit */
-+#define R_MIPS_LO16 6 /* Low 16 bit */
-+
- /* The 64-bit MIPS ELF ABI uses an unusual reloc format. */
- typedef struct
- {