r3962 - branches/src/target/kernel/2.6.24.x/patches

werner at sita.openmoko.org werner at sita.openmoko.org
Sat Jan 26 19:25:13 CET 2008 

Author: werner
Date: 2008-01-26 19:25:09 +0100 (Sat, 26 Jan 2008)
New Revision: 3962

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
fix-initdata-mismatch.patch

Fix linker warnings of this type:
WARNING: vmlinux.o(.data+0x3be4): Section mismatch: reference to .init.data:
(between 'glamo_spigpio_cfg' and 'gta02_nor_flash_data')

Signed-off-by: warmcat <andy at openmoko.com>

gta01-core.patch:
- arch/arm/mach-s3c2410/mach-gta01.c (gta01_spi_board_info): it's referenced by
  spi_gpio_cfg, which in turn is used after initialization, so don't make it
  __initdata
gta02-core.patch:
- arch/arm/mach-s3c2440/mach-gta02.c (gta02_spi_board_info): it's referenced by
  glamo_spi_cfg and glamo_spigpio_cfg, which in turn is used after
  initialization, so don't make it __initdata



Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2008-01-26 18:17:18 UTC (rev 3961)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2008-01-26 18:25:09 UTC (rev 3962)
@@ -3,10 +3,10 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.24/arch/arm/mach-s3c2410/Kconfig
 ===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
+--- linux-2.6.24.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.24/arch/arm/mach-s3c2410/Kconfig
 @@ -110,5 +110,13 @@
  	help
  	   Say Y here if you are using the Armzone QT2410
@@ -21,19 +21,19 @@
 +
  endmenu
  
-Index: linux-2.6/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.24/arch/arm/mach-s3c2410/Makefile
 ===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6/arch/arm/mach-s3c2410/Makefile
+--- linux-2.6.24.orig/arch/arm/mach-s3c2410/Makefile
++++ linux-2.6.24/arch/arm/mach-s3c2410/Makefile
 @@ -29,3 +29,4 @@
  obj-$(CONFIG_BAST_PC104_IRQ)	+= bast-irq.o
  obj-$(CONFIG_MACH_VR1000)	+= mach-vr1000.o usb-simtec.o
  obj-$(CONFIG_MACH_QT2410)	+= mach-qt2410.o
 +obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
-Index: linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.24/arch/arm/mach-s3c2410/mach-gta01.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
++++ linux-2.6.24/arch/arm/mach-s3c2410/mach-gta01.c
 @@ -0,0 +1,658 @@
 +/*
 + * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -473,7 +473,7 @@
 +
 +/* SPI */
 +
-+static struct spi_board_info gta01_spi_board_info[] __initdata = {
++static struct spi_board_info gta01_spi_board_info[] = {
 +	{
 +		.modalias	= "jbt6k74",
 +		/* platform_data */
@@ -693,10 +693,10 @@
 +	.init_machine	= gta01_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
-Index: linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/gta01.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/gta01.h
 @@ -0,0 +1,70 @@
 +#ifndef _GTA01_H
 +#define _GTA01_H
@@ -768,11 +768,11 @@
 +#define GTA01Bv4_IRQ_PCF50606	IRQ_EINT9
 +
 +#endif /* _GTA01_H */
-Index: linux-2.6/MAINTAINERS
+Index: linux-2.6.24/MAINTAINERS
 ===================================================================
---- linux-2.6.orig/MAINTAINERS
-+++ linux-2.6/MAINTAINERS
-@@ -1530,6 +1530,14 @@
+--- linux-2.6.24.orig/MAINTAINERS
++++ linux-2.6.24/MAINTAINERS
+@@ -1536,6 +1536,14 @@
  M:	akinobu.mita at gmail.com
  S:	Supported
  
@@ -787,10 +787,10 @@
  FRAMEBUFFER LAYER
  P:	Antonino Daplas
  M:	adaplas at gmail.com
-Index: linux-2.6/arch/arm/plat-s3c24xx/Kconfig
+Index: linux-2.6.24/arch/arm/plat-s3c24xx/Kconfig
 ===================================================================
---- linux-2.6.orig/arch/arm/plat-s3c24xx/Kconfig
-+++ linux-2.6/arch/arm/plat-s3c24xx/Kconfig
+--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/Kconfig
++++ linux-2.6.24/arch/arm/plat-s3c24xx/Kconfig
 @@ -46,4 +46,9 @@
  	help
  	  Common machine code for SMDK2410 and SMDK2440

Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2008-01-26 18:17:18 UTC (rev 3961)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2008-01-26 18:25:09 UTC (rev 3962)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.24/arch/arm/mach-s3c2440/mach-gta02.c
 @@ -0,0 +1,821 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -467,7 +467,7 @@
 +
 +/* SPI */
 +
-+static struct spi_board_info gta02_spi_board_info[] __initdata = {
++static struct spi_board_info gta02_spi_board_info[] = {
 +	{
 +		.modalias	= "jbt6k74",
 +		/* platform_data */
@@ -824,10 +824,10 @@
 +	.init_machine	= gta02_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
-Index: linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/gta02.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/gta02.h
 @@ -0,0 +1,97 @@
 +#ifndef _GTA02_H
 +#define _GTA02_H
@@ -926,10 +926,10 @@
 +#define GTA02v3_IRQ_nGSM_OC	IRQ_EINT19	/* v3 + v4 only */
 +
 +#endif /* _GTA02_H */
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6.24/arch/arm/mach-s3c2440/Kconfig
 ===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.24/arch/arm/mach-s3c2440/Kconfig
 @@ -74,5 +74,20 @@
  	help
  	   Say Y here if you are using the FIC Neo1973 GSM Phone
@@ -951,19 +951,19 @@
 +
  endmenu
  
-Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6.24/arch/arm/mach-s3c2440/Makefile
 ===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6.24/arch/arm/mach-s3c2440/Makefile
 @@ -22,3 +22,4 @@
  obj-$(CONFIG_ARCH_S3C2440)	+= mach-smdk2440.o
  obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
  obj-$(CONFIG_MACH_HXD8)		+= mach-hxd8.o
 +obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+Index: linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
 ===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
++++ linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
 @@ -19,7 +19,9 @@
  #include <linux/pcf50606.h>
  
@@ -1081,10 +1081,10 @@
  	/* we pull reset to low to make sure that the chip doesn't
  	 * drain power through the reset line */
  	s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+Index: linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
 ===================================================================
---- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
++++ linux-2.6.24/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
 @@ -19,8 +19,14 @@
  #include <linux/errno.h>
  
@@ -1193,10 +1193,10 @@
  
  	return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
  }
-Index: linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
+Index: linux-2.6.24/drivers/leds/leds-neo1973-vibrator.c
 ===================================================================
---- linux-2.6.24-rc8.orig/drivers/leds/leds-neo1973-vibrator.c
-+++ linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
+--- linux-2.6.24.orig/drivers/leds/leds-neo1973-vibrator.c
++++ linux-2.6.24/drivers/leds/leds-neo1973-vibrator.c
 @@ -113,7 +113,7 @@
  	struct resource *r;
  	int rc;
@@ -1206,10 +1206,10 @@
  		return -EIO;
  
  	r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6.24/sound/soc/s3c24xx/neo1973_wm8753.c
 ===================================================================
---- linux-2.6.24-rc8.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
+--- linux-2.6.24.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6.24/sound/soc/s3c24xx/neo1973_wm8753.c
 @@ -672,6 +672,12 @@
  {
  	int ret;

More information about the commitlog mailing list