diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2011-09-10 20:17:59 +0200 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2011-09-10 20:17:59 +0200 |
| commit | 24fefb04c73e50820c3156a912690eb23562eec1 (patch) | |
| tree | 49ffde225b4fa12c88055784cfc5ffdb59fb04d6 | |
| parent | 6414baa6af9b231ec2476352d5869fcdd51b03c6 (diff) | |
| parent | 1be4363bfa288a052a5bdc4b4a7c94c5d59c901e (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-24fefb04c73e50820c3156a912690eb23562eec1.tar.gz OSELAS.BSP-Pengutronix-Mini2440-24fefb04c73e50820c3156a912690eb23562eec1.tar.xz | |
Merge branch 'master' of git-private.pengutronix.de:/git-private/oselas.platforms/pengutronix/platform-friendlyarm-mini2440
6 files changed, 26 insertions, 14 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index 0a71bf4..bb96396 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -1,3 +1,13 @@ +2011-09-10 Juergen Beisert <jbe@pengutronix.de> + + * Platform: + - back to development + * Kernel 3.0 + - back to development + - (aarghh) really handle display's physical size in kernel + - Release ptx-2011.09.1 + * Platform: 2nd release September 2011 (2011.09.1) + 2011-09-09 Juergen Beisert <jbe@pengutronix.de> * Platform: Freeze to PTXdist-2011.09.0 diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.0 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.0 index d01f150..65c4be1 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.0 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.0 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.4-ptx-2011.09.0 Kernel Configuration +# Linux/arm 3.0.4-ptx-2011.09.1 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.0/add_display_size_in_kernel.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.0/add_display_size_in_kernel.diff index 4df67f8..0811b15 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.0/add_display_size_in_kernel.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.0/add_display_size_in_kernel.diff @@ -8,8 +8,8 @@ Signed-off-by: Juergen Beisert <jbe@pengutronix.de> --- arch/arm/mach-s3c2410/include/mach/fb.h | 2 ++ - drivers/video/s3c2410fb.c | 2 ++ - 2 files changed, 4 insertions(+) + drivers/video/s3c2410fb.c | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) Index: linux-3.0/arch/arm/mach-s3c2410/include/mach/fb.h =================================================================== @@ -28,12 +28,14 @@ Index: linux-3.0/drivers/video/s3c2410fb.c =================================================================== --- linux-3.0.orig/drivers/video/s3c2410fb.c +++ linux-3.0/drivers/video/s3c2410fb.c -@@ -904,6 +904,8 @@ static int __devinit s3c24xxfb_probe(str - fbinfo->var.activate = FB_ACTIVATE_NOW; - fbinfo->var.accel_flags = 0; - fbinfo->var.vmode = FB_VMODE_NONINTERLACED; -+ fbinfo->var.width = display->phys_width; -+ fbinfo->var.height = display->phys_height; +@@ -151,8 +151,8 @@ static int s3c2410fb_check_var(struct fb + /* it is always the size as the display */ + var->xres_virtual = display->xres; + var->yres_virtual = display->yres; +- var->height = display->height; +- var->width = display->width; ++ var->height = display->phys_height; ++ var->width = display->phys_width; - fbinfo->fbops = &s3c2410fb_ops; - fbinfo->flags = FBINFO_FLAG_DEFAULT; + /* copy lcd settings */ + var->pixclock = display->pixclock; diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.0/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.0/set-marker.diff index 98475ae..091f8f7 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.0/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.0/set-marker.diff @@ -11,7 +11,7 @@ Index: linux-3.0/Makefile PATCHLEVEL = 0 SUBLEVEL = 4 -EXTRAVERSION = -+EXTRAVERSION = -ptx-2011.09.0 ++EXTRAVERSION = -ptx-2011.09.1 NAME = Sneaky Weasel # *DOCUMENTATION* diff --git a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M index b5b80be..e994221 100644 --- a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M +++ b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-128M @@ -17,7 +17,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="mini2440" -PTXCONF_PLATFORM_VERSION="-2011.09.0" +PTXCONF_PLATFORM_VERSION="-2011.09.1" # # architecture diff --git a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M index fc0ccf8..a7ded4b 100644 --- a/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M +++ b/configs/platform-friendlyarm-mini2440/platformconfig-NAND-64M @@ -17,7 +17,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="mini2440" -PTXCONF_PLATFORM_VERSION="-2011.09.0" +PTXCONF_PLATFORM_VERSION="-2011.09.1" # # architecture |