summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk6
-rw-r--r--package/bluez/Makefile4
-rw-r--r--package/classpath/Makefile2
-rw-r--r--package/ffmpeg/Makefile2
-rw-r--r--package/libpthread/Makefile2
-rw-r--r--package/pcc-libs/Makefile2
-rw-r--r--package/pcc/Makefile2
-rw-r--r--target/cris/Makefile6
-rw-r--r--target/linux/config/Config.in.block12
-rw-r--r--target/linux/config/Config.in.debug2
-rw-r--r--target/linux/config/Config.in.input2
-rw-r--r--target/linux/config/Config.in.netdevice4
-rw-r--r--target/linux/config/Config.in.usb10
-rw-r--r--target/linux/patches/2.6.37/cris.patch293
14 files changed, 196 insertions, 153 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 29fb0fc9c..2a3bf2d34 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -507,7 +507,7 @@ bulktoolchain:
bulk:
for libc in uclibc eglibc glibc;do \
while read arch; do \
- systems=$$(./scripts/getsystems $$arch); \
+ systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
for system in $$systems;do \
mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
( \
@@ -525,7 +525,7 @@ bulk:
bulkall:
for libc in uclibc eglibc glibc;do \
while read arch; do \
- systems=$$(./scripts/getsystems $$arch); \
+ systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
for system in $$systems;do \
mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
( \
@@ -543,7 +543,7 @@ bulkall:
bulkallmod:
for libc in uclibc eglibc glibc;do \
while read arch; do \
- systems=$$(./scripts/getsystems $$arch); \
+ systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
for system in $$systems;do \
mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
( \
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 883725a29..e359b8f77 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
-PKG_VERSION:= 4.89
+PKG_VERSION:= 4.92
PKG_RELEASE:= 1
-PKG_MD5SUM:= 67fd9ad2852ce01f01b16ddd2336d1ea
+PKG_MD5SUM:= abe5b76df95939f4eb6fa493f4764a95
PKG_DESCR:= bluetooth libraries and applications
PKG_SECTION:= bluetooth
PKG_DEPENDS:= kmod-bt libusb glib dbus
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index 3292232c1..fd5efa109 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -14,6 +14,8 @@ PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf
PKG_URL:= http://www.gnu.org/software/classpath/home.html
PKG_SITES:= ${MASTER_SITE_GNU:=classpath/}
+PKG_ARCH_DEPENDS:= !cris
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index be732ea31..266102769 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= faad2
PKG_URL:= http://www.ffmpeg.org/
PKG_SITES:= http://www.ffmpeg.org/releases/
+PKG_ARCH_DEPENDS:= !cris
+
PKG_SUBPKGS:= FFMPEG FFPLAY
PKGSD_FFPLAY:= ffmpeg based video player
PKGSC_FFPLAY:= multimedia
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index ed0602c86..de0d75403 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -50,7 +50,7 @@ libpthread-dev-install:
ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib
-${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so
- ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib
+ -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib
endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index ec6477779..8d206d0a8 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= lang
PKG_URL:= http://pcc.ludd.ltu.se/
PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
-PKG_ARCH_DEPENDS:= !arm
+PKG_ARCH_DEPENDS:= !arm !cris
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include $(TOPDIR)/mk/package.mk
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 1fd798a74..78dd52bd0 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://pcc.ludd.ltu.se/
PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
PKG_NOPARALLEL:= 1
-PKG_ARCH_DEPENDS:= !arm
+PKG_ARCH_DEPENDS:= !arm !cris
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include $(TOPDIR)/mk/package.mk
diff --git a/target/cris/Makefile b/target/cris/Makefile
index 0c87fb6d7..28e33eda5 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -38,3 +38,9 @@ imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
@echo Do not forget to set network boot jumper, before you start the foxboard
@echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server
endif
+ifeq ($(ADK_TARGET_FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+ @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+ @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
+ @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+endif
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index a6f26dc71..f8673351a 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -273,6 +273,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_MD
tristate
depends on !ADK_KERNEL_BLK_DEV_MD
select ADK_KERNEL_MD
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
help
config ADK_KERNEL_MD_RAID0
@@ -307,6 +309,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
prompt "kmod-dm........................... Device Mapper support"
select ADK_KERNEL_MD
depends on !ADK_KERNEL_BLK_DEV_DM
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
tristate
help
Device-mapper is a low level volume manager. It works by allowing
@@ -319,7 +323,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
config ADK_KPACKAGE_KMOD_DM_CRYPT
prompt "kmod-dm-crypt..................... Crypt target support"
depends on !ADK_KERNEL_DM_CRYPT
- select ADK_KPACKAGE_KMOD_BLK_DEV_DM
+ depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
select ADK_KERNEL_MD
select ADK_KERNEL_CRYPTO
select ADK_KPACKAGE_KMOD_CRYPTO_CBC
@@ -336,14 +340,14 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT
config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
prompt "kmod-dm-snapshot.................. Snapshot target"
- select ADK_KPACKAGE_KMOD_BLK_DEV_DM
+ depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
tristate
help
Allow volume managers to take writable snapshots of a device.
config ADK_KPACKAGE_KMOD_DM_MIRROR
prompt "kmod-dm-mirror.................... Mirror target"
- select ADK_KPACKAGE_KMOD_BLK_DEV_DM
+ depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
tristate
help
Allow volume managers to mirror logical volumes, also
@@ -354,6 +358,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
tristate
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_CONNECTOR
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
help
DRBD - http://www.drbd.org
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 3da69a594..1ab7bba85 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -60,6 +60,8 @@ config ADK_KPACKAGE_KMOD_OPROFILE
prompt "kernel support for oprofile"
tristate
select ADK_KERNEL_PROFILING
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
default n
help
use oprofile package to make use of the kernel support.
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 429c2ad73..3c55fb8dd 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -56,6 +56,8 @@ config ADK_KPACKAGE_KMOD_USB_HID
select ADK_KERNEL_INPUT
select ADK_KERNEL_HID
select ADK_PACKAGE_KMOD_USB_CONTROLLER
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
depends on ADK_TARGET_WITH_USB
default n
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index e734dde8d..590a466c4 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -366,6 +366,8 @@ config ADK_KPACKAGE_KMOD_RTL8187
prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
tristate
depends on ADK_TARGET_WITH_USB
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
default n
help
Driver for Realtek RTL8187/RTL8187B wireless chips.
@@ -380,6 +382,8 @@ config ADK_KPACKAGE_KMOD_P54_USB
select ADK_KPACKAGE_KMOD_MAC80211
select ADK_KPACKAGE_KMOD_CRC_CCITT
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
default n
help
Driver for Prism54 USB adaptors.
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index e7905b531..b1375ac05 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -73,6 +73,8 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
depends on ADK_KPACKAGE_KMOD_USB
depends on !ADK_KERNEL_USB_UHCI_HCD
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_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
@@ -92,6 +94,8 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
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
@@ -112,6 +116,8 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
default n
help
The ISP1160 and ISP1161 chips are USB host controllers. Enable this
@@ -125,6 +131,8 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
default n
help
The SL811HS is a single-port USB controller that supports either
@@ -139,6 +147,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on !ADK_KERNEL_USB_EHCI_HCD
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+ depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
depends on ADK_KPACKAGE_KMOD_USB
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
diff --git a/target/linux/patches/2.6.37/cris.patch b/target/linux/patches/2.6.37/cris.patch
index 6be88fc18..7f692ed30 100644
--- a/target/linux/patches/2.6.37/cris.patch
+++ b/target/linux/patches/2.6.37/cris.patch
@@ -1,68 +1,6 @@
-diff -Nur linux-2.6.36.orig/arch/cris/Kconfig linux-2.6.36/arch/cris/Kconfig
---- linux-2.6.36.orig/arch/cris/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Kconfig 2010-12-28 20:35:16.000000000 +0100
-@@ -177,6 +177,12 @@
- help
- Size of DRAM (decimal in MB) typically 2, 8 or 16.
-
-+config ETRAX_MTD_SIZE
-+ hex "MTD size (hex)"
-+ default "0x00800000"
-+ help
-+ Size of MTD device typically 4 or 8 MB.
-+
- config ETRAX_VMEM_SIZE
- int "Video memory size (dec, in MB)"
- depends on ETRAX_ARCH_V32 && !ETRAXFS
-@@ -282,7 +288,7 @@
- select MTD_CFI_AMDSTD
- select MTD_JEDECPROBE if ETRAX_ARCH_V32
- select MTD_CHAR
-- select MTD_BLOCK
-+ select MTD_BLOCK_RO
- select MTD_PARTITIONS
- select MTD_CONCAT
- select MTD_COMPLEX_MAPPINGS
-@@ -671,6 +677,11 @@
-
- source "drivers/ide/Kconfig"
-
-+#mysteriously part of this standard linux driver was removed from cris build! - info@crisos.org
-+source "drivers/scsi/Kconfig"
-+
-+source "drivers/media/Kconfig"
-+
- source "drivers/net/Kconfig"
-
- source "drivers/i2c/Kconfig"
-@@ -686,6 +697,8 @@
-
- source "fs/Kconfig"
-
-+source "sound/Kconfig"
-+
- source "drivers/usb/Kconfig"
-
- source "drivers/uwb/Kconfig"
-diff -Nur linux-2.6.36.orig/arch/cris/Makefile linux-2.6.36/arch/cris/Makefile
---- linux-2.6.36.orig/arch/cris/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Makefile 2010-12-28 20:35:00.000000000 +0100
-@@ -40,10 +40,10 @@
-
- LD = $(CROSS_COMPILE)ld -mcrislinux
-
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
-
- KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
--KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
-+KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -fno-peephole2 $(inc)
- KBUILD_CPPFLAGS += $(inc)
-
- ifdef CONFIG_FRAME_POINTER
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.37/arch/cris/arch-v10/drivers/axisflashmap.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/drivers/axisflashmap.c 2011-04-27 12:05:31.277662574 +0200
@@ -113,7 +113,7 @@
/* If no partition-table was found, we use this default-set. */
@@ -208,18 +146,18 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.
return err;
}
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.37/arch/cris/arch-v10/drivers/ds1302.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/drivers/ds1302.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/drivers/ds1302.c 2011-04-27 12:05:31.337661896 +0200
@@ -22,6 +22,7 @@
- #include <linux/smp_lock.h>
+ #include <linux/mutex.h>
#include <linux/bcd.h>
#include <linux/capability.h>
+#include <linux/device.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-@@ -499,6 +500,10 @@
+@@ -501,6 +502,10 @@
return 0;
}
@@ -230,7 +168,7 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arc
static int __init ds1302_register(void)
{
ds1302_init();
-@@ -507,6 +512,12 @@
+@@ -509,6 +514,12 @@
ds1302_name, RTC_MAJOR_NR);
return -1;
}
@@ -243,9 +181,9 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arc
return 0;
}
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.37/arch/cris/arch-v10/drivers/gpio.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/drivers/gpio.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/drivers/gpio.c 2011-04-27 12:05:31.377662210 +0200
@@ -20,6 +20,7 @@
#include <linux/poll.h>
#include <linux/init.h>
@@ -254,7 +192,7 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/
#include <asm/etraxgpio.h>
#include <arch/svinto.h>
-@@ -797,6 +798,10 @@
+@@ -798,6 +799,10 @@
/* main driver initialization routine, called from mem.c */
@@ -265,7 +203,7 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/
static int __init gpio_init(void)
{
int res;
-@@ -810,6 +815,13 @@
+@@ -811,6 +816,13 @@
return res;
}
@@ -279,18 +217,18 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/
/* Clear all leds */
#if defined (CONFIG_ETRAX_CSP0_LEDS) || defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
CRIS_LED_NETWORK_SET(0);
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S
---- linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.37/arch/cris/arch-v10/lib/hw_settings.S
+--- linux-2.6.37.orig/arch/cris/arch-v10/lib/hw_settings.S 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/lib/hw_settings.S 2011-04-27 12:05:31.417662330 +0200
@@ -58,3 +58,5 @@
.dword R_PORT_PB_SET
.dword PB_SET_VALUE
.dword 0 ; No more register values
+ .ascii "ACME_PART_MAGIC"
+ .dword 0xdeadc0de
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c linux-2.6.36/arch/cris/arch-v10/mm/init.c
---- linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/mm/init.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/mm/init.c linux-2.6.37/arch/cris/arch-v10/mm/init.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/mm/init.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/mm/init.c 2011-04-27 12:23:55.347672203 +0200
@@ -184,6 +184,9 @@
free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
@@ -301,9 +239,21 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c linux-2.6.36/arch/cris/
/* Initialize remaps of some I/O-ports. It is important that this
* is called before any driver is initialized.
-diff -Nur linux-2.6.36.orig/arch/cris/boot/Makefile linux-2.6.36/arch/cris/boot/Makefile
---- linux-2.6.36.orig/arch/cris/boot/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/Makefile 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/boot/compressed/Makefile linux-2.6.37/arch/cris/boot/compressed/Makefile
+--- linux-2.6.37.orig/arch/cris/boot/compressed/Makefile 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/boot/compressed/Makefile 2011-04-27 12:05:31.567661802 +0200
+@@ -18,7 +18,7 @@
+ OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
+ OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
+ OBJECTS= $(OBJECTS-y) $(obj)/misc.o
+-OBJCOPYFLAGS = -O binary --remove-section=.bss
++#OBJCOPYFLAGS = -O binary --remove-section=.bss
+
+ quiet_cmd_image = BUILD $@
+ cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
+diff -Nur linux-2.6.37.orig/arch/cris/boot/Makefile linux-2.6.37/arch/cris/boot/Makefile
+--- linux-2.6.37.orig/arch/cris/boot/Makefile 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/boot/Makefile 2011-04-27 12:05:31.527662141 +0200
@@ -5,7 +5,7 @@
objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss --remove-section=.note.gnu.build-id
@@ -321,22 +271,80 @@ diff -Nur linux-2.6.36.orig/arch/cris/boot/Makefile linux-2.6.36/arch/cris/boot/
$(obj)/zImage: $(obj)/compressed/vmlinux
@cp $< $@
-diff -Nur linux-2.6.36.orig/arch/cris/boot/compressed/Makefile linux-2.6.36/arch/cris/boot/compressed/Makefile
---- linux-2.6.36.orig/arch/cris/boot/compressed/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/compressed/Makefile 2010-12-28 20:35:00.000000000 +0100
-@@ -18,7 +18,7 @@
- OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS= $(OBJECTS-y) $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
+diff -Nur linux-2.6.37.orig/arch/cris/Kconfig linux-2.6.37/arch/cris/Kconfig
+--- linux-2.6.37.orig/arch/cris/Kconfig 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/Kconfig 2011-04-27 12:05:31.187667361 +0200
+@@ -170,6 +170,12 @@
+ help
+ Size of DRAM (decimal in MB) typically 2, 8 or 16.
- quiet_cmd_image = BUILD $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -Nur linux-2.6.36.orig/arch/cris/mm/init.c linux-2.6.36/arch/cris/mm/init.c
---- linux-2.6.36.orig/arch/cris/mm/init.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/mm/init.c 2010-12-28 20:35:11.000000000 +0100
-@@ -81,3 +81,10 @@
++config ETRAX_MTD_SIZE
++ hex "MTD size (hex)"
++ default "0x00800000"
++ help
++ Size of MTD device typically 4 or 8 MB.
++
+ config ETRAX_VMEM_SIZE
+ int "Video memory size (dec, in MB)"
+ depends on ETRAX_ARCH_V32 && !ETRAXFS
+@@ -275,7 +281,7 @@
+ select MTD_CFI_AMDSTD
+ select MTD_JEDECPROBE if ETRAX_ARCH_V32
+ select MTD_CHAR
+- select MTD_BLOCK
++ select MTD_BLOCK_RO
+ select MTD_PARTITIONS
+ select MTD_CONCAT
+ select MTD_COMPLEX_MAPPINGS
+@@ -664,6 +670,11 @@
+
+ source "drivers/ide/Kconfig"
+
++#mysteriously part of this standard linux driver was removed from cris build! - info@crisos.org
++source "drivers/scsi/Kconfig"
++
++source "drivers/media/Kconfig"
++
+ source "drivers/net/Kconfig"
+
+ source "drivers/i2c/Kconfig"
+@@ -679,6 +690,8 @@
+
+ source "fs/Kconfig"
+
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+
+ source "drivers/uwb/Kconfig"
+diff -Nur linux-2.6.37.orig/arch/cris/Makefile linux-2.6.37/arch/cris/Makefile
+--- linux-2.6.37.orig/arch/cris/Makefile 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/Makefile 2011-04-27 12:05:31.217662105 +0200
+@@ -40,10 +40,10 @@
+
+ LD = $(CROSS_COMPILE)ld -mcrislinux
+
+-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
++OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
+
+ KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
+-KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
++KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -fno-peephole2 $(inc)
+ KBUILD_CPPFLAGS += $(inc)
+
+ ifdef CONFIG_FRAME_POINTER
+diff -Nur linux-2.6.37.orig/arch/cris/mm/init.c linux-2.6.37/arch/cris/mm/init.c
+--- linux-2.6.37.orig/arch/cris/mm/init.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/mm/init.c 2011-04-27 12:23:46.628914539 +0200
+@@ -16,6 +16,7 @@
+ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+
+ unsigned long empty_zero_page;
++EXPORT_SYMBOL(empty_zero_page);
+
+ extern char _stext, _edata, _etext; /* From linkerscript */
+ extern char __init_begin, __init_end;
+@@ -81,3 +82,10 @@
printk (KERN_INFO "Freeing unused kernel memory: %luk freed\n",
(unsigned long)((&__init_end - &__init_begin) >> 10));
}
@@ -347,9 +355,9 @@ diff -Nur linux-2.6.36.orig/arch/cris/mm/init.c linux-2.6.36/arch/cris/mm/init.c
+ return 0;
+}
+#endif
-diff -Nur linux-2.6.36.orig/drivers/net/cris/eth_v10.c linux-2.6.36/drivers/net/cris/eth_v10.c
---- linux-2.6.36.orig/drivers/net/cris/eth_v10.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/net/cris/eth_v10.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/net/cris/eth_v10.c linux-2.6.37/drivers/net/cris/eth_v10.c
+--- linux-2.6.37.orig/drivers/net/cris/eth_v10.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/net/cris/eth_v10.c 2011-04-27 12:05:31.647661894 +0200
@@ -1718,7 +1718,7 @@
static void
e100_netpoll(struct net_device* netdev)
@@ -359,9 +367,9 @@ diff -Nur linux-2.6.36.orig/drivers/net/cris/eth_v10.c linux-2.6.36/drivers/net/
}
#endif
-diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial/crisv10.c
---- linux-2.6.36.orig/drivers/serial/crisv10.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/serial/crisv10.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/serial/crisv10.c linux-2.6.37/drivers/serial/crisv10.c
+--- linux-2.6.37.orig/drivers/serial/crisv10.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/serial/crisv10.c 2011-04-27 12:05:31.657662263 +0200
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/signal.h>
@@ -370,7 +378,7 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/tty.h>
-@@ -27,6 +28,7 @@
+@@ -26,6 +27,7 @@
#include <linux/kernel.h>
#include <linux/mutex.h>
#include <linux/bitops.h>
@@ -378,7 +386,7 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
#include <linux/seq_file.h>
#include <linux/delay.h>
#include <linux/module.h>
-@@ -4426,6 +4428,7 @@
+@@ -4431,6 +4433,7 @@
#endif
};
@@ -386,7 +394,7 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
static int __init rs_init(void)
{
int i;
-@@ -4559,6 +4562,24 @@
+@@ -4565,6 +4568,24 @@
#endif
#endif /* CONFIG_SVINTO_SIM */
@@ -411,30 +419,9 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
return 0;
}
-diff -Nur linux-2.6.36.orig/drivers/usb/Makefile linux-2.6.36/drivers/usb/Makefile
---- linux-2.6.36.orig/drivers/usb/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/Makefile 2010-12-28 20:35:00.000000000 +0100
-@@ -21,6 +21,7 @@
- obj-$(CONFIG_USB_R8A66597_HCD) += host/
- obj-$(CONFIG_USB_HWA_HCD) += host/
- obj-$(CONFIG_USB_ISP1760_HCD) += host/
-+obj-$(CONFIG_ETRAX_USB_HOST) += host/
- obj-$(CONFIG_USB_IMX21_HCD) += host/
-
- obj-$(CONFIG_USB_C67X00_HCD) += c67x00/
-diff -Nur linux-2.6.36.orig/drivers/usb/host/Makefile linux-2.6.36/drivers/usb/host/Makefile
---- linux-2.6.36.orig/drivers/usb/host/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/host/Makefile 2010-12-28 20:35:00.000000000 +0100
-@@ -32,5 +32,6 @@
- obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
- obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
- obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
-+obj-$(CONFIG_ETRAX_USB_HOST) += hc-crisv10.o
- obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
-
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.36/drivers/usb/host/hc-cris-dbg.h
---- linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-cris-dbg.h 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.37/drivers/usb/host/hc-cris-dbg.h
+--- linux-2.6.37.orig/drivers/usb/host/hc-cris-dbg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/hc-cris-dbg.h 2011-04-27 12:05:31.847661851 +0200
@@ -0,0 +1,146 @@
+
+/* macros for debug output */
@@ -582,9 +569,9 @@ diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.36/drivers/
+ }; \
+ s; \
+ })
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c linux-2.6.36/drivers/usb/host/hc-crisv10.c
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/hc-crisv10.c linux-2.6.37/drivers/usb/host/hc-crisv10.c
+--- linux-2.6.37.orig/drivers/usb/host/hc-crisv10.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/hc-crisv10.c 2011-04-27 12:05:31.867662137 +0200
@@ -0,0 +1,4801 @@
+/*
+ *
@@ -5387,9 +5374,9 @@ diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c linux-2.6.36/drivers/u
+/* Module hooks */
+module_init(module_hcd_init);
+module_exit(module_hcd_exit);
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h linux-2.6.36/drivers/usb/host/hc-crisv10.h
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.h 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/hc-crisv10.h linux-2.6.37/drivers/usb/host/hc-crisv10.h
+--- linux-2.6.37.orig/drivers/usb/host/hc-crisv10.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/hc-crisv10.h 2011-04-27 12:05:31.917663433 +0200
@@ -0,0 +1,331 @@
+#ifndef __LINUX_ETRAX_USB_H
+#define __LINUX_ETRAX_USB_H
@@ -5722,9 +5709,31 @@ diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h linux-2.6.36/drivers/u
+#define USB_SB_command__full__yes 1
+
+#endif
-diff -Nur linux-2.6.36.orig/lib/klist.c linux-2.6.36/lib/klist.c
---- linux-2.6.36.orig/lib/klist.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/lib/klist.c 2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/Makefile linux-2.6.37/drivers/usb/host/Makefile
+--- linux-2.6.37.orig/drivers/usb/host/Makefile 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/Makefile 2011-04-27 12:05:31.787668204 +0200
+@@ -32,6 +32,7 @@
+ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
+ obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
+ obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
++obj-$(CONFIG_ETRAX_USB_HOST) += hc-crisv10.o
+ obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
+ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
+ obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
+diff -Nur linux-2.6.37.orig/drivers/usb/Makefile linux-2.6.37/drivers/usb/Makefile
+--- linux-2.6.37.orig/drivers/usb/Makefile 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/usb/Makefile 2011-04-27 12:05:31.717665249 +0200
+@@ -21,6 +21,7 @@
+ obj-$(CONFIG_USB_R8A66597_HCD) += host/
+ obj-$(CONFIG_USB_HWA_HCD) += host/
+ obj-$(CONFIG_USB_ISP1760_HCD) += host/
++obj-$(CONFIG_ETRAX_USB_HOST) += host/
+ obj-$(CONFIG_USB_IMX21_HCD) += host/
+
+ obj-$(CONFIG_USB_C67X00_HCD) += c67x00/
+diff -Nur linux-2.6.37.orig/lib/klist.c linux-2.6.37/lib/klist.c
+--- linux-2.6.37.orig/lib/klist.c 2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/lib/klist.c 2011-04-27 12:05:31.967661872 +0200
@@ -60,7 +60,7 @@
{
knode->n_klist = klist;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:56:22 +0000