r3570 - branches/src/target/kernel/2.6.24.x/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Wed Dec 5 07:52:09 CET 2007
Author: laforge
Date: 2007-12-05 07:51:58 +0100 (Wed, 05 Dec 2007)
New Revision: 3570
Removed:
branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch
branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch
branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch
branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch
branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
* remove patches that are in 2.6.24-rc4 mainline:
D s3c2410-nand-include-fix.patch
D asoc-kconfig-fix.patch
D asoc-platform-hw_init-pcm_emulation-fix.patch
D arm-atag-kexec.patch
D fix-s3c2410fb-register-access.patch
D s3c2410-udc-include-fix.patch
* comment out s3c2410_fb-truecolor.patch, it is unclear if it is still needed
Deleted: branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/arm-atag-kexec.patch 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,148 +0,0 @@
-This patch resolves a kexec boot failure that can occur because
-no ATAGs are passed in to the kexec'd kernel. Currently the
-newly-kexec'd kernel may fail if it requires specific ATAGs, or
-it may fail because the fixed memory location at which it expects
-to find the ATAGs may contain random data instead of ATAGs.
-
-The patch ensures that any ATAGs passed to the current kernel
-at boot time are copied to a static buffer, and are copied back
-when kexec copies the new kernel into place. Thus the new
-kernel sees the same ATAGs from kexec and the boot loader.
-
-The boot parameters are copied without regard to type, content,
-or length -- this patch's scope is limited soley to saving and
-restoring a fixed-size block of memory containing the kernel's
-boot parameters. Additional functionality to examine, alter, or
-replace the ATAGs (using kexec, for example) can be implemented
-by manipulating the static buffer containing the preserved ATAGs.
-
-Note: the size of the buffer (1.5KB) is selected to comfortably
-hold one of each ATAG type, including a maximum-length command
-line and the maximum number of ATAG_MEM structures currently
-supported by the kernel. Should an ATAG list exceed that limit,
-the list will be silently truncated to that limit (to do other-
-wise at that point in the boot process would make a simple
-problem exceedingly complicated).
-
-Kernel version 2.6.22.5
-
-Signed-off-by: Mike Westerhof <mwester at dls.net>
----
-
-Index: linux-2.6.23/arch/arm/kernel/relocate_kernel.S
-===================================================================
---- linux-2.6.23.orig/arch/arm/kernel/relocate_kernel.S
-+++ linux-2.6.23/arch/arm/kernel/relocate_kernel.S
-@@ -7,6 +7,23 @@
- .globl relocate_new_kernel
- relocate_new_kernel:
-
-+ /* Move boot params back to where the kernel expects them */
-+
-+ ldr r0,kexec_boot_params_address
-+ teq r0,#0
-+ beq 8f
-+
-+ ldr r1,kexec_boot_params_copy
-+ mov r6,#KEXEC_BOOT_PARAMS_SIZE/4
-+7:
-+ ldr r5,[r1],#4
-+ str r5,[r0],#4
-+ subs r6,r6,#1
-+ bne 7b
-+
-+8:
-+ /* Boot params moved, now go on with the kernel */
-+
- ldr r0,kexec_indirection_page
- ldr r1,kexec_start_address
-
-@@ -50,7 +67,7 @@
- mov lr,r1
- mov r0,#0
- ldr r1,kexec_mach_type
-- mov r2,#0
-+ ldr r2,kexec_boot_params_address
- mov pc,lr
-
- .globl kexec_start_address
-@@ -65,6 +82,16 @@
- kexec_mach_type:
- .long 0x0
-
-+ /* phy addr where new kernel will expect to find boot params */
-+ .globl kexec_boot_params_address
-+kexec_boot_params_address:
-+ .long 0x0
-+
-+ /* phy addr where old kernel put a copy of orig boot params */
-+ .globl kexec_boot_params_copy
-+kexec_boot_params_copy:
-+ .long 0x0
-+
- relocate_new_kernel_end:
-
- .globl relocate_new_kernel_size
-Index: linux-2.6.23/arch/arm/kernel/setup.c
-===================================================================
---- linux-2.6.23.orig/arch/arm/kernel/setup.c
-+++ linux-2.6.23/arch/arm/kernel/setup.c
-@@ -24,6 +24,7 @@
- #include <linux/interrupt.h>
- #include <linux/smp.h>
- #include <linux/fs.h>
-+#include <linux/kexec.h>
-
- #include <asm/cpu.h>
- #include <asm/elf.h>
-@@ -770,6 +771,23 @@
- }
- arch_initcall(customize_machine);
-
-+#ifdef CONFIG_KEXEC
-+
-+/* Physical addr of where the boot params should be for this machine */
-+extern unsigned long kexec_boot_params_address;
-+
-+/* Physical addr of the buffer into which the boot params are copied */
-+extern unsigned long kexec_boot_params_copy;
-+
-+/* Pointer to the boot params buffer, for manipulation and display */
-+unsigned long kexec_boot_params;
-+EXPORT_SYMBOL(kexec_boot_params);
-+
-+/* The buffer itself - make sure it is sized correctly */
-+static unsigned long kexec_boot_params_buf[(KEXEC_BOOT_PARAMS_SIZE + 3) / 4];
-+
-+#endif
-+
- void __init setup_arch(char **cmdline_p)
- {
- struct tag *tags = (struct tag *)&init_tags;
-@@ -788,6 +806,13 @@
- else if (mdesc->boot_params)
- tags = phys_to_virt(mdesc->boot_params);
-
-+#ifdef CONFIG_KEXEC
-+ kexec_boot_params_address = mdesc->boot_params;
-+ kexec_boot_params_copy = virt_to_phys(kexec_boot_params_buf);
-+ kexec_boot_params = (unsigned long)kexec_boot_params_buf;
-+ if (mdesc->boot_params)
-+ memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
-+#endif
- /*
- * If we have the old style parameters, convert them to
- * a tag list.
-Index: linux-2.6.23/include/asm-arm/kexec.h
-===================================================================
---- linux-2.6.23.orig/include/asm-arm/kexec.h
-+++ linux-2.6.23/include/asm-arm/kexec.h
-@@ -14,6 +14,8 @@
-
- #define KEXEC_ARCH KEXEC_ARCH_ARM
-
-+#define KEXEC_BOOT_PARAMS_SIZE 1536
-+
- #ifndef __ASSEMBLY__
-
- struct kimage;
Deleted: branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/asoc-kconfig-fix.patch 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,17 +0,0 @@
----
- sound/soc/s3c24xx/Kconfig | 2 1 + 1 - 0 !
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6/sound/soc/s3c24xx/Kconfig
-===================================================================
---- linux-2.6.orig/sound/soc/s3c24xx/Kconfig 2007-07-23 10:15:13.000000000 +0200
-+++ linux-2.6/sound/soc/s3c24xx/Kconfig 2007-07-23 10:18:07.000000000 +0200
-@@ -18,7 +18,7 @@ config SND_S3C2443_SOC_AC97
-
- config SND_S3C24XX_SOC_NEO1973_WM8753
- tristate "SoC I2S Audio support for NEO1973 - WM8753"
-- depends on SND_S3C24XX_SOC && MACH_GTA01
-+ depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
- select SND_S3C24XX_SOC_I2S
- select SND_SOC_WM8753
- help
Deleted: branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,45 +0,0 @@
-Since the PCM emulation can call multiple times to hw_setup(), but we
-can only once allocate/request the DMA channel, we have to handle
-this gracefully.
-
-Signed-off-by: Harald Welte <laforge at openmoko.org>
-
-Index: linux-2.6.23-rc8/sound/soc/s3c24xx/s3c24xx-pcm.c
-===================================================================
---- linux-2.6.23-rc8.orig/sound/soc/s3c24xx/s3c24xx-pcm.c
-+++ linux-2.6.23-rc8/sound/soc/s3c24xx/s3c24xx-pcm.c
-@@ -158,18 +158,22 @@
- if (!dma)
- return 0;
-
-- /* prepare DMA */
-- prtd->params = dma;
--
-- DBG("params %p, client %p, channel %d\n", prtd->params,
-- prtd->params->client, prtd->params->channel);
--
-- ret = s3c2410_dma_request(prtd->params->channel,
-- prtd->params->client, NULL);
--
-- if (ret) {
-- DBG(KERN_ERR "failed to get dma channel\n");
-- return ret;
-+ /* this may get called several times by oss emulation
-+ * with different params -HW */
-+ if (prtd->params == NULL) {
-+ /* prepare DMA */
-+ prtd->params = dma;
-+
-+ DBG("params %p, client %p, channel %d\n", prtd->params,
-+ prtd->params->client, prtd->params->channel);
-+
-+ ret = s3c2410_dma_request(prtd->params->channel,
-+ prtd->params->client, NULL);
-+
-+ if (ret) {
-+ DBG(KERN_ERR "failed to get dma channel\n");
-+ return ret;
-+ }
- }
-
- /* channel needs configuring for mem=>device, increment memory addr,
Deleted: branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/fix-s3c2410fb-register-access.patch 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,85 +0,0 @@
-Index: linux-2.6.22/drivers/video/s3c2410fb.c
-===================================================================
---- linux-2.6.22.orig/drivers/video/s3c2410fb.c
-+++ linux-2.6.22/drivers/video/s3c2410fb.c
-@@ -123,6 +123,7 @@
-
- static void s3c2410fb_set_lcdaddr(struct s3c2410fb_info *fbi)
- {
-+ void __iomem *regs = fbi->io;
- struct fb_var_screeninfo *var = &fbi->fb->var;
- unsigned long saddr1, saddr2, saddr3;
-
-@@ -137,9 +138,9 @@
- dprintk("LCDSADDR2 = 0x%08lx\n", saddr2);
- dprintk("LCDSADDR3 = 0x%08lx\n", saddr3);
-
-- writel(saddr1, S3C2410_LCDSADDR1);
-- writel(saddr2, S3C2410_LCDSADDR2);
-- writel(saddr3, S3C2410_LCDSADDR3);
-+ writel(saddr1, regs + S3C2410_LCDSADDR1);
-+ writel(saddr2, regs + S3C2410_LCDSADDR2);
-+ writel(saddr3, regs + S3C2410_LCDSADDR3);
- }
-
- /* s3c2410fb_calc_pixclk()
-@@ -289,6 +290,7 @@
- static void s3c2410fb_activate_var(struct s3c2410fb_info *fbi,
- struct fb_var_screeninfo *var)
- {
-+ void __iomem *regs = fbi->io;
- int hs;
-
- fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_MODEMASK;
-@@ -432,16 +434,16 @@
- dprintk("lcdcon[4] = 0x%08lx\n", fbi->regs.lcdcon4);
- dprintk("lcdcon[5] = 0x%08lx\n", fbi->regs.lcdcon5);
-
-- writel(fbi->regs.lcdcon1 & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
-- writel(fbi->regs.lcdcon2, S3C2410_LCDCON2);
-- writel(fbi->regs.lcdcon3, S3C2410_LCDCON3);
-- writel(fbi->regs.lcdcon4, S3C2410_LCDCON4);
-- writel(fbi->regs.lcdcon5, S3C2410_LCDCON5);
-+ writel(fbi->regs.lcdcon1 & ~S3C2410_LCDCON1_ENVID, regs + S3C2410_LCDCON1);
-+ writel(fbi->regs.lcdcon2, regs + S3C2410_LCDCON2);
-+ writel(fbi->regs.lcdcon3, regs + S3C2410_LCDCON3);
-+ writel(fbi->regs.lcdcon4, regs + S3C2410_LCDCON4);
-+ writel(fbi->regs.lcdcon5, regs + S3C2410_LCDCON5);
-
- /* set lcd address pointers */
- s3c2410fb_set_lcdaddr(fbi);
-
-- writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
-+ writel(fbi->regs.lcdcon1, regs + S3C2410_LCDCON1);
- }
-
-
-@@ -549,7 +551,7 @@
- val |= ((green >> 5) & 0x07e0);
- val |= ((blue >> 11) & 0x001f);
-
-- writel(val, S3C2410_TFTPAL(regno));
-+ writel(val, fbi->io + S3C2410_TFTPAL(regno));
- schedule_palette_update(fbi, regno, val);
- }
-
-@@ -581,16 +583,17 @@
- */
- static int s3c2410fb_blank(int blank_mode, struct fb_info *info)
- {
-+ struct s3c2410fb_info *fbi = info->par;
- dprintk("blank(mode=%d, info=%p)\n", blank_mode, info);
-
- if (mach_info == NULL)
- return -EINVAL;
-
- if (blank_mode == FB_BLANK_UNBLANK)
-- writel(0x0, S3C2410_TPAL);
-+ writel(0x0, fbi->io + S3C2410_TPAL);
- else {
- dprintk("setting TPAL to output 0x000000\n");
-- writel(S3C2410_TPAL_EN, S3C2410_TPAL);
-+ writel(S3C2410_TPAL_EN, fbi->io + S3C2410_TPAL);
- }
-
- return 0;
Deleted: branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-nand-include-fix.patch 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,15 +0,0 @@
-Index: linux-2.6.22/drivers/mtd/nand/s3c2410.c
-===================================================================
---- linux-2.6.22.orig/drivers/mtd/nand/s3c2410.c
-+++ linux-2.6.22/drivers/mtd/nand/s3c2410.c
-@@ -60,8 +60,8 @@
-
- #include <asm/io.h>
-
--#include <asm/arch/regs-nand.h>
--#include <asm/arch/nand.h>
-+#include <asm/plat-s3c/regs-nand.h>
-+#include <asm/plat-s3c/nand.h>
-
- #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
- static int hardware_ecc = 1;
Deleted: branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-udc-include-fix.patch 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,16 +0,0 @@
-Index: linux-2.6.22/drivers/usb/gadget/s3c2410_udc.c
-===================================================================
---- linux-2.6.22.orig/drivers/usb/gadget/s3c2410_udc.c
-+++ linux-2.6.22/drivers/usb/gadget/s3c2410_udc.c
-@@ -54,8 +54,9 @@
- #include <asm/arch/hardware.h>
- #include <asm/arch/regs-clock.h>
- #include <asm/arch/regs-gpio.h>
--#include <asm/arch/regs-udc.h>
--#include <asm/arch/udc.h>
-+
-+#include <asm/plat-s3c24xx/udc.h>
-+#include <asm/plat-s3c24xx/regs-udc.h>
-
- #include <asm/mach-types.h>
-
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2007-12-05 06:29:25 UTC (rev 3569)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2007-12-05 06:51:58 UTC (rev 3570)
@@ -1,6 +1,3 @@
-arm-atag-kexec.patch
-asoc-platform-hw_init-pcm_emulation-fix.patch
-asoc-kconfig-fix.patch
asoc-neo1973_wm8753-power.patch
missing_defs.patch
openmoko-logo.patch
@@ -37,7 +34,7 @@
s3c2410-qt2410-buttons.patch
config-nr-tty-devices.patch
hxd8-core.patch
-s3c2410_fb-truecolor.patch
+# s3c2410_fb-truecolor.patch evaluate
s3c2440-nand-disable-hwecc.patch
hxd8-tsl256x.patch
pcf50633.patch
@@ -45,10 +42,7 @@
s3c24xx-nand-largepage.patch
s3c2442b-cpuid.patch
gta02-core.patch
-s3c2410-nand-include-fix.patch
-s3c2410-udc-include-fix.patch
neo1973-soc-include-fix.patch
explicitly-link-notes-section.patch
-fix-s3c2410fb-register-access.patch
lis302dl.patch
gta02-leds.patch
More information about the commitlog
mailing list
