From 92dd4fee15cb7c33868c7d7213f82136955397b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 May 2010 14:29:22 +0200 Subject: upgrade all targets to Linux 2.6.34 --- target/foxg20/patches/foxg20.patch | 75 ++++++++++++++------------------------ target/foxg20/target.mk | 4 +- 2 files changed, 29 insertions(+), 50 deletions(-) (limited to 'target/foxg20') diff --git a/target/foxg20/patches/foxg20.patch b/target/foxg20/patches/foxg20.patch index 1f628574e..d564c71fb 100644 --- a/target/foxg20/patches/foxg20.patch +++ b/target/foxg20/patches/foxg20.patch @@ -1,6 +1,6 @@ -diff -Nur linux-2.6.33.orig/arch/arm/include/asm/setup.h linux-2.6.33/arch/arm/include/asm/setup.h ---- linux-2.6.33.orig/arch/arm/include/asm/setup.h 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/arm/include/asm/setup.h 2010-02-27 19:32:30.150085477 +0100 +diff -Nur linux-2.6.34.orig/arch/arm/include/asm/setup.h linux-2.6.34/arch/arm/include/asm/setup.h +--- linux-2.6.34.orig/arch/arm/include/asm/setup.h 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/arm/include/asm/setup.h 2010-05-25 20:26:06.083473207 +0200 @@ -18,6 +18,8 @@ #define COMMAND_LINE_SIZE 1024 @@ -10,22 +10,22 @@ diff -Nur linux-2.6.33.orig/arch/arm/include/asm/setup.h linux-2.6.33/arch/arm/i /* The list ends with an ATAG_NONE node. */ #define ATAG_NONE 0x00000000 -diff -Nur linux-2.6.33.orig/arch/arm/Kconfig linux-2.6.33/arch/arm/Kconfig ---- linux-2.6.33.orig/arch/arm/Kconfig 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/arm/Kconfig 2010-02-27 20:23:52.139866005 +0100 -@@ -19,6 +19,8 @@ +diff -Nur linux-2.6.34.orig/arch/arm/Kconfig linux-2.6.34/arch/arm/Kconfig +--- linux-2.6.34.orig/arch/arm/Kconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/arm/Kconfig 2010-05-25 20:26:06.103473096 +0200 +@@ -20,6 +20,8 @@ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) select HAVE_GENERIC_DMA_COHERENT select HAVE_KERNEL_GZIP + select HAVE_KERNEL_BZIP2 + select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZO - help - The ARM series is a line of low-power-consumption RISC chip designs -diff -Nur linux-2.6.33.orig/arch/arm/kernel/setup.c linux-2.6.33/arch/arm/kernel/setup.c ---- linux-2.6.33.orig/arch/arm/kernel/setup.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/arm/kernel/setup.c 2010-02-27 19:32:30.212085837 +0100 -@@ -807,8 +807,12 @@ + select HAVE_PERF_EVENTS + select PERF_USE_VMALLOC +diff -Nur linux-2.6.34.orig/arch/arm/kernel/setup.c linux-2.6.34/arch/arm/kernel/setup.c +--- linux-2.6.34.orig/arch/arm/kernel/setup.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/arm/kernel/setup.c 2010-05-25 20:26:06.150978830 +0200 +@@ -790,8 +790,12 @@ static int c_show(struct seq_file *m, void *v) { @@ -38,9 +38,9 @@ diff -Nur linux-2.6.33.orig/arch/arm/kernel/setup.c linux-2.6.33/arch/arm/kernel seq_printf(m, "Processor\t: %s rev %d (%s)\n", cpu_name, read_cpuid_id() & 15, elf_platform); -diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c ---- linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-27 19:32:30.233294964 +0100 +diff -Nur linux-2.6.34.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.34/arch/arm/mach-at91/at91sam9260_devices.c +--- linux-2.6.34.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/arm/mach-at91/at91sam9260_devices.c 2010-05-25 20:26:06.190979002 +0200 @@ -454,7 +454,15 @@ .sda_is_open_drain = 1, .scl_pin = AT91_PIN_PA24, @@ -57,9 +57,9 @@ diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.3 }; static struct platform_device at91sam9260_twi_device = { -diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.33/arch/arm/mach-at91/board-foxg20.c ---- linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/arch/arm/mach-at91/board-foxg20.c 2010-02-27 19:32:30.235748629 +0100 +diff -Nur linux-2.6.34.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.34/arch/arm/mach-at91/board-foxg20.c +--- linux-2.6.34.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/arm/mach-at91/board-foxg20.c 2010-05-25 20:26:06.230978938 +0200 @@ -0,0 +1,376 @@ +/* + * Copyright (C) 2005 SAN People @@ -437,10 +437,10 @@ diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.33/arch/ + .init_irq = foxg20_init_irq, + .init_machine = foxg20_board_init, +MACHINE_END -diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Kconfig linux-2.6.33/arch/arm/mach-at91/Kconfig ---- linux-2.6.33.orig/arch/arm/mach-at91/Kconfig 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/arm/mach-at91/Kconfig 2010-02-27 20:22:57.467867560 +0100 -@@ -354,6 +354,15 @@ +diff -Nur linux-2.6.34.orig/arch/arm/mach-at91/Kconfig linux-2.6.34/arch/arm/mach-at91/Kconfig +--- linux-2.6.34.orig/arch/arm/mach-at91/Kconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/arm/mach-at91/Kconfig 2010-05-25 20:26:06.270978491 +0200 +@@ -360,6 +360,15 @@ Select this if you are using a Eukrea Electromatique's CPU9G20 Board @@ -456,10 +456,10 @@ diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Kconfig linux-2.6.33/arch/arm/mac endif # ---------------------------------------------------------- -diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Makefile linux-2.6.33/arch/arm/mach-at91/Makefile ---- linux-2.6.33.orig/arch/arm/mach-at91/Makefile 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/arm/mach-at91/Makefile 2010-02-27 19:32:30.295749847 +0100 -@@ -66,6 +66,9 @@ +diff -Nur linux-2.6.34.orig/arch/arm/mach-at91/Makefile linux-2.6.34/arch/arm/mach-at91/Makefile +--- linux-2.6.34.orig/arch/arm/mach-at91/Makefile 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/arm/mach-at91/Makefile 2010-05-25 20:26:06.310978635 +0200 +@@ -67,6 +67,9 @@ # AT91SAM9G45 board-specific support obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o @@ -469,24 +469,3 @@ diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Makefile linux-2.6.33/arch/arm/ma # AT91CAP9 board-specific support obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o -diff -Nur linux-2.6.33.orig/drivers/mmc/host/at91_mci.c linux-2.6.33/drivers/mmc/host/at91_mci.c ---- linux-2.6.33.orig/drivers/mmc/host/at91_mci.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/drivers/mmc/host/at91_mci.c 2010-02-27 19:32:30.295749847 +0100 -@@ -461,7 +461,7 @@ - at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC); - mr = AT91_MCI_PDCMODE | 0x34a; - -- if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) -+ if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) - mr |= AT91_MCI_RDPROOF | AT91_MCI_WRPROOF; - - at91_mci_write(host, AT91_MCI_MR, mr); -@@ -1017,7 +1017,7 @@ - host->bus_mode = 0; - host->board = pdev->dev.platform_data; - if (host->board->wire4) { -- if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) -+ if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) - mmc->caps |= MMC_CAP_4_BIT_DATA; - else - dev_warn(&pdev->dev, "4 wire bus mode not supported" diff --git a/target/foxg20/target.mk b/target/foxg20/target.mk index c2eecaddd..f37e7689b 100644 --- a/target/foxg20/target.mk +++ b/target/foxg20/target.mk @@ -1,8 +1,8 @@ # arm default is little endian, this target uses EABI ARCH:= arm CPU_ARCH:= arm -KERNEL_VERSION:= 2.6.33.2 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 80c5ff544b0ee4d9b5d8b8b89d4a0ef9 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=armv5te -mtune=arm926ej-s -- cgit v1.2.3