diff options
48 files changed, 28241 insertions, 158 deletions
diff --git a/mk/image.mk b/mk/image.mk index e8a74aca6..24e31aa0b 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -65,7 +65,7 @@ kernel-package: $(KERNEL) $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) -TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_FS}-kernel +TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${CPU_ARCH}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz @@ -103,12 +103,6 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) -ifeq (,${CUSTOM_ROOTFSSQUASHFS_BUILD}) -${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs - cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \ - >${BUILD_DIR}/${ROOTFSSQUASHFS} -endif - createinitramfs: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) echo N | \ diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 986eb9c29..c9e1bf7e5 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -26,6 +26,7 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config + -rm $(LINUX_DIR)/vmlinux $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 1741c62d0..46e8e9e5c 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,3 +1,3 @@ -KERNEL_VERSION:= 2.6.37 +KERNEL_VERSION:= 2.6.39 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c8ee37b4fdccdb651e0603d35350b434 +KERNEL_MD5SUM:= 1aab7a741abe08d42e8eccf20de61e05 diff --git a/mk/modules.mk b/mk/modules.mk index f82a4382f..0d6a86ebb 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1036,9 +1036,9 @@ $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ ,30)) endif -$(eval $(call KMOD_template,EXPORTFS,exportfs,\ - $(MODULES_DIR)/kernel/fs/exportfs/exportfs \ -,20)) +#$(eval $(call KMOD_template,EXPORTFS,exportfs,\ +# $(MODULES_DIR)/kernel/fs/exportfs/exportfs \ +#,20)) $(eval $(call KMOD_template,NFSD,nfsd,\ $(MODULES_DIR)/kernel/fs/nfsd/nfsd \ @@ -1156,7 +1156,7 @@ $(eval $(call KMOD_template,PCMCIA,pcmcia,\ ,60)) $(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ - $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ + $(MODULES_DIR)/kernel/drivers/tty/serial/serial_cs \ ,70)) # diff --git a/scripts/update-sys b/scripts/update-sys index 925b72a1e..bcfbfa84e 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -33,6 +33,7 @@ if [ -f $topdir/.config ];then check_native arch=$(grep ^ADK_TARGET_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') +cpuarch=$(grep ^ADK_TARGET_CPU_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') systemsym=$(grep ^ADK_TARGET_SYSTEM_ $topdir/.config|cut -f 1 -d =) system=$(grep ^ADK_TARGET_SYSTEM= $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') systems=$(grep ^ADK_TARGET_SYSTEM= $topdir/.config|cut -f 2 -d = | sed -e 's#"##g'|sed -e 's#-#_#g') @@ -49,7 +50,7 @@ config $archsym EOF if [ "${system}" = "toolchain" -o "${system}" = "qemu" ];then - sys=${system}-$arch + sys=${system}-$cpuarch else sys=$system fi @@ -57,7 +58,8 @@ fi cat > $topdir/target/config/Config.in.system << EOF source "target/config/Config.in.system.default" comment "Architecture: $arch" -comment "System: $system" +comment "CPU Architecture: $cpuarch" +comment "System: $sys" config $systemsym boolean diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20 index c63717c6c..aa191b22b 100644 --- a/target/arm/sys-available/acmesystems-foxg20 +++ b/target/arm/sys-available/acmesystems-foxg20 @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_acmesystems_foxg20 select ADK_KERNEL_ARCH_AT91 select ADK_KERNEL_ARCH_AT91SAM9G20 - select ADK_KERNEL_MACH_FOXG20 + select ADK_KERNEL_MACH_ACMENETUSFOXG20 select ADK_KERNEL_AEABI select ADK_EABI select ADK_TARGET_NO_FPU @@ -14,5 +14,5 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_USB help - Acme Systems Foxboard FOX G20 + Acme Systems Foxboard FOXG20 diff --git a/target/config/Config.in b/target/config/Config.in index c1feb7053..f5a9398b5 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -104,9 +104,15 @@ config ADK_TARGET_WITH_PCI config ADK_TARGET_WITH_SSB boolean +config ADK_TARGET_WITH_AHB + boolean + config ADK_TARGET_WITH_MINIPCI boolean +config ADK_TARGET_WITH_ACPI + boolean + config ADK_TARGET_WITH_VGA boolean @@ -255,6 +261,7 @@ config ADK_TARGET_CPU_ARCH default "mipsel" if ADK_LINUX_MIPS && ADK_little default "arm" if ADK_LINUX_ARM && ADK_little default "armeb" if ADK_LINUX_ARM && ADK_big + default "sparc" if ADK_LINUX_SPARC config ADK_TARGET_ABI_CFLAGS string @@ -386,6 +393,7 @@ default ADK_TARGET_ROOTFS_ARCHIVE config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" depends on \ + ADK_HARDWARE_QEMU || \ ADK_LINUX_MIPS64EL || \ ADK_LINUX_PPC || \ ADK_LINUX_SPARC || \ @@ -400,6 +408,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK bool "initramfs filesystem included into kernel image" select ADK_LINUX_INITRAMFS_BUILTIN depends on \ + ADK_HARDWARE_QEMU || \ ADK_LINUX_MIPS64EL || \ ADK_LINUX_PPC || \ ADK_LINUX_SPARC || \ diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default index 235cebe9d..cbe8b6ddc 100644 --- a/target/config/Config.in.arch.default +++ b/target/config/Config.in.arch.default @@ -44,12 +44,12 @@ config ADK_x86 config ADK_TARGET_ARCH string default "arm" if ADK_arm - default "armeb" if ADK_armeb + default "arm" if ADK_armeb default "cris" if ADK_cris default "mips" if ADK_mips - default "mipsel" if ADK_mipsel - default "mips64" if ADK_mips64 - default "mips64el" if ADK_mips64el + default "mips" if ADK_mipsel + default "mips" if ADK_mips64 + default "mips" if ADK_mips64el default "ppc" if ADK_ppc default "ppc64" if ADK_ppc64 default "sparc" if ADK_sparc diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 88bfee272..dec6f3839 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -57,6 +57,7 @@ endchoice config ADK_RUNTIME_CONSOLE_SERIAL_SPEED string + default "9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "115200" diff --git a/target/cris/Makefile b/target/cris/Makefile index 28e33eda5..0ddfb0fcb 100644 --- a/target/cris/Makefile +++ b/target/cris/Makefile @@ -20,6 +20,10 @@ endif kernel-install: tools-compile PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE) +${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs + cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \ + >${BUILD_DIR}/${ROOTFSSQUASHFS} + ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: kernel-install $(BUILD_DIR)/$(ROOTFSSQUASHFS) dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 91cfc9140..4d9bf6828 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -19,6 +19,13 @@ config ADK_KERNEL_MTD_BLOCK config ADK_KERNEL_MTD_PARTITIONS boolean +config ADK_KERNEL_MTD_REDBOOT_PARTS + boolean + +config ADK_KERNEL_MTD_REDBOOT_DIRECTORY_BLOCK + int + default "-3" + config ADK_KERNEL_MTD_ROOTFS_ROOT_DEV boolean @@ -31,6 +38,9 @@ config ADK_KERNEL_MTD_GEN_PROBE config ADK_KERNEL_MTD_PHYSMAP boolean +config ADK_KERNEL_MTD_CFI_ADV_OPTIONS + boolean + config ADK_KERNEL_MTD_NAND_RB4XX boolean default y if ADK_TARGET_SYSTEM_MIKROTIK_RB411 @@ -47,6 +57,13 @@ config ADK_KERNEL_MTD_CFI_INTELEXT default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n +config ADK_KERNEL_MTD_AR2315 + boolean + select ADK_KERNEL_MTD_REDBOOT_PARTS + select ADK_KERNEL_MTD_CFI_ADV_OPTIONS + default y if ADK_TARGET_SYSTEM_FON_FON2100 + default n + config ADK_TARGET_NAND boolean select ADK_KERNEL_MISC_FILESYSTEMS diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index a895225f0..ede84a73a 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -1,5 +1,8 @@ menu "Filesystems support" +config ADK_KERNEL_EXPORTFS + boolean + config ADK_KERNEL_YAFFS_FS tristate @@ -36,12 +39,6 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET string default "iso8859-1" -config ADK_KPACKAGE_KMOD_EXPORTFS - tristate - depends on !ADK_KERNEL_EXPORTFS - default n - help - config ADK_KERNEL_SQUASHFS prompt ".................................. SquashFS filesystem" boolean @@ -177,9 +174,6 @@ config ADK_KPACKAGE_KMOD_VFAT_FS The VFAT support enlarges your kernel by about 10 KB Please read the file <file:Documentation/filesystems/vfat.txt> for details. -config ADK_KERNEL_EXPORTFS - boolean - default n config ADK_KERNEL_XFS_FS boolean @@ -189,7 +183,7 @@ config ADK_KERNEL_XFS_FS config ADK_KPACKAGE_KMOD_XFS_FS prompt "kmod-fs-xfs....................... XFS filesystem support" tristate - select ADK_KPACKAGE_KMOD_EXPORTFS + select ADK_KERNEL_EXPORTFS depends on !ADK_KERNEL_XFS_FS default n help diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 756ffaa18..301a988f2 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -102,7 +102,7 @@ config ADK_KPACKAGE_KMOD_NFSD prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" tristate default n - select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS + select ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 select ADK_KERNEL_NFSD_V4 select ADK_KERNEL_DNOTIFY diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 1aafdf85f..00c06eb8b 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -42,6 +42,7 @@ config ADK_KERNEL_AGP_INTEL boolean menu "Graphic devices support" +depends on ADK_TARGET_WITH_VGA config ADK_KERNEL_FB_GEODE_LX prompt "................................ Framebuffer support for ALIX boards with VGA" diff --git a/target/linux/config/Config.in.mips b/target/linux/config/Config.in.mips index 0b0d1ea4f..2d9a2e661 100644 --- a/target/linux/config/Config.in.mips +++ b/target/linux/config/Config.in.mips @@ -1,4 +1,5 @@ menu "MIPS devices support" +depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_KERNEL_MIPS_PLATFORM_DEVICES boolean diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 590a466c4..b45e17ccd 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -308,7 +308,7 @@ config ADK_DEBUG_MAC80211 select ADK_KERNEL_DEBUG_FS menu "Wireless card support" -depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB +depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB config ADK_KPACKAGE_KMOD_ATH5K prompt "kmod-ath5k................... Atheros 5xxx wireless cards" @@ -316,8 +316,9 @@ config ADK_KPACKAGE_KMOD_ATH5K select ADK_KERNEL_MAC80211_LEDS select ADK_KERNEL_ATH_COMMON select ADK_KPACKAGE_KMOD_MAC80211 - depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI + depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_FON_FON2100 default n help Driver for Atheros 5xxx/24xx cards. diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 45bf12f37..2f90df20c 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -23,6 +23,7 @@ config ADK_KERNEL_ACPI_DOCK boolean menu "Power Management support" +depends on ADK_TARGET_WITH_ACPI config ADK_HARDWARE_ACPI prompt "Enable ACPI support" diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index d744e45a1..8750ac281 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -34,8 +34,14 @@ config ADK_KERNEL_ARCH_AT91 config ADK_KERNEL_ARCH_AT91SAM9G20 boolean -config ADK_KERNEL_MACH_FOXG20 +config ADK_KERNEL_MACH_ACMENETUSFOXG20 boolean config ADK_KERNEL_AEABI boolean + +config ADK_KERNEL_CPU_BIG_ENDIAN + boolean + +config ADK_KERNEL_CPU_LITTLE_ENDIAN + boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b1375ac05..2be0c4f31 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -30,6 +30,7 @@ config ADK_KPACKAGE_KMOD_USB tristate select ADK_KERNEL_NLS depends on !ADK_KERNEL_USB + #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 @@ -93,12 +94,13 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB - depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832 depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n help The Open Host Controller Interface (OHCI) is a standard for accessing diff --git a/target/linux/patches/2.6.37/atheros.patch b/target/linux/patches/2.6.37/atheros.patch index ee5184a00..d67bf0824 100644 --- a/target/linux/patches/2.6.37/atheros.patch +++ b/target/linux/patches/2.6.37/atheros.patch @@ -1,6 +1,6 @@ diff -Nur linux-2.6.37.orig/arch/mips/Kbuild.platforms linux-2.6.37/arch/mips/Kbuild.platforms --- linux-2.6.37.orig/arch/mips/Kbuild.platforms 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/arch/mips/Kbuild.platforms 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/Kbuild.platforms 2011-05-15 19:24:57.000000000 +0200 @@ -5,6 +5,7 @@ platforms += bcm47xx platforms += bcm63xx @@ -11,7 +11,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/Kbuild.platforms linux-2.6.37/arch/mips/Kb platforms += emma diff -Nur linux-2.6.37.orig/arch/mips/Kconfig linux-2.6.37/arch/mips/Kconfig --- linux-2.6.37.orig/arch/mips/Kconfig 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/arch/mips/Kconfig 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/Kconfig 2011-05-15 19:24:57.000000000 +0200 @@ -102,6 +102,20 @@ help Support for BCM63XX based boards @@ -43,7 +43,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/Kconfig linux-2.6.37/arch/mips/Kconfig source "arch/mips/jazz/Kconfig" diff -Nur linux-2.6.37.orig/arch/mips/ar231x/Kconfig linux-2.6.37/arch/mips/ar231x/Kconfig --- linux-2.6.37.orig/arch/mips/ar231x/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/Kconfig 2011-04-12 08:12:33.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/Kconfig 2011-05-15 19:25:40.000000000 +0200 @@ -0,0 +1,27 @@ +config ATHEROS_AR5312 + bool "Atheros 5312/2312+ support" @@ -71,10 +71,10 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/Kconfig linux-2.6.37/arch/mips/ar23 + select USB_ARCH_HAS_HCD + select USB_ARCH_HAS_OHCI + select USB_ARCH_HAS_EHCI -+ default y ++ default n diff -Nur linux-2.6.37.orig/arch/mips/ar231x/Makefile linux-2.6.37/arch/mips/ar231x/Makefile --- linux-2.6.37.orig/arch/mips/ar231x/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/Makefile 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/Makefile 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,17 @@ +# +# This file is subject to the terms and conditions of the GNU General Public @@ -95,7 +95,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/Makefile linux-2.6.37/arch/mips/ar2 +obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o diff -Nur linux-2.6.37.orig/arch/mips/ar231x/Platform linux-2.6.37/arch/mips/ar231x/Platform --- linux-2.6.37.orig/arch/mips/ar231x/Platform 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/Platform 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/Platform 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,6 @@ +# +# Atheros AR5312/AR2312 WiSoC @@ -105,7 +105,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/Platform linux-2.6.37/arch/mips/ar2 +load-$(CONFIG_ATHEROS_AR231X) += 0xffffffff80041000 diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar2315.c linux-2.6.37/arch/mips/ar231x/ar2315.c --- linux-2.6.37.orig/arch/mips/ar231x/ar2315.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/ar2315.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/ar2315.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,683 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -792,7 +792,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar2315.c linux-2.6.37/arch/mips/ar2 +} diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar2315.h linux-2.6.37/arch/mips/ar231x/ar2315.h --- linux-2.6.37.orig/arch/mips/ar231x/ar2315.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/ar2315.h 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/ar2315.h 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,37 @@ +#ifndef __AR2315_H +#define __AR2315_H @@ -833,7 +833,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar2315.h linux-2.6.37/arch/mips/ar2 +#endif diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar5312.c linux-2.6.37/arch/mips/ar231x/ar5312.c --- linux-2.6.37.orig/arch/mips/ar231x/ar5312.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/ar5312.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/ar5312.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,549 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -1386,7 +1386,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar5312.c linux-2.6.37/arch/mips/ar2 + diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar5312.h linux-2.6.37/arch/mips/ar231x/ar5312.h --- linux-2.6.37.orig/arch/mips/ar231x/ar5312.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/ar5312.h 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/ar5312.h 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,38 @@ +#ifndef __AR5312_H +#define __AR5312_H @@ -1428,7 +1428,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/ar5312.h linux-2.6.37/arch/mips/ar2 +#endif diff -Nur linux-2.6.37.orig/arch/mips/ar231x/board.c linux-2.6.37/arch/mips/ar231x/board.c --- linux-2.6.37.orig/arch/mips/ar231x/board.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/board.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/board.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,251 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -1683,7 +1683,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/board.c linux-2.6.37/arch/mips/ar23 + diff -Nur linux-2.6.37.orig/arch/mips/ar231x/devices.c linux-2.6.37/arch/mips/ar231x/devices.c --- linux-2.6.37.orig/arch/mips/ar231x/devices.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/devices.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/devices.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,175 @@ +#include <linux/kernel.h> +#include <linux/init.h> @@ -1862,7 +1862,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/devices.c linux-2.6.37/arch/mips/ar +device_initcall(ar231x_register_devices); diff -Nur linux-2.6.37.orig/arch/mips/ar231x/devices.h linux-2.6.37/arch/mips/ar231x/devices.h --- linux-2.6.37.orig/arch/mips/ar231x/devices.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/devices.h 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/devices.h 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,37 @@ +#ifndef __AR231X_DEVICES_H +#define __AR231X_DEVICES_H @@ -1903,7 +1903,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/devices.h linux-2.6.37/arch/mips/ar +#endif diff -Nur linux-2.6.37.orig/arch/mips/ar231x/early_printk.c linux-2.6.37/arch/mips/ar231x/early_printk.c --- linux-2.6.37.orig/arch/mips/ar231x/early_printk.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/early_printk.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/early_printk.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,44 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -1951,7 +1951,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/early_printk.c linux-2.6.37/arch/mi + diff -Nur linux-2.6.37.orig/arch/mips/ar231x/pci.c linux-2.6.37/arch/mips/ar231x/pci.c --- linux-2.6.37.orig/arch/mips/ar231x/pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/pci.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/pci.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,230 @@ +/* + * This program is free software; you can redistribute it and/or @@ -2185,7 +2185,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/pci.c linux-2.6.37/arch/mips/ar231x +arch_initcall(ar2315_pci_init); diff -Nur linux-2.6.37.orig/arch/mips/ar231x/prom.c linux-2.6.37/arch/mips/ar231x/prom.c --- linux-2.6.37.orig/arch/mips/ar231x/prom.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/prom.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/prom.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -2226,7 +2226,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/prom.c linux-2.6.37/arch/mips/ar231 +} diff -Nur linux-2.6.37.orig/arch/mips/ar231x/reset.c linux-2.6.37/arch/mips/ar231x/reset.c --- linux-2.6.37.orig/arch/mips/ar231x/reset.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/ar231x/reset.c 2011-04-12 08:12:01.000000000 +0200 ++++ linux-2.6.37/arch/mips/ar231x/reset.c 2011-05-15 19:24:57.000000000 +0200 @@ -0,0 +1,161 @@ +#include <linux/init.h> +#include <linux/module.h> @@ -2391,7 +2391,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/ar231x/reset.c linux-2.6.37/arch/mips/ar23 +module_init(ar231x_init_reset); diff -Nur linux-2.6.37.orig/arch/mips/include/asm/mach-ar231x/ar2315_regs.h linux-2.6.37/arch/mips/include/asm/mach-ar231x/ar2315_regs.h --- linux-2.6.37.orig/arch/mips/include/asm/mach-ar231x/ar2315_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/include/asm/mach-ar231x/ar231 |