diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-31 17:51:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-31 17:51:11 +0100 |
| commit | 5dd0e62fa8d9366998288e7f384e48dad02949e1 (patch) | |
| tree | 15be68c3f01f7d93037c425c35b14a7edc155a5f /target/linux | |
| parent | 1d18ffa427852084c6bf378eaa76c2e9116cdea7 (diff) | |
| parent | 1dcee6fbc23e59cd5a2111e74ae4915d56576174 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.kernel | 20 | ||||
| -rw-r--r-- | target/linux/patches/2.6.31.4/cris-initrd.patch | 14 |
2 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 594dd8fec..e61eb46df 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -2,10 +2,30 @@ config ADK_KERNEL_BLK_DEV_INITRD bool default n +config ADK_KERNEL_RD_GZIP + bool + default n + +config ADK_KERNEL_KERNEL_GZIP + bool + default n + +config ADK_KERNEL_RD_BZIP2 + bool + default n + +config ADK_KERNEL_KERNEL_BZIP2 + bool + default n + config ADK_KERNEL_RD_LZMA bool default n +config ADK_KERNEL_KERNEL_LZMA + bool + default n + config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA bool default n diff --git a/target/linux/patches/2.6.31.4/cris-initrd.patch b/target/linux/patches/2.6.31.4/cris-initrd.patch new file mode 100644 index 000000000..47c034415 --- /dev/null +++ b/target/linux/patches/2.6.31.4/cris-initrd.patch @@ -0,0 +1,14 @@ +diff -Nur linux-2.6.31.4.orig/arch/cris/mm/init.c linux-2.6.31.4/arch/cris/mm/init.c +--- linux-2.6.31.4.orig/arch/cris/mm/init.c 2009-10-12 22:15:40.000000000 +0200 ++++ linux-2.6.31.4/arch/cris/mm/init.c 2009-10-25 12:59:24.418546156 +0100 +@@ -80,3 +80,10 @@ + printk (KERN_INFO "Freeing unused kernel memory: %luk freed\n", + (unsigned long)((&__init_end - &__init_begin) >> 10)); + } ++ ++#ifdef CONFIG_BLK_DEV_INITRD ++void free_initrd_mem(unsigned long start, unsigned long end) ++{ ++ return 0; ++} ++#endif |