From 4730871e5df6c0913f746cbadf02d1ec5a599846 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 24 Jul 2012 14:22:08 +0200 Subject: update to latest linux kernels, remove old ones --- Config.in | 35 +- mk/kernel-ver.mk | 40 +- mk/modules.mk | 32 +- target/linux/config/Config.in.ipvs | 1 + target/linux/config/Config.in.netfilter.core | 13 + target/linux/config/Config.in.netfilter.ip4 | 7 - target/linux/config/Config.in.netfilter.ip6 | 7 - target/linux/patches/3.0.34/brcm.patch | 465 -- .../linux/patches/3.0.34/bsd-compatibility.patch | 2512 -------- target/linux/patches/3.0.34/cris-etrax.patch | 12 - target/linux/patches/3.0.34/defaults.patch | 22 - target/linux/patches/3.0.34/fon2100.patch | 6279 -------------------- target/linux/patches/3.0.34/gemalto.patch | 11 - target/linux/patches/3.0.34/mips-malta.patch | 135 - target/linux/patches/3.0.34/mmc-host.patch | 36 - target/linux/patches/3.0.34/mtd-rootfs.patch | 26 - target/linux/patches/3.0.34/non-static.patch | 33 - target/linux/patches/3.0.34/sparc-include.patch | 11 - target/linux/patches/3.0.34/startup.patch | 20 - target/linux/patches/3.0.34/usb-defaults-off.patch | 32 - target/linux/patches/3.0.34/uuid.patch | 255 - .../patches/3.0.34/vga-cons-default-off.patch | 12 - target/linux/patches/3.0.34/wlan-cf.patch | 11 - target/linux/patches/3.0.34/x86-build.patch | 11 - target/linux/patches/3.0.34/zlib-inflate.patch | 12 - target/linux/patches/3.1.10/brcm.patch | 465 -- .../linux/patches/3.1.10/bsd-compatibility.patch | 2512 -------- target/linux/patches/3.1.10/cris-etrax.patch | 12 - target/linux/patches/3.1.10/defaults.patch | 22 - target/linux/patches/3.1.10/fon2100.patch | 6279 -------------------- target/linux/patches/3.1.10/gemalto.patch | 11 - target/linux/patches/3.1.10/mmc-host.patch | 36 - target/linux/patches/3.1.10/mtd-rootfs.patch | 26 - target/linux/patches/3.1.10/non-static.patch | 33 - target/linux/patches/3.1.10/sparc-include.patch | 11 - target/linux/patches/3.1.10/startup.patch | 20 - target/linux/patches/3.1.10/usb-defaults-off.patch | 32 - target/linux/patches/3.1.10/uuid.patch | 255 - .../patches/3.1.10/vga-cons-default-off.patch | 12 - target/linux/patches/3.1.10/wlan-cf.patch | 11 - target/linux/patches/3.1.10/x86-build.patch | 11 - target/linux/patches/3.1.10/zlib-inflate.patch | 12 - target/linux/patches/3.2.20/brcm.patch | 466 -- .../linux/patches/3.2.20/bsd-compatibility.patch | 2512 -------- target/linux/patches/3.2.20/cris-etrax.patch | 12 - target/linux/patches/3.2.20/defaults.patch | 22 - target/linux/patches/3.2.20/gemalto.patch | 11 - target/linux/patches/3.2.20/mmc-host.patch | 36 - target/linux/patches/3.2.20/non-static.patch | 33 - target/linux/patches/3.2.20/sparc-include.patch | 11 - target/linux/patches/3.2.20/startup.patch | 20 - target/linux/patches/3.2.20/usb-defaults-off.patch | 32 - target/linux/patches/3.2.20/uuid.patch | 255 - .../patches/3.2.20/vga-cons-default-off.patch | 12 - target/linux/patches/3.2.20/wlan-cf.patch | 11 - target/linux/patches/3.2.20/x86-build.patch | 11 - target/linux/patches/3.2.20/zlib-inflate.patch | 12 - target/linux/patches/3.3.8/bsd-compatibility.patch | 2512 -------- target/linux/patches/3.3.8/cris-etrax.patch | 12 - target/linux/patches/3.3.8/defaults.patch | 22 - target/linux/patches/3.3.8/gemalto.patch | 11 - target/linux/patches/3.3.8/lemote-rfkill.patch | 21 - target/linux/patches/3.3.8/mmc-host.patch | 36 - .../patches/3.3.8/module-alloc-size-check.patch | 21 - target/linux/patches/3.3.8/non-static.patch | 33 - target/linux/patches/3.3.8/sparc-include.patch | 11 - target/linux/patches/3.3.8/startup.patch | 20 - target/linux/patches/3.3.8/usb-defaults-off.patch | 32 - target/linux/patches/3.3.8/uuid.patch | 255 - .../linux/patches/3.3.8/vga-cons-default-off.patch | 12 - target/linux/patches/3.3.8/wlan-cf.patch | 11 - target/linux/patches/3.3.8/x86-build.patch | 11 - target/linux/patches/3.3.8/zlib-inflate.patch | 12 - target/linux/patches/3.4.4/bsd-compatibility.patch | 2512 -------- target/linux/patches/3.4.4/cris-etrax.patch | 12 - target/linux/patches/3.4.4/defaults.patch | 22 - target/linux/patches/3.4.4/gemalto.patch | 11 - target/linux/patches/3.4.4/lemote-rfkill.patch | 21 - target/linux/patches/3.4.4/mmc-host.patch | 36 - .../patches/3.4.4/module-alloc-size-check.patch | 21 - target/linux/patches/3.4.4/non-static.patch | 33 - target/linux/patches/3.4.4/sparc-include.patch | 11 - target/linux/patches/3.4.4/startup.patch | 20 - target/linux/patches/3.4.4/usb-defaults-off.patch | 32 - target/linux/patches/3.4.4/uuid.patch | 263 - .../linux/patches/3.4.4/vga-cons-default-off.patch | 12 - target/linux/patches/3.4.4/wlan-cf.patch | 11 - target/linux/patches/3.4.4/zlib-inflate.patch | 12 - target/linux/patches/3.4.6/bsd-compatibility.patch | 2512 ++++++++ target/linux/patches/3.4.6/cris-etrax.patch | 12 + target/linux/patches/3.4.6/defaults.patch | 22 + target/linux/patches/3.4.6/gemalto.patch | 11 + target/linux/patches/3.4.6/lemote-rfkill.patch | 21 + target/linux/patches/3.4.6/mmc-host.patch | 36 + .../patches/3.4.6/module-alloc-size-check.patch | 21 + target/linux/patches/3.4.6/non-static.patch | 33 + target/linux/patches/3.4.6/sparc-include.patch | 11 + target/linux/patches/3.4.6/startup.patch | 20 + target/linux/patches/3.4.6/usb-defaults-off.patch | 32 + target/linux/patches/3.4.6/uuid.patch | 263 + .../linux/patches/3.4.6/vga-cons-default-off.patch | 12 + target/linux/patches/3.4.6/wlan-cf.patch | 11 + target/linux/patches/3.4.6/zlib-inflate.patch | 12 + target/linux/patches/3.5/bsd-compatibility.patch | 2512 ++++++++ target/linux/patches/3.5/cris-etrax.patch | 12 + target/linux/patches/3.5/defaults.patch | 22 + target/linux/patches/3.5/gemalto.patch | 11 + target/linux/patches/3.5/lemote-rfkill.patch | 21 + target/linux/patches/3.5/mmc-host.patch | 36 + .../patches/3.5/module-alloc-size-check.patch | 21 + target/linux/patches/3.5/non-static.patch | 33 + target/linux/patches/3.5/sparc-include.patch | 11 + target/linux/patches/3.5/startup.patch | 20 + target/linux/patches/3.5/usb-defaults-off.patch | 32 + target/linux/patches/3.5/uuid.patch | 263 + .../linux/patches/3.5/vga-cons-default-off.patch | 12 + target/linux/patches/3.5/wlan-cf.patch | 11 + target/linux/patches/3.5/zlib-inflate.patch | 12 + .../kernel-headers/patches/3.0.34/aufs2.patch | 240 - .../patches/3.0.34/cleankernel.patch | 11 - .../patches/3.0.34/etrax-header.patch | 75 - .../patches/3.0.34/linux-gcc-check.patch | 18 - .../kernel-headers/patches/3.0.34/microperl.patch | 24 - .../kernel-headers/patches/3.1.10/aufs2.patch | 238 - .../patches/3.1.10/cleankernel.patch | 11 - .../patches/3.1.10/etrax-header.patch | 75 - .../patches/3.1.10/linux-gcc-check.patch | 18 - .../kernel-headers/patches/3.1.10/microperl.patch | 24 - .../kernel-headers/patches/3.2.20/aufs2.patch | 238 - .../patches/3.2.20/cleankernel.patch | 11 - .../patches/3.2.20/etrax-header.patch | 75 - .../patches/3.2.20/linux-gcc-check.patch | 18 - .../kernel-headers/patches/3.2.20/microperl.patch | 24 - toolchain/kernel-headers/patches/3.3.8/aufs2.patch | 238 - .../kernel-headers/patches/3.3.8/cleankernel.patch | 11 - .../patches/3.3.8/etrax-header.patch | 75 - .../patches/3.3.8/linux-gcc-check.patch | 18 - .../kernel-headers/patches/3.3.8/microperl.patch | 24 - .../kernel-headers/patches/3.3.8/mkpiggy.patch | 28 - toolchain/kernel-headers/patches/3.4.4/aufs2.patch | 238 - .../kernel-headers/patches/3.4.4/cleankernel.patch | 11 - .../patches/3.4.4/etrax-header.patch | 95 - .../patches/3.4.4/linux-gcc-check.patch | 18 - .../kernel-headers/patches/3.4.4/microperl.patch | 24 - .../kernel-headers/patches/3.4.4/mkpiggy.patch | 28 - .../kernel-headers/patches/3.4.4/relocs.patch | 3131 ---------- toolchain/kernel-headers/patches/3.4.6/aufs2.patch | 238 + .../kernel-headers/patches/3.4.6/cleankernel.patch | 11 + .../patches/3.4.6/etrax-header.patch | 95 + .../patches/3.4.6/linux-gcc-check.patch | 18 + .../kernel-headers/patches/3.4.6/microperl.patch | 24 + .../kernel-headers/patches/3.4.6/mkpiggy.patch | 28 + .../kernel-headers/patches/3.4.6/relocs.patch | 3131 ++++++++++ toolchain/kernel-headers/patches/3.5/aufs2.patch | 238 + .../kernel-headers/patches/3.5/cleankernel.patch | 11 + .../kernel-headers/patches/3.5/etrax-header.patch | 95 + .../patches/3.5/linux-gcc-check.patch | 18 + .../kernel-headers/patches/3.5/microperl.patch | 24 + toolchain/kernel-headers/patches/3.5/mkpiggy.patch | 28 + toolchain/kernel-headers/patches/3.5/relocs.patch | 3131 ++++++++++ 160 files changed, 13190 insertions(+), 34304 deletions(-) delete mode 100644 target/linux/patches/3.0.34/brcm.patch delete mode 100644 target/linux/patches/3.0.34/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.0.34/cris-etrax.patch delete mode 100644 target/linux/patches/3.0.34/defaults.patch delete mode 100644 target/linux/patches/3.0.34/fon2100.patch delete mode 100644 target/linux/patches/3.0.34/gemalto.patch delete mode 100644 target/linux/patches/3.0.34/mips-malta.patch delete mode 100644 target/linux/patches/3.0.34/mmc-host.patch delete mode 100644 target/linux/patches/3.0.34/mtd-rootfs.patch delete mode 100644 target/linux/patches/3.0.34/non-static.patch delete mode 100644 target/linux/patches/3.0.34/sparc-include.patch delete mode 100644 target/linux/patches/3.0.34/startup.patch delete mode 100644 target/linux/patches/3.0.34/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.0.34/uuid.patch delete mode 100644 target/linux/patches/3.0.34/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.0.34/wlan-cf.patch delete mode 100644 target/linux/patches/3.0.34/x86-build.patch delete mode 100644 target/linux/patches/3.0.34/zlib-inflate.patch delete mode 100644 target/linux/patches/3.1.10/brcm.patch delete mode 100644 target/linux/patches/3.1.10/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.1.10/cris-etrax.patch delete mode 100644 target/linux/patches/3.1.10/defaults.patch delete mode 100644 target/linux/patches/3.1.10/fon2100.patch delete mode 100644 target/linux/patches/3.1.10/gemalto.patch delete mode 100644 target/linux/patches/3.1.10/mmc-host.patch delete mode 100644 target/linux/patches/3.1.10/mtd-rootfs.patch delete mode 100644 target/linux/patches/3.1.10/non-static.patch delete mode 100644 target/linux/patches/3.1.10/sparc-include.patch delete mode 100644 target/linux/patches/3.1.10/startup.patch delete mode 100644 target/linux/patches/3.1.10/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.1.10/uuid.patch delete mode 100644 target/linux/patches/3.1.10/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.1.10/wlan-cf.patch delete mode 100644 target/linux/patches/3.1.10/x86-build.patch delete mode 100644 target/linux/patches/3.1.10/zlib-inflate.patch delete mode 100644 target/linux/patches/3.2.20/brcm.patch delete mode 100644 target/linux/patches/3.2.20/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.2.20/cris-etrax.patch delete mode 100644 target/linux/patches/3.2.20/defaults.patch delete mode 100644 target/linux/patches/3.2.20/gemalto.patch delete mode 100644 target/linux/patches/3.2.20/mmc-host.patch delete mode 100644 target/linux/patches/3.2.20/non-static.patch delete mode 100644 target/linux/patches/3.2.20/sparc-include.patch delete mode 100644 target/linux/patches/3.2.20/startup.patch delete mode 100644 target/linux/patches/3.2.20/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.2.20/uuid.patch delete mode 100644 target/linux/patches/3.2.20/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.2.20/wlan-cf.patch delete mode 100644 target/linux/patches/3.2.20/x86-build.patch delete mode 100644 target/linux/patches/3.2.20/zlib-inflate.patch delete mode 100644 target/linux/patches/3.3.8/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.3.8/cris-etrax.patch delete mode 100644 target/linux/patches/3.3.8/defaults.patch delete mode 100644 target/linux/patches/3.3.8/gemalto.patch delete mode 100644 target/linux/patches/3.3.8/lemote-rfkill.patch delete mode 100644 target/linux/patches/3.3.8/mmc-host.patch delete mode 100644 target/linux/patches/3.3.8/module-alloc-size-check.patch delete mode 100644 target/linux/patches/3.3.8/non-static.patch delete mode 100644 target/linux/patches/3.3.8/sparc-include.patch delete mode 100644 target/linux/patches/3.3.8/startup.patch delete mode 100644 target/linux/patches/3.3.8/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.3.8/uuid.patch delete mode 100644 target/linux/patches/3.3.8/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.3.8/wlan-cf.patch delete mode 100644 target/linux/patches/3.3.8/x86-build.patch delete mode 100644 target/linux/patches/3.3.8/zlib-inflate.patch delete mode 100644 target/linux/patches/3.4.4/bsd-compatibility.patch delete mode 100644 target/linux/patches/3.4.4/cris-etrax.patch delete mode 100644 target/linux/patches/3.4.4/defaults.patch delete mode 100644 target/linux/patches/3.4.4/gemalto.patch delete mode 100644 target/linux/patches/3.4.4/lemote-rfkill.patch delete mode 100644 target/linux/patches/3.4.4/mmc-host.patch delete mode 100644 target/linux/patches/3.4.4/module-alloc-size-check.patch delete mode 100644 target/linux/patches/3.4.4/non-static.patch delete mode 100644 target/linux/patches/3.4.4/sparc-include.patch delete mode 100644 target/linux/patches/3.4.4/startup.patch delete mode 100644 target/linux/patches/3.4.4/usb-defaults-off.patch delete mode 100644 target/linux/patches/3.4.4/uuid.patch delete mode 100644 target/linux/patches/3.4.4/vga-cons-default-off.patch delete mode 100644 target/linux/patches/3.4.4/wlan-cf.patch delete mode 100644 target/linux/patches/3.4.4/zlib-inflate.patch create mode 100644 target/linux/patches/3.4.6/bsd-compatibility.patch create mode 100644 target/linux/patches/3.4.6/cris-etrax.patch create mode 100644 target/linux/patches/3.4.6/defaults.patch create mode 100644 target/linux/patches/3.4.6/gemalto.patch create mode 100644 target/linux/patches/3.4.6/lemote-rfkill.patch create mode 100644 target/linux/patches/3.4.6/mmc-host.patch create mode 100644 target/linux/patches/3.4.6/module-alloc-size-check.patch create mode 100644 target/linux/patches/3.4.6/non-static.patch create mode 100644 target/linux/patches/3.4.6/sparc-include.patch create mode 100644 target/linux/patches/3.4.6/startup.patch create mode 100644 target/linux/patches/3.4.6/usb-defaults-off.patch create mode 100644 target/linux/patches/3.4.6/uuid.patch create mode 100644 target/linux/patches/3.4.6/vga-cons-default-off.patch create mode 100644 target/linux/patches/3.4.6/wlan-cf.patch create mode 100644 target/linux/patches/3.4.6/zlib-inflate.patch create mode 100644 target/linux/patches/3.5/bsd-compatibility.patch create mode 100644 target/linux/patches/3.5/cris-etrax.patch create mode 100644 target/linux/patches/3.5/defaults.patch create mode 100644 target/linux/patches/3.5/gemalto.patch create mode 100644 target/linux/patches/3.5/lemote-rfkill.patch create mode 100644 target/linux/patches/3.5/mmc-host.patch create mode 100644 target/linux/patches/3.5/module-alloc-size-check.patch create mode 100644 target/linux/patches/3.5/non-static.patch create mode 100644 target/linux/patches/3.5/sparc-include.patch create mode 100644 target/linux/patches/3.5/startup.patch create mode 100644 target/linux/patches/3.5/usb-defaults-off.patch create mode 100644 target/linux/patches/3.5/uuid.patch create mode 100644 target/linux/patches/3.5/vga-cons-default-off.patch create mode 100644 target/linux/patches/3.5/wlan-cf.patch create mode 100644 target/linux/patches/3.5/zlib-inflate.patch delete mode 100644 toolchain/kernel-headers/patches/3.0.34/aufs2.patch delete mode 100644 toolchain/kernel-headers/patches/3.0.34/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/3.0.34/etrax-header.patch delete mode 100644 toolchain/kernel-headers/patches/3.0.34/linux-gcc-check.patch delete mode 100644 toolchain/kernel-headers/patches/3.0.34/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/3.1.10/aufs2.patch delete mode 100644 toolchain/kernel-headers/patches/3.1.10/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/3.1.10/etrax-header.patch delete mode 100644 toolchain/kernel-headers/patches/3.1.10/linux-gcc-check.patch delete mode 100644 toolchain/kernel-headers/patches/3.1.10/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/3.2.20/aufs2.patch delete mode 100644 toolchain/kernel-headers/patches/3.2.20/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/3.2.20/etrax-header.patch delete mode 100644 toolchain/kernel-headers/patches/3.2.20/linux-gcc-check.patch delete mode 100644 toolchain/kernel-headers/patches/3.2.20/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/3.3.8/aufs2.patch delete mode 100644 toolchain/kernel-headers/patches/3.3.8/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/3.3.8/etrax-header.patch delete mode 100644 toolchain/kernel-headers/patches/3.3.8/linux-gcc-check.patch delete mode 100644 toolchain/kernel-headers/patches/3.3.8/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/3.3.8/mkpiggy.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/aufs2.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/etrax-header.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/linux-gcc-check.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/mkpiggy.patch delete mode 100644 toolchain/kernel-headers/patches/3.4.4/relocs.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/aufs2.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/cleankernel.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/etrax-header.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/linux-gcc-check.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/microperl.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/mkpiggy.patch create mode 100644 toolchain/kernel-headers/patches/3.4.6/relocs.patch create mode 100644 toolchain/kernel-headers/patches/3.5/aufs2.patch create mode 100644 toolchain/kernel-headers/patches/3.5/cleankernel.patch create mode 100644 toolchain/kernel-headers/patches/3.5/etrax-header.patch create mode 100644 toolchain/kernel-headers/patches/3.5/linux-gcc-check.patch create mode 100644 toolchain/kernel-headers/patches/3.5/microperl.patch create mode 100644 toolchain/kernel-headers/patches/3.5/mkpiggy.patch create mode 100644 toolchain/kernel-headers/patches/3.5/relocs.patch diff --git a/Config.in b/Config.in index 99cba0e92..489e86215 100644 --- a/Config.in +++ b/Config.in @@ -95,7 +95,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.4.4" + prompt "3.4.6" boolean depends on ADK_TOOLCHAIN_ONLY @@ -107,40 +107,19 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_4_4 - prompt "3.4.4" +config ADK_KERNEL_VERSION_3_4_6 + prompt "3.4.6" boolean -config ADK_KERNEL_VERSION_3_3_8 - prompt "3.3.8" +config ADK_KERNEL_VERSION_3_5 + prompt "3.5" boolean - -config ADK_KERNEL_VERSION_3_2_20 - prompt "3.2.20" - boolean - -config ADK_KERNEL_VERSION_3_1_10 - prompt "3.1.10" - boolean - -config ADK_KERNEL_VERSION_3_0_34 - prompt "3.0.34" - boolean - -config ADK_KERNEL_VERSION_2_6_39_4 - prompt "2.6.39.4" - boolean - endchoice config ADK_KERNEL_VERSION string - default "3.4.4" if ADK_KERNEL_VERSION_3_4_4 - default "3.3.8" if ADK_KERNEL_VERSION_3_3_8 - default "3.2.20" if ADK_KERNEL_VERSION_3_2_20 - default "3.1.10" if ADK_KERNEL_VERSION_3_1_10 - default "3.0.34" if ADK_KERNEL_VERSION_3_0_34 - default "2.6.39.4" if ADK_KERNEL_VERSION_2_6_39_4 + default "3.4.6" if ADK_KERNEL_VERSION_3_4_6 + default "3.5" if ADK_KERNEL_VERSION_3_5 help choice diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 5cec70c7a..45d4fe65d 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,42 +1,18 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.4.4 +KERNEL_VERSION:= 3.4.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 6b8420c24e6f25c56824ce085d194687 +KERNEL_MD5SUM:= e81d235d91289e612f48718b459b9039 endif -ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y) -KERNEL_VERSION:= 2.6.39.4 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= a17c748c2070168f1e784e9605ca043d -endif -ifeq ($(ADK_KERNEL_VERSION_3_0_34),y) -KERNEL_VERSION:= 3.0.34 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 3036f69e292d3ce0f7b765a278b12e64 -endif -ifeq ($(ADK_KERNEL_VERSION_3_1_10),y) -KERNEL_VERSION:= 3.1.10 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 3649bdaa50ffd9114cc16486ec54d83a -endif -ifeq ($(ADK_KERNEL_VERSION_3_2_20),y) -KERNEL_VERSION:= 3.2.20 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= bd0063a747c3ea0ecdcc85a512d9760a -endif -ifeq ($(ADK_KERNEL_VERSION_3_3_8),y) -KERNEL_VERSION:= 3.3.8 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) +ifeq ($(ADK_KERNEL_VERSION_3_5),y) +KERNEL_VERSION:= 3.5 +KERNEL_MOD_VERSION:= 3.5.0 KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 21068f0fd262b9b3670947f7892e1d6b endif -ifeq ($(ADK_KERNEL_VERSION_3_4_4),y) -KERNEL_VERSION:= 3.4.4 +ifeq ($(ADK_KERNEL_VERSION_3_4_6),y) +KERNEL_VERSION:= 3.4.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 6b8420c24e6f25c56824ce085d194687 +KERNEL_MD5SUM:= e81d235d91289e612f48718b459b9039 endif diff --git a/mk/modules.mk b/mk/modules.mk index 87266124f..45cd4fe19 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -35,32 +35,32 @@ $(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\ # $(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\ - $(MODULES_DIR)/kernel/drivers/net/8390 \ - $(MODULES_DIR)/kernel/drivers/net/ne2k-pci \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/8390/8390 \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/8390/ne2k-pci \ ,20)) $(eval $(call KMOD_template,8139CP,8139cp,\ - $(MODULES_DIR)/kernel/drivers/net/8139cp \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/realtek/8139cp \ ,20)) $(eval $(call KMOD_template,8139TOO,8139too,\ - $(MODULES_DIR)/kernel/drivers/net/8139too \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/realtek/8139too \ ,20)) $(eval $(call KMOD_template,E100,e100,\ - $(MODULES_DIR)/kernel/drivers/net/e100 \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/intel/e100 \ ,20)) $(eval $(call KMOD_template,E1000,e1000,\ - $(MODULES_DIR)/kernel/drivers/net/e1000/e1000 \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/intel/e1000/e1000 \ ,20)) $(eval $(call KMOD_template,SKY2,sky2,\ - $(MODULES_DIR)/kernel/drivers/net/sky2 \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/marvell/sky2 \ ,20)) $(eval $(call KMOD_template,R8169,r8169,\ - $(MODULES_DIR)/kernel/drivers/net/r8169 \ + $(MODULES_DIR)/kernel/drivers/net/ethernet/realtek/r8169 \ ,20)) # @@ -427,6 +427,10 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,netfilter-xt-target-notr $(MODULES_DIR)/kernel/net/netfilter/xt_NOTRACK \ ,50)) +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_LOG,netfilter-xt-target-log,\ + $(MODULES_DIR)/kernel/net/netfilter/xt_LOG \ +,60)) + # # IP: Netfilter # @@ -553,9 +557,6 @@ $(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \ ,60)) -$(eval $(call KMOD_template,IP_NF_TARGET_LOG,ip-nf-target-log,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_LOG \ -,60)) $(eval $(call KMOD_template,IP_NF_TARGET_ULOG,ip-nf-target-ulog,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ULOG \ @@ -638,10 +639,6 @@ $(eval $(call KMOD_template,IP6_NF_MATCH_RT,ip6-nf-match-rt,\ $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_rt \ ,55)) -$(eval $(call KMOD_template,IP6_NF_TARGET_LOG,ip6-nf-target-log,\ - $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_LOG \ -,55)) - # # IPv6: Filtering # @@ -963,7 +960,7 @@ $(eval $(call KMOD_template,CRYPTO_ANUBIS,crypto-anubis,\ ,11)) $(eval $(call KMOD_template,CRYPTO_CAMELLIA,crypto-camellia,\ - $(MODULES_DIR)/kernel/crypto/camellia \ + $(MODULES_DIR)/kernel/crypto/camellia_generic \ ,11)) $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ @@ -1178,9 +1175,6 @@ endif $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ $(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \ $(MODULES_DIR)/kernel/drivers/media/video/videodev \ - $(MODULES_DIR)/kernel/drivers/media/video/videobuf2-core \ - $(MODULES_DIR)/kernel/drivers/media/video/videobuf2-memops \ - $(MODULES_DIR)/kernel/drivers/media/video/videobuf2-vmalloc \ ,65)) $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ diff --git a/target/linux/config/Config.in.ipvs b/target/linux/config/Config.in.ipvs index 1a5fbd063..b7ed817b6 100644 --- a/target/linux/config/Config.in.ipvs +++ b/target/linux/config/Config.in.ipvs @@ -4,6 +4,7 @@ config ADK_KPACKAGE_KMOD_IP_VS prompt "kmod-ip-vs............................ IPVS support" tristate select ADK_KERNEL_NETFILTER + select ADK_KPACKAGE_KMOD_NF_CONNTRACK default n config ADK_KERNEL_IP_VS_DEBUG diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core index 964b71c37..21e4c0da6 100644 --- a/target/linux/config/Config.in.netfilter.core +++ b/target/linux/config/Config.in.netfilter.core @@ -1,3 +1,9 @@ +config ADK_KPACKAGE_KMOD_NETFILTER_NETLINK_LOG + tristate 'Netfilter LOG over NFNETLINK interface' + help + If this option is enabled, the kernel will include support + for logging packets via NFNETLINK. + config ADK_KPACKAGE_KMOD_NF_CONNTRACK tristate 'Netfilter connection tracking support' select ADK_KERNEL_NETFILTER_XTABLES @@ -55,6 +61,13 @@ config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_NFQUEUE As opposed to QUEUE, it supports 65535 different queues, not just one. +config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_LOG + tristate 'LOG target support' + depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER + help + This option adds a `LOG' target, which allows you to create rules in + any iptables table which records the packet header to the syslog. + config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_TCPMSS tristate 'TCPMSS target' select ADK_KERNEL_NETFILTER_XTABLES diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 1a1e91daf..ff3c1515d 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -60,13 +60,6 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REJECT error should be issued in response to an incoming packet, rather than silently being dropped. -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_LOG - tristate 'LOG target support' - depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER - help - This option adds a `LOG' target, which allows you to create rules in - any iptables table which records the packet header to the syslog. - config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG tristate 'ULOG target support (ipv4 only)' depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER diff --git a/target/linux/config/Config.in.netfilter.ip6 b/target/linux/config/Config.in.netfilter.ip6 index cb9700cbd..2138354eb 100644 --- a/target/linux/config/Config.in.netfilter.ip6 +++ b/target/linux/config/Config.in.netfilter.ip6 @@ -84,13 +84,6 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_RT To compile it as a module, choose M here. If unsure, say N. # The targets -config ADK_KPACKAGE_KMOD_IP6_NF_TARGET_LOG - tristate "LOG target support" - help - This option adds a `LOG' target, which allows you to create rules in - any iptables table which records the packet header to the syslog. - - To compile it as a module, choose M here. If unsure, say N. config ADK_KPACKAGE_KMOD_IP6_NF_FILTER tristate "Packet filtering" diff --git a/target/linux/patches/3.0.34/brcm.patch b/target/linux/patches/3.0.34/brcm.patch deleted file mode 100644 index 548d26068..000000000 --- a/target/linux/patches/3.0.34/brcm.patch +++ /dev/null @@ -1,465 +0,0 @@ -diff -Nur linux-2.6.39.4.orig/arch/mips/Kconfig linux-2.6.39.4/arch/mips/Kconfig ---- linux-2.6.39.4.orig/arch/mips/Kconfig 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/arch/mips/Kconfig 2012-06-02 20:35:49.000000000 +0200 -@@ -103,6 +103,12 @@ - select GENERIC_GPIO - select SYS_HAS_EARLY_PRINTK - select CFE -+ select SYS_SUPPORTS_ZBOOT_UART16550 -+ select HAVE_KERNEL_GZIP -+ select HAVE_KERNEL_BZIP2 -+ select HAVE_KERNEL_LZMA -+ select HAVE_KERNEL_XZ -+ select HAVE_KERNEL_LZO - help - Support for BCM47XX based boards - -diff -Nur linux-2.6.39.4.orig/arch/mips/Makefile linux-2.6.39.4/arch/mips/Makefile ---- linux-2.6.39.4.orig/arch/mips/Makefile 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/arch/mips/Makefile 2012-06-02 20:35:49.000000000 +0200 -@@ -76,6 +76,7 @@ - all-$(CONFIG_BOOT_ELF32) := $(vmlinux-32) - all-$(CONFIG_BOOT_ELF64) := $(vmlinux-64) - all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz -+all-$(CONFIG_BCM47XX) += vmlinuz.elf - - # - # GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel -@@ -276,7 +277,7 @@ - $(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@ - - # boot/compressed --vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE -+vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinuz.elf: $(vmlinux-32) FORCE - $(Q)$(MAKE) $(build)=arch/mips/boot/compressed \ - VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@ - -@@ -313,6 +314,7 @@ - echo ' vmlinuz.ecoff - ECOFF zboot image' - echo ' vmlinuz.bin - Raw binary zboot image' - echo ' vmlinuz.srec - SREC zboot image' -+ echo ' vmlinuz.elf - ELF self-relocating zboot image' - echo - echo ' These will be default as appropriate for a configured platform.' - endef -diff -Nur linux-2.6.39.4.orig/arch/mips/bcm47xx/Makefile linux-2.6.39.4/arch/mips/bcm47xx/Makefile ---- linux-2.6.39.4.orig/arch/mips/bcm47xx/Makefile 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/arch/mips/bcm47xx/Makefile 2012-06-02 20:35:49.000000000 +0200 -@@ -3,4 +3,4 @@ - # under Linux. - # - --obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o -+obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o -diff -Nur linux-2.6.39.4.orig/arch/mips/bcm47xx/platform.c linux-2.6.39.4/arch/mips/bcm47xx/platform.c ---- linux-2.6.39.4.orig/arch/mips/bcm47xx/platform.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.39.4/arch/mips/bcm47xx/platform.c 2012-06-02 20:35:49.000000000 +0200 -@@ -0,0 +1,146 @@ -+/* -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file "COPYING" in the main directory of this archive -+ * for more details. -+ * -+ * Copyright (C) 2010, 2011 Waldemar Brodkorb -+ * Copyright © 2007, 2011 Thorsten Glaser -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#define CFGFS_FLASH_SIZE (128 * 1024) -+ -+static struct mtd_partition bcm47xx_partitions[] = { -+#define SLOT_CFE 0 -+ { -+ .name = "cfe", -+ .offset = 0, -+ .size = BCM47XX_OVERRIDE_CFESIZE, -+ .mask_flags = MTD_WRITEABLE /* force read-only */ -+ }, -+#define SLOT_LINUX 1 -+ { -+ .name = "linux", -+ .offset = 0, -+ .size = 0, -+ }, -+#define SLOT_ROOTFS 2 -+ { -+ .name = "rootfs", -+ .offset = 0, -+ .size = 0, -+ }, -+#define SLOT_CFGFS 3 -+ { -+ .name = "cfgfs", -+ .offset = 0, -+ .size = 0, -+ }, -+#define SLOT_NVRAM 4 -+ { -+ .name = "nvram", -+ .offset = 0, -+ .size = 0, -+ }, -+}; -+ -+static struct physmap_flash_data bcm47xx_flash_data = { -+ .parts = bcm47xx_partitions, -+ .nr_parts = ARRAY_SIZE(bcm47xx_partitions) -+}; -+ -+static struct resource bcm47xx_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device bcm47xx_flash = { -+ .name = "physmap-flash", -+ .id = 0, -+ .dev = { .platform_data = &bcm47xx_flash_data, }, -+ .resource = &bcm47xx_flash_resource, -+ .num_resources = 1, -+}; -+ -+static struct platform_device *bcm47xx_devices[] __initdata = { -+ &bcm47xx_flash, -+}; -+ -+struct bcm47xx_trx_header { -+#define BCM47XX_TRX_MAGIC 0x30524448 -+ u32 magic; -+ u32 len; -+ u32 crc32; -+ u32 flag_version; -+ u32 offsets[3]; -+}; -+ -+#define UPTODOWN(slot, psize) do { \ -+ posn -= psize; left -= psize; \ -+ bcm47xx_partitions[slot].offset = posn; \ -+ bcm47xx_partitions[slot].size = psize; \ -+} while (/* CONSTCOND */ 0) -+ -+static int __init bcm47xx_register_devices(void) -+{ -+ u32 flash_size; -+ size_t left, posn; -+ struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore; -+ struct bcm47xx_trx_header *trx_hdr; -+ -+ trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + BCM47XX_OVERRIDE_CFESIZE); -+ -+ /* devices might have 2, 4 or 8 MB flash size */ -+#ifdef BCM47XX_OVERRIDE_FLASHSIZE -+ flash_size = BCM47XX_OVERRIDE_FLASHSIZE; -+ mcore->flash_window_size = flash_size; -+#define BCM47XX_OVERRODE_FLASHSIZE " (overridden)" -+#else -+ flash_size = mcore->flash_window_size; -+#define BCM47XX_OVERRODE_FLASHSIZE "" -+#endif -+ printk(KERN_INFO "FLASH SIZE%s: %x\n", BCM47XX_OVERRODE_FLASHSIZE, -+ flash_size); -+ -+ left = flash_size - BCM47XX_OVERRIDE_CFESIZE; -+ posn = flash_size; -+ UPTODOWN(SLOT_NVRAM, BCM47XX_OVERRIDE_NVRAMSIZE); -+ UPTODOWN(SLOT_CFGFS, CFGFS_FLASH_SIZE); -+ bcm47xx_partitions[SLOT_LINUX].offset = BCM47XX_OVERRIDE_CFESIZE; -+ bcm47xx_partitions[SLOT_LINUX].size = left; -+ -+ if (trx_hdr->magic == BCM47XX_TRX_MAGIC) { -+ bcm47xx_partitions[SLOT_ROOTFS].offset = -+ bcm47xx_partitions[SLOT_LINUX].offset + -+ trx_hdr->offsets[1]; -+ bcm47xx_partitions[SLOT_ROOTFS].size = -+ bcm47xx_partitions[SLOT_LINUX].size - -+ trx_hdr->offsets[1]; -+ } else -+ printk("bcm47xx/platform: no TRX header found\n"); -+ -+ printk(KERN_INFO "=== Flash map dump ===\n"); -+ for (posn = 0; posn < bcm47xx_flash_data.nr_parts; ++posn) -+ printk(KERN_INFO " #%u %08X @%08X '%s'\n", -+ (unsigned int)posn, -+ (unsigned int)bcm47xx_partitions[posn].size, -+ (unsigned int)bcm47xx_partitions[posn].offset, -+ bcm47xx_partitions[posn].name); -+ printk(KERN_INFO "=== Hope this works, have a nice day\n"); -+ -+ bcm47xx_flash_data.width = mcore->flash_buswidth; -+ bcm47xx_flash_resource.start = mcore->flash_window; -+ bcm47xx_flash_resource.end = mcore->flash_window -+ + mcore->flash_window_size -+ - 1; -+ return platform_add_devices(bcm47xx_devices, -+ ARRAY_SIZE(bcm47xx_devices)); -+} -+ -+device_initcall(bcm47xx_register_devices); -diff -Nur linux-2.6.39.4.orig/arch/mips/boot/compressed/Makefile linux-2.6.39.4/arch/mips/boot/compressed/Makefile ---- linux-2.6.39.4.orig/arch/mips/boot/compressed/Makefile 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/arch/mips/boot/compressed/Makefile 2012-06-02 20:37:43.000000000 +0200 -@@ -44,6 +44,7 @@ - tool_$(CONFIG_KERNEL_BZIP2) = bzip2 - tool_$(CONFIG_KERNEL_LZMA) = lzma - tool_$(CONFIG_KERNEL_LZO) = lzo -+tool_$(CONFIG_KERNEL_XZ) = xzkern - - targets += vmlinux.bin.z - $(obj)/vmlinux.bin.z: $(obj)/vmlinux.bin FORCE -@@ -58,8 +59,13 @@ - # Calculate the load address of the compressed kernel image - hostprogs-y := calc_vmlinuz_load_addr - -+ifdef CONFIG_BCM47XX -+# XXX just after CFE, just pray the address is static -+VMLINUZ_LOAD_ADDRESS = 0xffffffff80900000 -+else - VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ - $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) -+endif - - vmlinuzobjs-y += $(obj)/piggy.o - -@@ -105,4 +111,12 @@ - vmlinuz.srec: vmlinuz - $(call cmd,objcopy) - --clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec} -+AFLAGS_selfreloc.o := -DVMLINUZ_LOAD_ADDRESS=$(VMLINUZ_LOAD_ADDRESS) -+CPPFLAGS_selfreloc.lds := $(KBUILD_CFLAGS) -+ -+arch/mips/boot/compressed/selfreloc.o: arch/mips/boot/compressed/selfreloc.S vmlinuz.bin FORCE -+ -+vmlinuz.elf: arch/mips/boot/compressed/selfreloc.o arch/mips/boot/compressed/selfreloc.lds FORCE -+ $(LD) $(LDFLAGS) -T arch/mips/boot/compressed/selfreloc.lds arch/mips/boot/compressed/selfreloc.o -o $@ -+ -+clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec,elf} $(objtree)/arch/mips/boot/compressed/selfreloc.{o,lds} -diff -Nur linux-2.6.39.4.orig/arch/mips/boot/compressed/decompress.c linux-2.6.39.4/arch/mips/boot/compressed/decompress.c ---- linux-2.6.39.4.orig/arch/mips/boot/compressed/decompress.c 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/arch/mips/boot/compressed/decompress.c 2012-06-02 20:39:09.000000000 +0200 -@@ -43,7 +43,7 @@ - /* activate the code for pre-boot environment */ - #define STATIC static - --#ifdef CONFIG_KERNEL_GZIP -+#if defined(CONFIG_KERNEL_GZIP) || defined(CONFIG_KERNEL_XZ) - void *memcpy(void *dest, const void *src, size_t n) - { - int i; -@@ -54,6 +54,8 @@ - d[i] = s[i]; - return dest; - } -+#endif -+#ifdef CONFIG_KERNEL_GZIP - #include "../../../../lib/decompress_inflate.c" - #endif - -@@ -78,6 +80,10 @@ - #include "../../../../lib/decompress_unlzo.c" - #endif - -+#ifdef CONFIG_KERNEL_XZ -+#include "../../../../lib/decompress_unxz.c" -+#endif -+ - void decompress_kernel(unsigned long boot_heap_start) - { - unsigned long zimage_start, zimage_size; -diff -Nur linux-2.6.39.4.orig/arch/mips/boot/compressed/selfreloc.S linux-2.6.39.4/arch/mips/boot/compressed/selfreloc.S ---- linux-2.6.39.4.orig/arch/mips/boot/compressed/selfreloc.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.39.4/arch/mips/boot/compressed/selfreloc.S 2012-06-02 20:35:49.000000000 +0200 -@@ -0,0 +1,54 @@ -+/*- -+ * written 2011 by Thorsten Glaser based on -+ * arch/mips/boot/compressed/head.S -+ */ -+ -+#include -+#include -+ -+ .set noreorder -+ .cprestore -+ -+ .text -+ LEAF(selfreloc_start) -+selfreloc_start: -+ /* Save boot rom start args */ -+ move s0, a0 -+ move s1, a1 -+ move s2, a2 -+ move s3, a3 -+ -+ /* Copy code to the correct place */ -+ PTR_LI a0, VMLINUZ_LOAD_ADDRESS -+ PTR_LA a1, imgbeg -+ PTR_LA a2, imgend -+1: lw t0, 0(a1) -+ sw t0, 0(a0) -+ add a1, 4 -+ add a0, 4 -+ blt a1, a2, 1b -+ nop -+ -+ /* Restore boot rom start args */ -+ move a0, s0 -+ move a1, s1 -+ move a2, s2 -+ move a3, s3 -+ -+ /* Jump to the code at its new location */ -+ PTR_LI k0, VMLINUZ_LOAD_ADDRESS -+ jr k0 -+ nop -+ -+ /* Just in case we come back… */ -+3: -+ b 3b -+ nop -+ END(selfreloc_start) -+ -+ .globl imgbeg -+ .p2align 2 -+imgbeg: .incbin "vmlinuz.bin" -+ .globl imgend -+ .p2align 2 -+imgend: -diff -Nur linux-2.6.39.4.orig/arch/mips/boot/compressed/selfreloc.lds.S linux-2.6.39.4/arch/mips/boot/compressed/selfreloc.lds.S ---- linux-2.6.39.4.orig/arch/mips/boot/compressed/selfreloc.lds.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.39.4/arch/mips/boot/compressed/selfreloc.lds.S 2012-06-02 20:35:49.000000000 +0200 -@@ -0,0 +1,39 @@ -+/*- -+ * written 2010 by Thorsten Glaser based on -+ * arch/mips/kernel/vmlinux.lds and arch/mips/boot/compressed/ld.script -+ */ -+ -+#include -+#include -+#include -+ -+#undef mips -+#define mips mips -+OUTPUT_ARCH(mips) -+ENTRY(selfreloc_start) -+PHDRS { -+ text PT_LOAD FLAGS(7); /* RWX */ -+} -+SECTIONS -+{ -+ . = VMLINUX_LOAD_ADDRESS; -+ .text : { -+ *(.text) -+ *(.text.*) -+ *(.rodata) -+ *(.rodata.*) -+ *(.data) -+ *(.data.*) -+ *(.bss) -+ *(.bss.*) -+ } :text -+ /DISCARD/ : { -+ *(.MIPS.options) -+ *(.options) -+ *(.pdr) -+ *(.reginfo) -+ *(.comment) -+ *(.note) -+ *(.gnu.attributes) -+ } -+} -diff -Nur linux-2.6.39.4.orig/arch/mips/boot/compressed/uart-16550.c linux-2.6.39.4/arch/mips/boot/compressed/uart-16550.c ---- linux-2.6.39.4.orig/arch/mips/boot/compressed/uart-16550.c 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/arch/mips/boot/compressed/uart-16550.c 2012-06-02 20:35:49.000000000 +0200 -@@ -18,6 +18,11 @@ - #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) - #endif - -+#ifdef CONFIG_BCM47XX -+#define UART_BASE 0x18000300 -+#define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset)) -+#endif -+ - #ifndef PORT - #error please define the serial port address for your own machine - #endif -diff -Nur linux-2.6.39.4.orig/drivers/ssb/driver_mipscore.c linux-2.6.39.4/drivers/ssb/driver_mipscore.c ---- linux-2.6.39.4.orig/drivers/ssb/driver_mipscore.c 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/drivers/ssb/driver_mipscore.c 2012-06-02 20:35:49.000000000 +0200 -@@ -190,10 +190,11 @@ - { - struct ssb_bus *bus = mcore->dev->bus; - -+ printk("Check for vendor with value: %d", bus->chipco.dev->id.vendor); - mcore->flash_buswidth = 2; - if (bus->chipco.dev) { - mcore->flash_window = 0x1c000000; -- mcore->flash_window_size = 0x02000000; -+ mcore->flash_window_size = 0x00800000; - if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG) - & SSB_CHIPCO_CFG_DS16) == 0) - mcore->flash_buswidth = 1; -diff -Nur linux-2.6.39.4.orig/init/Kconfig linux-2.6.39.4/init/Kconfig ---- linux-2.6.39.4.orig/init/Kconfig 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/init/Kconfig 2012-06-02 20:36:11.000000000 +0200 -@@ -156,6 +156,7 @@ - config KERNEL_GZIP - bool "Gzip" - depends on HAVE_KERNEL_GZIP -+ select DECOMPRESS_GZIP - help - The old and tried gzip compression. It provides a good balance - between compression ratio and decompression speed. -@@ -163,6 +164,7 @@ - config KERNEL_BZIP2 - bool "Bzip2" - depends on HAVE_KERNEL_BZIP2 -+ select DECOMPRESS_BZIP2 - help - Its compression ratio and speed is intermediate. - Decompression speed is slowest among the three. The kernel -@@ -173,6 +175,7 @@ - config KERNEL_LZMA - bool "LZMA" - depends on HAVE_KERNEL_LZMA -+ select DECOMPRESS_LZMA - help - The most recent compression algorithm. - Its ratio is best, decompression speed is between the other -@@ -182,6 +185,7 @@ - config KERNEL_XZ - bool "XZ" - depends on HAVE_KERNEL_XZ -+ select DECOMPRESS_XZ - help - XZ uses the LZMA2 algorithm and instruction set specific - BCJ filters which can improve compression ratio of executable -@@ -197,6 +201,7 @@ - config KERNEL_LZO - bool "LZO" - depends on HAVE_KERNEL_LZO -+ select DECOMPRESS_LZO - help - Its compression ratio is the poorest among the 4. The kernel - size is about 10% bigger than gzip; however its speed -diff -Nur linux-2.6.39.4.orig/lib/xz/xz_stream.h linux-2.6.39.4/lib/xz/xz_stream.h ---- linux-2.6.39.4.orig/lib/xz/xz_stream.h 2011-08-03 21:43:28.000000000 +0200 -+++ linux-2.6.39.4/lib/xz/xz_stream.h 2012-06-02 20:40:18.000000000 +0200 -@@ -40,7 +40,12 @@ - * compressed size of the file to less than 256 MiB and may also weaken - * error detection slightly. - */ -+ -+#ifdef __mips__ -+typedef uint32_t vli_type; -+#else - typedef uint64_t vli_type; -+#endif - - #define VLI_MAX ((vli_type)-1 / 2) - #define VLI_UNKNOWN ((vli_type)-1) diff --git a/target/linux/patches/3.0.34/bsd-compatibility.patch b/target/linux/patches/3.0.34/bsd-compatibility.patch deleted file mode 100644 index 9e91a62de..000000000 --- a/target/linux/patches/3.0.34/bsd-compatibility.patch +++ /dev/null @@ -1,2512 +0,0 @@ -diff -Nur linux-2.6.36.orig/scripts/Makefile.lib linux-2.6.36/scripts/Makefile.lib ---- linux-2.6.36.orig/scripts/Makefile.lib 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/scripts/Makefile.lib 2010-11-28 18:34:22.000000000 +0100 -@@ -216,7 +216,12 @@ - size_append = printf $(shell \ - dec_size=0; \ - for F in $1; do \ -- fsize=$$(stat -c "%s" $$F); \ -+ if stat -qs .>/dev/null 2>&1; then \ -+ statcmd='stat -f %z'; \ -+ else \ -+ statcmd='stat -c %s'; \ -+ fi; \ -+ fsize=$$($$statcmd $$F); \ - dec_size=$$(expr $$dec_size + $$fsize); \ - done; \ - printf "%08x\n" $$dec_size | \ -diff -Nur linux-2.6.36.orig/scripts/mod/mk_elfconfig.c linux-2.6.36/scripts/mod/mk_elfconfig.c ---- linux-2.6.36.orig/scripts/mod/mk_elfconfig.c 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/scripts/mod/mk_elfconfig.c 2010-11-28 18:33:24.000000000 +0100 -@@ -1,7 +1,18 @@ - #include - #include - #include --#include -+ -+#define EI_NIDENT (16) -+#define ELFMAG "\177ELF" -+ -+#define SELFMAG 4 -+#define EI_CLASS 4 -+#define ELFCLASS32 1 /* 32-bit objects */ -+#define ELFCLASS64 2 /* 64-bit objects */ -+ -+#define EI_DATA 5 /* Data encoding byte index */ -+#define ELFDATA2LSB 1 /* 2's complement, little endian */ -+#define ELFDATA2MSB 2 /* 2's complement, big endian */ - - int - main(int argc, char **argv) -diff -Nur linux-2.6.36.orig/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h ---- linux-2.6.36.orig/scripts/mod/modpost.h 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/scripts/mod/modpost.h 2010-11-28 18:33:24.000000000 +0100 -@@ -7,7 +7,2453 @@ - #include - #include - #include --#include -+ -+ -+/* This file defines standard ELF types, structures, and macros. -+ Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#ifndef _ELF_H -+#define _ELF_H 1 -+ -+__BEGIN_DECLS -+ -+/* Standard ELF types. */ -+ -+#include -+ -+/* Type for a 16-bit quantity. */ -+typedef uint16_t Elf32_Half; -+typedef uint16_t Elf64_Half; -+ -+/* Types for signed and unsigned 32-bit quantities. */ -+typedef uint32_t Elf32_Word; -+typedef int32_t Elf32_Sword; -+typedef uint32_t Elf64_Word; -+typedef int32_t Elf64_Sword; -+ -+/* Types for signed and unsigned 64-bit quantities. */ -+typedef uint64_t Elf32_Xword; -+typedef int64_t Elf32_Sxword; -+typedef uint64_t Elf64_Xword; -+typedef int64_t Elf64_Sxword; -+ -+/* Type of addresses. */ -+typedef uint32_t Elf32_Addr; -+typedef uint64_t Elf64_Addr; -+ -+/* Type of file offsets. */ -+typedef uint32_t Elf32_Off; -+typedef uint64_t Elf64_Off; -+ -+/* Type for section indices, which are 16-bit quantities. */ -+typedef uint16_t Elf32_Section; -+typedef uint16_t Elf64_Section; -+ -+/* Type for version symbol information. */ -+typedef Elf32_Half Elf32_Versym; -+typedef Elf64_Half Elf64_Versym; -+ -+ -+/* The ELF file header. This appears at the start of every ELF file. */ -+ -+#define EI_NIDENT (16) -+ -+typedef struct -+{ -+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ -+ Elf32_Half e_type; /* Object file type */ -+ Elf32_Half e_machine; /* Architecture */ -+ Elf32_Word e_version; /* Object file version */ -+ Elf32_Addr e_entry; /* Entry point virtual address */ -+ Elf32_Off e_phoff; /* Program header table file offset */ -+ Elf32_Off e_shoff; /* Section header table file offset */ -+ Elf32_Word e_flags; /* Processor-specific flags */ -+ Elf32_Half e_ehsize; /* ELF header size in bytes */ -+ Elf32_Half e_phentsize; /* Program header table entry size */ -+ Elf32_Half e_phnum; /* Program header table entry count */ -+ Elf32_Half e_shentsize; /* Section header table entry size */ -+ Elf32_Half e_shnum; /* Section header table entry count */ -+ Elf32_Half e_shstrndx; /* Section header string table index */ -+} Elf32_Ehdr; -+ -+typedef struct -+{ -+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ -+ Elf64_Half e_type; /* Object file type */ -+ Elf64_Half e_machine; /* Architecture */ -+ Elf64_Word e_version; /* Object file version */ -+ Elf64_Addr e_entry; /* Entry point virtual address */ -+ Elf64_Off e_phoff; /* Program header table file offset */ -+ Elf64_Off e_shoff; /* Section header table file offset */ -+ Elf64_Word e_flags; /* Processor-specific flags */ -+ Elf64_Half e_ehsize; /* ELF header size in bytes */ -+ Elf64_Half e_phentsize; /* Program header table entry size */ -+ Elf64_Half e_phnum; /* Program header table entry count */ -+ Elf64_Half e_shentsize; /* Section header table entry size */ -+ Elf64_Half e_shnum; /* Section header table entry count */ -+ Elf64_Half e_shstrndx; /* Section header string table index */ -+} Elf64_Ehdr; -+ -+/* Fields in the e_ident array. The EI_* macros are indices into the -+ array. The macros under each EI_* macro are the values the byte -+ may have. */ -+ -+#define EI_MAG0 0 /* File identification byte 0 index */ -+#define ELFMAG0 0x7f /* Magic number byte 0 */ -+ -+#define EI_MAG1 1 /* File identification byte 1 index */ -+#define ELFMAG1 'E' /* Magic number byte 1 */ -+ -+#define EI_MAG2 2 /* File identification byte 2 index */ -+#define ELFMAG2 'L' /* Magic number byte 2 */ -+ -+#define EI_MAG3 3 /* File identification byte 3 index */ -+#define ELFMAG3 'F' /* Magic number byte 3 */ -+ -+/* Conglomeration of the identification bytes, for easy testing as a word. */ -+#define ELFMAG "\177ELF" -+#define SELFMAG 4 -+ -+#define EI_CLASS 4 /* File class byte index */ -+#define ELFCLASSNONE 0 /* Invalid class */ -+#define ELFCLASS32 1 /* 32-bit objects */ -+#define ELFCLASS64 2 /* 64-bit objects */ -+#define ELFCLASSNUM 3 -+ -+#define EI_DATA 5 /* Data encoding byte index */ -+#define ELFDATANONE 0 /* Invalid data encoding */ -+#define ELFDATA2LSB 1 /* 2's complement, little endian */ -+#define ELFDATA2MSB 2 /* 2's complement, big endian */ -+#define ELFDATANUM 3 -+ -+#define EI_VERSION 6 /* File version byte index */ -+ /* Value must be EV_CURRENT */ -+ -+#define EI_OSABI 7 /* OS ABI identification */ -+#define ELFOSABI_NONE 0 /* UNIX System V ABI */ -+#define ELFOSABI_SYSV 0 /* Alias. */ -+#define ELFOSABI_HPUX 1 /* HP-UX */ -+#define ELFOSABI_NETBSD 2 /* NetBSD. */ -+#define ELFOSABI_LINUX 3 /* Linux. */ -+#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ -+#define ELFOSABI_AIX 7 /* IBM AIX. */ -+#define ELFOSABI_IRIX 8 /* SGI Irix. */ -+#define ELFOSABI_FREEBSD 9 /* FreeBSD. */ -+#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ -+#define ELFOSABI_MODESTO 11 /* Novell Modesto. */ -+#define ELFOSABI_OPENBSD 12 /* OpenBSD. */ -+#define ELFOSABI_ARM 97 /* ARM */ -+#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ -+ -+#define EI_ABIVERSION 8 /* ABI version */ -+ -+#define EI_PAD 9 /* Byte index of padding bytes */ -+ -+/* Legal values for e_type (object file type). */ -+ -+#define ET_NONE 0 /* No file type */ -+#define ET_REL 1 /* Relocatable file */ -+#define ET_EXEC 2 /* Executable file */ -+#define ET_DYN 3 /* Shared object file */ -+#define ET_CORE 4 /* Core file */ -+#define ET_NUM 5 /* Number of defined types */ -+#define ET_LOOS 0xfe00 /* OS-specific range start */ -+#define ET_HIOS 0xfeff /* OS-specific range end */ -+#define ET_LOPROC 0xff00 /* Processor-specific range start */ -+#define ET_HIPROC 0xffff /* Processor-specific range end */ -+ -+/* Legal values for e_machine (architecture). */ -+ -+#define EM_NONE 0 /* No machine */ -+#define EM_M32 1 /* AT&T WE 32100 */ -+#define EM_SPARC 2 /* SUN SPARC */ -+#define EM_386 3 /* Intel 80386 */ -+#define EM_68K 4 /* Motorola m68k family */ -+#define EM_88K 5 /* Motorola m88k family */ -+#define EM_860 7 /* Intel 80860 */ -+#define EM_MIPS 8 /* MIPS R3000 big-endian */ -+#define EM_S370 9 /* IBM System/370 */ -+#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ -+ -+#define EM_PARISC 15 /* HPPA */ -+#define EM_VPP500 17 /* Fujitsu VPP500 */ -+#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ -+#define EM_960 19 /* Intel 80960 */ -+#define EM_PPC 20 /* PowerPC */ -+#define EM_PPC64 21 /* PowerPC 64-bit */ -+#define EM_S390 22 /* IBM S390 */ -+ -+#define EM_V800 36 /* NEC V800 series */ -+#define EM_FR20 37 /* Fujitsu FR20 */ -+#define EM_RH32 38 /* TRW RH-32 */ -+#define EM_RCE 39 /* Motorola RCE */ -+#define EM_ARM 40 /* ARM */ -+#define EM_FAKE_ALPHA 41 /* Digital Alpha */ -+#define EM_SH 42 /* Hitachi SH */ -+#define EM_SPARCV9 43 /* SPARC v9 64-bit */ -+#define EM_TRICORE 44 /* Siemens Tricore */ -+#define EM_ARC 45 /* Argonaut RISC Core */ -+#define EM_H8_300 46 /* Hitachi H8/300 */ -+#define EM_H8_300H 47 /* Hitachi H8/300H */ -+#define EM_H8S 48 /* Hitachi H8S */ -+#define EM_H8_500 49 /* Hitachi H8/500 */ -+#define EM_IA_64 50 /* Intel Merced */ -+#define EM_MIPS_X 51 /* Stanford MIPS-X */ -+#define EM_COLDFIRE 52 /* Motorola Coldfire */ -+#define EM_68HC12 53 /* Motorola M68HC12 */ -+#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ -+#define EM_PCP 55 /* Siemens PCP */ -+#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ -+#define EM_NDR1 57 /* Denso NDR1 microprocessor */ -+#define EM_STARCORE 58 /* Motorola Start*Core processor */ -+#define EM_ME16 59 /* Toyota ME16 processor */ -+#define EM_ST100 60 /* STMicroelectronic ST100 processor */ -+#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ -+#define EM_X86_64 62 /* AMD x86-64 architecture */ -+#define EM_PDSP 63 /* Sony DSP Processor */ -+ -+#define EM_FX66 66 /* Siemens FX66 microcontroller */ -+#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ -+#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ -+#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ -+#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ -+#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ -+#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ -+#define EM_SVX 73 /* Silicon Graphics SVx */ -+#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */ -+#define EM_VAX 75 /* Digital VAX */ -+#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ -+#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ -+#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ -+#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ -+#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */ -+#define EM_HUANY 81 /* Harvard University machine-independent object files */ -+#define EM_PRISM 82 /* SiTera Prism */ -+#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ -+#define EM_FR30 84 /* Fujitsu FR30 */ -+#define EM_D10V 85 /* Mitsubishi D10V */ -+#define EM_D30V 86 /* Mitsubishi D30V */ -+#define EM_V850 87 /* NEC v850 */ -+#define EM_M32R 88 /* Mitsubishi M32R */ -+#define EM_MN10300 89 /* Matsushita MN10300 */ -+#define EM_MN10200 90 /* Matsushita MN10200 */ -+#define EM_PJ 91 /* picoJava */ -+#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ -+#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ -+#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ -+#define EM_NUM 95 -+ -+/* If it is necessary to assign new unofficial EM_* values, please -+ pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the -+ chances of collision with official or non-GNU unofficial values. */ -+ -+#define EM_ALPHA 0x9026 -+ -+/* Legal values for e_version (version). */ -+ -+#define EV_NONE 0 /* Invalid ELF version */ -+#define EV_CURRENT 1 /* Current version */ -+#define EV_NUM 2 -+ -+/* Section header. */ -+ -+typedef struct -+{ -+ Elf32_Word sh_name; /* Section name (string tbl index) */ -+ Elf32_Word sh_type; /* Section type */ -+ Elf32_Word sh_flags; /* Section flags */ -+ Elf32_Addr sh_addr; /* Section virtual addr at execution */ -+ Elf32_Off sh_offset; /* Section file offset */ -+ Elf32_Word sh_size; /* Section size in bytes */ -+ Elf32_Word sh_link; /* Link to another section */ -+ Elf32_Word sh_info; /* Additional section information */ -+ Elf32_Word sh_addralign; /* Section alignment */ -+ Elf32_Word sh_entsize; /* Entry size if section holds table */ -+} Elf32_Shdr; -+ -+typedef struct -+{ -+ Elf64_Word sh_name; /* Section name (string tbl index) */ -+ Elf64_Word sh_type; /* Section type */ -+ Elf64_Xword sh_flags; /* Section flags */ -+ Elf64_Addr sh_addr; /* Section virtual addr at execution */ -+ Elf64_Off sh_offset; /* Section file offset */ -+ Elf64_Xword sh_size; /* Section size in bytes */ -+ Elf64_Word sh_link; /* Link to another section */ -+ Elf64_Word sh_info; /* Additional section information */ -+ Elf64_Xword sh_addralign; /* Section alignment */ -+ Elf64_Xword sh_entsize; /* Entry size if section holds table */ -+} Elf64_Shdr; -+ -+/* Special section indices. */ -+ -+#define SHN_UNDEF 0 /* Undefined section */ -+#define SHN_LORESERVE 0xff00 /* Start of reserved indices */ -+#define SHN_LOPROC 0xff00 /* Start of processor-specific */ -+#define SHN_HIPROC 0xff1f /* End of processor-specific */ -+#define SHN_LOOS 0xff20 /* Start of OS-specific */ -+#define SHN_HIOS 0xff3f /* End of OS-specific */ -+#define SHN_ABS 0xfff1 /* Associated symbol is absolute */ -+#define SHN_COMMON 0xfff2 /* Associated symbol is common */ -+#define SHN_XINDEX 0xffff /* Index is in extra table. */ -+#define SHN_HIRESERVE 0xffff /* End of reserved indices */ -+ -+/* Legal values for sh_type (section type). */ -+ -+#define SHT_NULL 0 /* Section header table entry unused */ -+#define SHT_PROGBITS 1 /* Program data */ -+#define SHT_SYMTAB 2 /* Symbol table */ -+#define SHT_STRTAB 3 /* String table */ -+#define SHT_RELA 4 /* Relocation entries with addends */ -+#define SHT_HASH 5 /* Symbol hash table */ -+#define SHT_DYNAMIC 6 /* Dynamic linking information */ -+#define SHT_NOTE 7 /* Notes */ -+#define SHT_NOBITS 8 /* Program space with no data (bss) */ -+#define SHT_REL 9 /* Relocation entries, no addends */ -+#define SHT_SHLIB 10 /* Reserved */ -+#define SHT_DYNSYM 11 /* Dynamic linker symbol table */ -+#define SHT_INIT_ARRAY 14 /* Array of constructors */ -+#define SHT_FINI_ARRAY 15 /* Array of destructors */ -+#define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ -+#define SHT_GROUP 17 /* Section group */ -+#define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ -+#define SHT_NUM 19 /* Number of defined types. */ -+#define SHT_LOOS 0x60000000 /* Start OS-specific */ -+#define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */ -+#define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */ -+#define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */ -+#define SHT_SUNW_move 0x6ffffffa -+#define SHT_SUNW_COMDAT 0x6ffffffb -+#define SHT_SUNW_syminfo 0x6ffffffc -+#define SHT_GNU_verdef 0x6ffffffd /* Version definition section. */ -+#define SHT_GNU_verneed 0x6ffffffe /* Version needs section. */ -+#define SHT_GNU_versym 0x6fffffff /* Version symbol table. */ -+#define SHT_HISUNW 0x6fffffff /* Sun-specific high bound. */ -+#define SHT_HIOS 0x6fffffff /* End OS-specific type */ -+#define SHT_LOPROC 0x70000000 /* Start of processor-specific */ -+#define SHT_HIPROC 0x7fffffff /* End of processor-specific */ -+#define SHT_LOUSER 0x80000000 /* Start of application-specific */ -+#define SHT_HIUSER 0x8fffffff /* End of application-specific */ -+ -+/* Legal values for sh_flags (section flags). */ -+ -+#define SHF_WRITE (1 << 0) /* Writable */ -+#define SHF_ALLOC (1 << 1) /* Occupies memory during execution */ -+#define SHF_EXECINSTR (1 << 2) /* Executable */ -+#define SHF_MERGE (1 << 4) /* Might be merged */ -+#define SHF_STRINGS (1 << 5) /* Contains nul-terminated strings */ -+#define SHF_INFO_LINK (1 << 6) /* `sh_info' contains SHT index */ -+#define SHF_LINK_ORDER (1 << 7) /* Preserve order after combining */ -+#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling -+ required */ -+#define SHF_GROUP (1 << 9) /* Section is member of a group. */ -+#define SHF_TLS (1 << 10) /* Section hold thread-local data. */ -+#define SHF_MASKOS 0x0ff00000 /* OS-specific. */ -+#define SHF_MASKPROC 0xf0000000 /* Processor-specific */ -+ -+/* Section group handling. */ -+#define GRP_COMDAT 0x1 /* Mark group as COMDAT. */ -+ -+/* Symbol table entry. */ -+ -+typedef struct -+{ -+ Elf32_Word st_name; /* Symbol name (string tbl index) */ -+ Elf32_Addr st_value; /* Symbol value */ -+ Elf32_Word st_size; /* Symbol size */ -+ unsigned char st_info; /* Symbol type and binding */ -+ unsigned char st_other; /* Symbol visibility */ -+ Elf32_Section st_shndx; /* Section index */ -+} Elf32_Sym; -+ -+typedef struct -+{ -+ Elf64_Word st_name; /* Symbol name (string tbl index) */ -+ unsigned char st_info; /* Symbol type and binding */ -+ unsigned char st_other; /* Symbol visibility */ -+ Elf64_Section st_shndx; /* Section index */ -+ Elf64_Addr st_value; /* Symbol value */ -+ Elf64_Xword st_size; /* Symbol size */ -+} Elf64_Sym; -+ -+/* The syminfo section if available contains additional information about -+ every dynamic symbol. */ -+ -+typedef struct -+{ -+ Elf32_Half si_boundto; /* Direct bindings, symbol bound to */ -+ Elf32_Half si_flags; /* Per symbol flags */ -+} Elf32_Syminfo; -+ -+typedef struct -+{ -+ Elf64_Half si_boundto; /* Direct bindings, symbol bound to */ -+ Elf64_Half si_flags; /* Per symbol flags */ -+} Elf64_Syminfo; -+ -+/* Possible values for si_boundto. */ -+#define SYMINFO_BT_SELF 0xffff /* Symbol bound to self */ -+#define SYMINFO_BT_PARENT 0xfffe /* Symbol bound to parent */ -+#define SYMINFO_BT_LOWRESERVE 0xff00 /* Beginning of reserved entries */ -+ -+/* Possible bitmasks for si_flags. */ -+#define SYMINFO_FLG_DIRECT 0x0001 /* Direct bound symbol */ -+#define SYMINFO_FLG_PASSTHRU 0x0002 /* Pass-thru symbol for translator */ -+#define SYMINFO_FLG_COPY 0x0004 /* Symbol is a copy-reloc */ -+#define SYMINFO_FLG_LAZYLOAD 0x0008 /* Symbol bound to object to be lazy -+ loaded */ -+/* Syminfo version values. */ -+#define SYMINFO_NONE 0 -+#define SYMINFO_CURRENT 1 -+#define SYMINFO_NUM 2 -+ -+ -+/* How to extract and insert information held in the st_info field. */ -+ -+#define E