diff options
61 files changed, 7730 insertions, 12042 deletions
diff --git a/mk/image.mk b/mk/image.mk index 04fae43bf..53b01d0c2 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -70,6 +70,8 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR} cpio -R 0:0 -oC512 -Mdist -Hnewc | ${ADK_COMPRESSION_TOOL} >$@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} + $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \ + $(LINUX_DIR)/.config cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \ cpio -R 0:0 -oC512 -Mdist -Hnewc >$@ @@ -81,5 +83,13 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} +createinitramfs: + @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) + echo N | \ + $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH=$(ARCH) CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) + $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH=$(ARCH) CC="$(TARGET_CC)" $(MAKE_TRACE) + imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile new file mode 100644 index 000000000..76d23d7bf --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_apps_Makefile @@ -0,0 +1,15 @@ +--- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-05-25 17:38:03.594714854 +0200 +@@ -26,10 +26,10 @@ INCLUDES = -I. + .SUFFIXES: .c + + .c: +- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ ++ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ + + .c.o: +- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ ++ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ + + + ##### TARGETS ##### diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile index 778b74f0b..4d8d57f12 100644 --- a/package/libXxf86vm/Makefile +++ b/package/libXxf86vm/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 52b49483eccbdd1566b8c560fe7f76e8 PKG_DESCR:= add short description PKG_SECTION:= libs -PKG_BUILDDEP+= xf86vidmodeproto +PKG_BUILDDEP+= xf86vidmodeproto libXext PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk diff --git a/target/Config.in b/target/Config.in index c5927e1a7..e8d0d0cf4 100644 --- a/target/Config.in +++ b/target/Config.in @@ -172,6 +172,7 @@ config ADK_TARGET default "qemu-arm" if ADK_arm_qemu default "qemu-cris" if ADK_cris_qemu default "qemu-mips" if ADK_mips_qemu + default "qemu-mips64" if ADK_mips64_qemu default "qemu-mipsel" if ADK_mipsel_qemu default "qemu-x86" if ADK_x86_qemu default "qemu-x86_64" if ADK_x86_64_qemu @@ -253,6 +254,7 @@ config ADK_LINUX_CRIS_FOXBOARD select ADK_PACKAGE_KMOD_USB_CONTROLLER select ADK_KERNEL_USB select ADK_KERNEL_NLS + select ADK_KERNEL_NETDEVICES select ADK_TARGET_WITH_USB help Support for Foxboard targets. @@ -263,6 +265,7 @@ config ADK_LINUX_MIPS64_LEMOTE bool "Lemote Subnotebook Yeeloong" select ADK_lemote select ADK_LINUX_64 + select ADK_KERNEL_USB select ADK_KERNEL_EXT2_FS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -610,6 +613,7 @@ depends on ADK_LINUX_ALIX config ADK_LINUX_X86_ALIX1C bool "PC Engines Alix1C" select ADK_alix1c + select ADK_KERNEL_USB select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD @@ -1006,7 +1010,7 @@ endchoice choice prompt "Compression method for Kernel" - depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK || ADK_TOOLCHAIN_ONLY) + depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK || ADK_TOOLCHAIN_ONLY || ADK_LINUX_ARM_FOXG20 || ADK_LINUX_ARM_QEMU ) config ADK_TARGET_KERNEL_COMPRESSION_LZMA boolean diff --git a/target/ag241/patches/ar7.patch b/target/ag241/patches/ar7.patch index 7fe9f03c0..dcaaa2ec7 100644 --- a/target/ag241/patches/ar7.patch +++ b/target/ag241/patches/ar7.patch @@ -1,29 +1,8 @@ -diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/platform.c linux-2.6.33.1/arch/mips/ar7/platform.c ---- linux-2.6.33.1.orig/arch/mips/ar7/platform.c 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/arch/mips/ar7/platform.c 2010-03-28 19:26:53.000000000 +0200 -@@ -509,7 +509,7 @@ - - memset(uart_port, 0, sizeof(struct uart_port) * 2); - -- uart_port[0].type = PORT_16550A; -+ uart_port[0].type = PORT_AR7; - uart_port[0].line = 0; - uart_port[0].irq = AR7_IRQ_UART0; - uart_port[0].uartclk = ar7_bus_freq() / 2; -@@ -524,7 +524,7 @@ - - /* Only TNETD73xx have a second serial port */ - if (ar7_has_second_uart()) { -- uart_port[1].type = PORT_16550A; -+ uart_port[1].type = PORT_AR7; - uart_port[1].line = 1; - uart_port[1].irq = AR7_IRQ_UART1; - uart_port[1].uartclk = ar7_bus_freq() / 2; -diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/prom.c linux-2.6.33.1/arch/mips/ar7/prom.c ---- linux-2.6.33.1.orig/arch/mips/ar7/prom.c 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/arch/mips/ar7/prom.c 2010-03-28 19:26:53.000000000 +0200 -@@ -219,6 +219,14 @@ - if (strstr(prom_getcmdline(), "console=")) +diff -Nur linux-2.6.34.orig/arch/mips/ar7/prom.c linux-2.6.34/arch/mips/ar7/prom.c +--- linux-2.6.34.orig/arch/mips/ar7/prom.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/mips/ar7/prom.c 2010-05-28 15:52:26.960965976 +0200 +@@ -206,6 +206,14 @@ + if (strstr(arcs_cmdline, "console=")) return; +#ifdef CONFIG_KGDB @@ -37,26 +16,9 @@ diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/prom.c linux-2.6.33.1/arch/mips/ar7/ s = prom_getenv("modetty0"); if (s) { baud = simple_strtoul(s, &p, 10); -diff -Nur linux-2.6.33.1.orig/arch/mips/include/asm/page.h linux-2.6.33.1/arch/mips/include/asm/page.h ---- linux-2.6.33.1.orig/arch/mips/include/asm/page.h 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/arch/mips/include/asm/page.h 2010-03-28 19:26:53.000000000 +0200 -@@ -200,8 +200,11 @@ - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - --#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE) --#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET) -+#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \ -+ PHYS_OFFSET) -+#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \ -+ PHYS_OFFSET) -+ - - #include <asm-generic/memory_model.h> - #include <asm-generic/getorder.h> -diff -Nur linux-2.6.33.1.orig/arch/mips/Kconfig linux-2.6.33.1/arch/mips/Kconfig ---- linux-2.6.33.1.orig/arch/mips/Kconfig 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/arch/mips/Kconfig 2010-03-28 19:26:53.000000000 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/Kconfig linux-2.6.34/arch/mips/Kconfig +--- linux-2.6.34.orig/arch/mips/Kconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/mips/Kconfig 2010-05-28 15:52:27.142223192 +0200 @@ -34,7 +34,6 @@ select CEVT_R4K select CSRC_R4K @@ -65,38 +27,9 @@ diff -Nur linux-2.6.33.1.orig/arch/mips/Kconfig linux-2.6.33.1/arch/mips/Kconfig select SWAP_IO_SPACE select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_EARLY_PRINTK -diff -Nur linux-2.6.33.1.orig/arch/mips/kernel/traps.c linux-2.6.33.1/arch/mips/kernel/traps.c ---- linux-2.6.33.1.orig/arch/mips/kernel/traps.c 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/arch/mips/kernel/traps.c 2010-03-28 19:26:53.000000000 +0200 -@@ -1283,9 +1283,22 @@ - - exception_handlers[n] = handler; - if (n == 0 && cpu_has_divec) { -- *(u32 *)(ebase + 0x200) = 0x08000000 | -- (0x03ffffff & (handler >> 2)); -- local_flush_icache_range(ebase + 0x200, ebase + 0x204); -+ if ((handler ^ (ebase + 4)) & 0xfc000000) { -+ /* lui k0, 0x0000 */ -+ *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16); -+ /* ori k0, 0x0000 */ -+ *(u32 *)(ebase + 0x204) = -+ 0x375a0000 | (handler & 0xffff); -+ /* jr k0 */ -+ *(u32 *)(ebase + 0x208) = 0x03400008; -+ /* nop */ -+ *(u32 *)(ebase + 0x20C) = 0x00000000; -+ flush_icache_range(ebase + 0x200, ebase + 0x210); -+ } else { -+ *(u32 *)(ebase + 0x200) = -+ 0x08000000 | (0x03ffffff & (handler >> 2)); -+ flush_icache_range(ebase + 0x200, ebase + 0x204); -+ } - } - return (void *)old_handler; - } -diff -Nur linux-2.6.33.1.orig/drivers/mtd/ar7part.c linux-2.6.33.1/drivers/mtd/ar7part.c ---- linux-2.6.33.1.orig/drivers/mtd/ar7part.c 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/drivers/mtd/ar7part.c 2010-03-28 19:26:53.000000000 +0200 +diff -Nur linux-2.6.34.orig/drivers/mtd/ar7part.c linux-2.6.34/drivers/mtd/ar7part.c +--- linux-2.6.34.orig/drivers/mtd/ar7part.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/drivers/mtd/ar7part.c 2010-05-28 15:52:27.232223555 +0200 @@ -28,7 +28,7 @@ #include <linux/bootmem.h> #include <linux/magic.h> @@ -128,9 +61,9 @@ diff -Nur linux-2.6.33.1.orig/drivers/mtd/ar7part.c linux-2.6.33.1/drivers/mtd/a *pparts = ar7_parts; return AR7_PARTS; } -diff -Nur linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c linux-2.6.33.1/drivers/mtd/maps/physmap.c ---- linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/drivers/mtd/maps/physmap.c 2010-03-28 19:26:53.000000000 +0200 +diff -Nur linux-2.6.34.orig/drivers/mtd/maps/physmap.c linux-2.6.34/drivers/mtd/maps/physmap.c +--- linux-2.6.34.orig/drivers/mtd/maps/physmap.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/drivers/mtd/maps/physmap.c 2010-05-28 15:52:27.281073432 +0200 @@ -79,7 +79,7 @@ "map_rom", NULL }; @@ -140,10 +73,10 @@ diff -Nur linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c linux-2.6.33.1/drivers/ #endif static int physmap_flash_probe(struct platform_device *dev) -diff -Nur linux-2.6.33.1.orig/drivers/serial/8250.c linux-2.6.33.1/drivers/serial/8250.c ---- linux-2.6.33.1.orig/drivers/serial/8250.c 2010-03-15 17:09:39.000000000 +0100 -+++ linux-2.6.33.1/drivers/serial/8250.c 2010-03-28 19:26:53.000000000 +0200 -@@ -2715,7 +2715,11 @@ +diff -Nur linux-2.6.34.orig/drivers/serial/8250.c linux-2.6.34/drivers/serial/8250.c +--- linux-2.6.34.orig/drivers/serial/8250.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/drivers/serial/8250.c 2010-05-28 15:52:27.330968429 +0200 +@@ -2746,7 +2746,11 @@ { struct uart_8250_port *up = (struct uart_8250_port *)port; diff --git a/target/ag241/target.mk b/target/ag241/target.mk index 3bb051ea2..90a85803e 100644 --- a/target/ag241/target.mk +++ b/target/ag241/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mipsel -KERNEL_VERSION:= 2.6.33.1 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 73b514ec918b88a45656be191b1ee226 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=mips32 diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index da95587ed..5a737fd8a 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -7,8 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage + kernel-install: - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk + @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -19,11 +21,9 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix1c/target.mk b/target/alix1c/target.mk index d5ee60a53..3c08f3902 100644 --- a/target/alix1c/target.mk +++ b/target/alix1c/target.mk @@ -1,7 +1,7 @@ ARCH:= x86 CPU_ARCH:= i586 -KERNEL_VERSION:= 2.6.33 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=geode diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile index 932c81109..cd4964c24 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -7,8 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage + kernel-install: - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk + @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -19,8 +21,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}' diff --git a/target/alix2d/target.mk b/target/alix2d/target.mk index d5ee60a53..3c08f3902 100644 --- a/target/alix2d/target.mk +++ b/target/alix2d/target.mk @@ -1,7 +1,7 @@ ARCH:= x86 CPU_ARCH:= i586 -KERNEL_VERSION:= 2.6.33 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=geode diff --git a/target/alix2d13/Makefile b/target/alix2d13/Makefile index da95587ed..5a737fd8a 100644 --- a/target/alix2d13/Makefile +++ b/target/alix2d13/Makefile @@ -7,8 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage + kernel-install: - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk + @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -19,11 +21,9 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d13/target.mk b/target/alix2d13/target.mk index d5ee60a53..3c08f3902 100644 --- a/target/alix2d13/target.mk +++ b/target/alix2d13/target.mk @@ -1,7 +1,7 @@ ARCH:= x86 CPU_ARCH:= i586 -KERNEL_VERSION:= 2.6.33 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=geode diff --git a/target/bulkdef.lst b/target/bulkdef.lst index 134956742..222bd7606 100644 --- a/target/bulkdef.lst +++ b/target/bulkdef.lst @@ -22,9 +22,15 @@ rb532 glibc ext2-block alix1c uclibc nfsroot alix1c eglibc nfsroot alix1c glibc nfsroot +alix1c uclibc ext2-block +alix1c eglibc ext2-block +alix1c glibc ext2-block wrap uclibc nfsroot wrap eglibc nfsroot wrap glibc nfsroot +wrap uclibc ext2-block +wrap eglibc ext2-block +wrap glibc ext2-block arm_qemu uclibc archive arm_qemu eglibc archive arm_qemu glibc archive @@ -37,14 +43,31 @@ mipsel_qemu glibc archive x86_qemu uclibc archive x86_qemu eglibc archive x86_qemu glibc archive +x86_qemu uclibc initramfs +x86_qemu eglibc initramfs +x86_qemu glibc initramfs x86_64_qemu uclibc archive x86_64_qemu eglibc archive x86_64_qemu glibc archive +x86_64_qemu uclibc initramfs +x86_64_qemu eglibc initramfs +x86_64_qemu glibc initramfs lemote eglibc archive lemote glibc archive +lemote eglibc initramfs +lemote glibc initramfs +lemote eglibc initramfs-piggyback +lemote glibc initramfs-piggyback ibmx40 uclibc archive ibmx40 eglibc archive ibmx40 glibc archive +ibmx40 uclibc initramfs +ibmx40 eglibc initramfs +ibmx40 glibc initramfs +ibmx40 uclibc initramfs-piggyback +ibmx40 eglibc initramfs-piggyback +ibmx40 glibc initramfs-piggyback shuttle uclibc archive shuttle eglibc archive shuttle glibc archive + diff --git a/target/foxboard/patches/cris.patch b/target/foxboard/patches/cris.patch index 3c6bca534..1a4e109e5 100644 --- a/target/foxboard/patches/cris.patch +++ b/target/foxboard/patches/cris.patch @@ -1,6 +1,6 @@ -diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.32/arch/cris/arch-v10/drivers/axisflashmap.c ---- linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/arch/cris/arch-v10/drivers/axisflashmap.c 2010-01-10 14:34:37.376309632 +0100 +diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.34/arch/cris/arch-v10/drivers/axisflashmap.c +--- linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/cris/arch-v10/drivers/axisflashmap.c 2010-05-25 19:41:49.324723145 +0200 @@ -113,7 +113,7 @@ /* If no partition-table was found, we use this default-set. */ @@ -146,9 +146,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6. return err; } -diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.32/arch/cris/arch-v10/drivers/ds1302.c ---- linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/arch/cris/arch-v10/drivers/ds1302.c 2010-01-10 13:41:59.256309588 +0100 +diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.34/arch/cris/arch-v10/drivers/ds1302.c +--- linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/cris/arch-v10/drivers/ds1302.c 2010-05-25 19:41:49.361720375 +0200 @@ -21,6 +21,7 @@ #include <linux/delay.h> #include <linux/bcd.h> @@ -181,9 +181,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.32/arc return 0; } -diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.32/arch/cris/arch-v10/drivers/gpio.c ---- linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/arch/cris/arch-v10/drivers/gpio.c 201 |