* [PATCH v6 2/3] OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
In-Reply-To: <1286520273-4892-2-git-send-email-svadivu@ti.com>
From: Senthilvadivu Guruswamy <svadivu@ti.com>
config VRFB should depend on ARCH_OMAP2 or ARCH_OMAP3.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
drivers/video/omap2/omapfb/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 43496d6..65149b2 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -3,7 +3,7 @@ menuconfig FB_OMAP2
depends on FB && OMAP2_DSS
select OMAP2_VRAM
- select OMAP2_VRFB
+ select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
--
1.6.3.3
^ permalink raw reply related
* [PATCH v6 1/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
In-Reply-To: <1286520273-4892-1-git-send-email-svadivu@ti.com>
From: Senthilvadivu Guruswamy <svadivu@ti.com>
FB_OMAP2 can work without VRFB, but currently does not build. Fix this.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
arch/arm/plat-omap/include/plat/vrfb.h | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/vrfb.h b/arch/arm/plat-omap/include/plat/vrfb.h
index d8a03ce..3792bde 100644
--- a/arch/arm/plat-omap/include/plat/vrfb.h
+++ b/arch/arm/plat-omap/include/plat/vrfb.h
@@ -35,6 +35,7 @@ struct vrfb {
bool yuv_mode;
};
+#ifdef CONFIG_OMAP2_VRFB
extern int omap_vrfb_request_ctx(struct vrfb *vrfb);
extern void omap_vrfb_release_ctx(struct vrfb *vrfb);
extern void omap_vrfb_adjust_size(u16 *width, u16 *height,
@@ -47,4 +48,19 @@ extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
extern int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot);
extern void omap_vrfb_restore_context(void);
+#else
+static inline int omap_vrfb_request_ctx(struct vrfb *vrfb) { return 0; }
+static inline void omap_vrfb_release_ctx(struct vrfb *vrfb) {}
+static inline void omap_vrfb_adjust_size(u16 *width, u16 *height,
+ u8 bytespp) {}
+static inline u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp)
+ { return 0; }
+static inline u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp)
+ { return 0; }
+static inline void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
+ u16 width, u16 height, unsigned bytespp, bool yuv_mode) {}
+static inline int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot)
+ { return 0; }
+static inline void omap_vrfb_restore_context(void) {}
+#endif
#endif /* __VRFB_H */
--
1.6.3.3
^ permalink raw reply related
* [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
From: Senthilvadivu Guruswamy <svadivu@ti.com>
The changelog till v6 are:
- Address Multi-omap build issue
- Added a check to warn the wrong usage of vrfb
in non-vrfb omap devices.
- The patch subject is as per the naming conventions
- patch 2/3 now has the changes in omap2/omapfb/Kconfig
instead of omap2/Kconfig. The functional effect remains
the same, and the place of implementation is more appropriate.
- Provide details of non-vrfb devices in commit description in patch 3/3
- Removed extra paranthesis in cpu checks
Senthilvadivu Guruswamy (3):
OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3
arch/arm/plat-omap/include/plat/vrfb.h | 16 ++++++++++++++++
drivers/video/omap2/omapfb/Kconfig | 2 +-
drivers/video/omap2/omapfb/omapfb-main.c | 10 ++++++++++
3 files changed, 27 insertions(+), 1 deletions(-)
^ permalink raw reply
* RE: [PATCH 3/4] radio settings: document FastDormancy property
From: Mika.Liljeberg @ 2010-10-08 6:56 UTC (permalink / raw)
To: ofono
In-Reply-To: <1286465668.6145.155.camel@aeonflux>
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
Hi,
> so how does the future prediction is suppose to work. Are we
> shipping a
> time machine together with oFono ;)
I would say the heuristic is system dependent. Typical way would be to monitor events from different input devices. If no events arrive for a specified time the user is assumed to be inactive. The user might also have some explicit way to do this, such as locking the display and keys.
MikaL
^ permalink raw reply
* [Buildroot] [PATCH 7/7] libtool: avoid to patch ltmain.sh script in host-libtool package
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libtool/libtool.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index b57bca9..60fee9f 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -16,6 +16,8 @@ endef
HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_CUSTOM_INSTALL
+HOST_LIBTOOL_LIBTOOL_PATCH = NO
+
$(eval $(call AUTOTARGETS,package,libtool))
$(eval $(call AUTOTARGETS,package,libtool,host))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 6/7] libtool: bump to 2.2.10
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libtool/libtool.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index a996876..b57bca9 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -3,7 +3,7 @@
# libtool
#
#############################################################
-LIBTOOL_VERSION = 1.5.24
+LIBTOOL_VERSION = 2.2.10
LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 5/7] Removed libmpd-0.17.0-libdir-la.patch
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
Now that libmpd.mk has been converted to autotools infrastructure, the patch is
no longer needed. Autotools will automatically apply the needed patch.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../libmpd/libmpd-0.17.0-libdir-la.patch | 89 --------------------
package/multimedia/libmpd/libmpd.mk | 1 -
2 files changed, 0 insertions(+), 90 deletions(-)
delete mode 100644 package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
diff --git a/package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch b/package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
deleted file mode 100644
index 561a338..0000000
--- a/package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
+++ /dev/null
@@ -1,89 +0,0 @@
----
- ltmain.sh | 39 +++++++++++++++++++++++++++++++++------
- 1 file changed, 33 insertions(+), 6 deletions(-)
-
-Index: libmpd-0.17.0/ltmain.sh
-===================================================================
---- libmpd-0.17.0.orig/ltmain.sh
-+++ libmpd-0.17.0/ltmain.sh
-@@ -1056,7 +1056,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- func_echo "unable to infer tagged configuration"
-- func_fatal_error "specify a tag with \`--tag'"
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# func_fatal_error "specify a tag with \`--tag'"
- # else
- # func_verbose "using $tagname tagged configuration"
- fi
-@@ -2025,8 +2027,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- test "$inst_prefix_dir" = "$destdir" && \
-- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-@@ -5419,8 +5426,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -5571,7 +5584,7 @@
- *)
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
-- need_relink=yes
-+ need_relink=no
- fi
- ;;
- esac
-@@ -5901,6 +5914,16 @@
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
- case $deplib in
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- -L*) path="$deplib" ;;
- *.la)
- func_dirname "$deplib" "" "."
-@@ -8059,6 +8082,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- func_basename "$deplib"
diff --git a/package/multimedia/libmpd/libmpd.mk b/package/multimedia/libmpd/libmpd.mk
index 327f61a..47a802a 100644
--- a/package/multimedia/libmpd/libmpd.mk
+++ b/package/multimedia/libmpd/libmpd.mk
@@ -7,7 +7,6 @@ LIBMPD_VERSION = 0.17.0
LIBMPD_SOURCE = libmpd-$(LIBMPD_VERSION).tar.gz
LIBMPD_SITE = http://download.sarine.nl/download/Programs/gmpc/$(LIBMPD_VERSION)/
LIBMPD_INSTALL_STAGING = YES
-LIBMPD_LIBTOOL_PATCH = NO
LIBMPD_DEPENDENCIES = libglib2
$(eval $(call AUTOTARGETS,package/multimedia,libmpd))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 4/7] Removed freetype-2.3.9-libdir-la.patch
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
Now that freetype.mk has been converted to autotools infrastructure, the patch
is no longer needed. Autotools will automatically apply the needed patch.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/freetype/freetype-2.3.9-libdir-la.patch | 81 -----------------------
package/freetype/freetype.mk | 1 -
2 files changed, 0 insertions(+), 82 deletions(-)
delete mode 100644 package/freetype/freetype-2.3.9-libdir-la.patch
diff --git a/package/freetype/freetype-2.3.9-libdir-la.patch b/package/freetype/freetype-2.3.9-libdir-la.patch
deleted file mode 100644
index 76287ef..0000000
--- a/package/freetype/freetype-2.3.9-libdir-la.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -urN freetype-2.3.7.orig/builds/unix/ltmain.sh freetype-2.3.7/builds/unix/ltmain.sh
---- freetype-2.3.7.orig/builds/unix/ltmain.sh 2008-09-16 15:55:36.000000000 +0100
-+++ freetype-2.3.7/builds/unix/ltmain.sh 2008-09-22 09:18:36.000000000 +0100
-@@ -1047,8 +1047,9 @@
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
-- func_echo "unable to infer tagged configuration"
-- func_fatal_error "specify a tag with \`--tag'"
-+ func_echo "unable to infer tagged configuration"
-+ func_echo "$modename: defaulting to \`CC'"
-+ func_echo "$modename: if this is not correct, specify a tag with \`--tag'"
- # else
- # func_verbose "using $tagname tagged configuration"
- fi
-@@ -2017,8 +2018,11 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- test "$inst_prefix_dir" = "$destdir" && \
-- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ #test "$inst_prefix_dir" = "$destdir" && \
-+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-@@ -4885,8 +4889,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -5408,13 +5418,16 @@
- ;;
- esac
- else
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-- test -z "$libdir" && \
-- func_fatal_error "\`$deplib' is not a valid libtool archive"
-- test "$absdir" != "$libdir" && \
-- func_warning "\`$deplib' seems to be moved"
--
-- path="-L$absdir"
-+# This interferes with crosscompilation. -CL
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# test -z "$libdir" && \
-+# func_fatal_error "\`$deplib' is not a valid libtool archive"
-+# test "$absdir" != "$libdir" && \
-+# func_warning "\`$deplib' seems to be moved"
-+#
-+# path="-L$absdir"
-+ path="-L$absdir/$objdir"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- fi
- ;;
- esac
-@@ -7520,6 +7533,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- func_basename "$deplib"
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index a2df1d8..c7e5c32 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -6,7 +6,6 @@
FREETYPE_VERSION = 2.3.12
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_LIBTOOL_PATCH = NO
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 3/7] Removed expat-libdir-la.patch
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
Now that expat.mk has been converted to autotools infrastructure, the patch is
no longer needed. Autotools will automatically apply the needed patch.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/expat/expat-libdir-la.patch | 77 -----------------------------------
package/expat/expat.mk | 1 -
2 files changed, 0 insertions(+), 78 deletions(-)
delete mode 100644 package/expat/expat-libdir-la.patch
diff --git a/package/expat/expat-libdir-la.patch b/package/expat/expat-libdir-la.patch
deleted file mode 100644
index 1c8930e..0000000
--- a/package/expat/expat-libdir-la.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700
-+++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700
-@@ -273,8 +273,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2404,8 +2405,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2886,6 +2893,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5598,6 +5615,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5919,10 +5940,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index f82a904..03b1303 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -7,7 +7,6 @@
EXPAT_VERSION = 2.0.1
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
-EXPAT_LIBTOOL_PATCH = NO
EXPAT_INSTALL_STAGING = YES
EXPAT_INSTALL_TARGET = YES
EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/7] Added the ability to patch ltmain.sh based on version
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
There are two versions of ltmain.sh in use in the buildroot system, 1.5.x and
2.2.x. buildroot-libtool.patch would only patch 1.5.x, which meant that for
2.2.x, a separate patch for the affected package had to be maintained. Modified
Makefile.autotools.in to check the version of ltmain.sh and apply the correct
patch.
---
package/Makefile.autotools.in | 27 ++++++++++---
package/buildroot-libtool-v1.5.patch | 69 ++++++++++++++++++++++++++++++++++
package/buildroot-libtool-v2.2.patch | 53 ++++++++++++++++++++++++++
package/buildroot-libtool.patch | 69 ----------------------------------
4 files changed, 143 insertions(+), 75 deletions(-)
create mode 100644 package/buildroot-libtool-v1.5.patch
create mode 100644 package/buildroot-libtool-v2.2.patch
delete mode 100644 package/buildroot-libtool.patch
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 589079b..950c79f 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -139,10 +139,16 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
#
define LIBTOOL_PATCH_HOOK
@$(call MESSAGE,"Patching libtool")
- $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \
- "$$($$(PKG)_AUTORECONF)" != "YES"; then \
- for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
- toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \
+ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \
+ -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \
+ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
+ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
+ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
+ if test $$$${ltmain_version} = '1.5'; then \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+ else \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+ fi \
done \
fi
endef
@@ -158,9 +164,18 @@ endif
define AUTORECONF_HOOK
@$(call MESSAGE,"Autoreconfiguring")
$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
- $(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
+ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
- toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
+ echo $$$${i}; \
+ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
+ echo $$$${ltmain_version}; \
+ if test $$$${ltmain_version} = "1.5"; then \
+ echo "Applying libtool patch 1.5"; \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+ else \
+ echo "Applying libtool patch 2.2"; \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+ fi \
done \
fi
endef
diff --git a/package/buildroot-libtool-v1.5.patch b/package/buildroot-libtool-v1.5.patch
new file mode 100644
index 0000000..57a7c58
--- /dev/null
+++ b/package/buildroot-libtool-v1.5.patch
@@ -0,0 +1,69 @@
+--- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
+@@ -273,8 +273,9 @@ func_infer_tag ()
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++ $echo "$modename: defaulting to \`CC'"
++ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
+@@ -2407,8 +2408,14 @@ EOF
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -2545,7 +2552,7 @@ EOF
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ # This is a shared library
+
+@@ -5606,6 +5623,10 @@ fi\
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+@@ -5927,10 +5948,13 @@ relink_command=\"$relink_command\""
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- if test "$inst_prefix_dir" = "$destdir"; then
+- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit $EXIT_FAILURE
+- fi
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # if test "$inst_prefix_dir" = "$destdir"; then
++ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++ # exit $EXIT_FAILURE
++ # fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
diff --git a/package/buildroot-libtool-v2.2.patch b/package/buildroot-libtool-v2.2.patch
new file mode 100644
index 0000000..5697bf1
--- /dev/null
+++ b/package/buildroot-libtool-v2.2.patch
@@ -0,0 +1,53 @@
+--- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
+@@ -2239,8 +2239,11 @@ func_mode_install ()
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # test "$inst_prefix_dir" = "$destdir" && \
++ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -5739,8 +5742,14 @@ func_mode_link ()
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -5891,7 +5900,7 @@ func_mode_link ()
+ *)
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -8373,6 +8382,10 @@ func_mode_link ()
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
diff --git a/package/buildroot-libtool.patch b/package/buildroot-libtool.patch
deleted file mode 100644
index 57a7c58..0000000
--- a/package/buildroot-libtool.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
-+++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
-@@ -273,8 +273,9 @@ func_infer_tag ()
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2407,8 +2408,14 @@ EOF
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2545,7 +2552,7 @@ EOF
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
-- need_relink=yes
-+ need_relink=no
- fi
- # This is a shared library
-
-@@ -5606,6 +5623,10 @@ fi\
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5927,10 +5948,13 @@ relink_command=\"$relink_command\""
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/7] BugFix - buildroot-libtool.patch - Removed Useless Code
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
The code that was removed only added commented out code. It neither added
needed code nor commented out existing code.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/buildroot-libtool.patch | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/package/buildroot-libtool.patch b/package/buildroot-libtool.patch
index 277719d..57a7c58 100644
--- a/package/buildroot-libtool.patch
+++ b/package/buildroot-libtool.patch
@@ -38,23 +38,6 @@
fi
# This is a shared library
-@@ -2889,6 +2896,16 @@ EOF
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
@@ -5606,6 +5623,10 @@ fi\
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
--
1.7.1
^ permalink raw reply related
* [Buildroot] [pull request] libtool enhancement
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
Hello,
Here is a patch set mostly from Martin Banky to support libtool
patching depending on the libtool script version. This also bumps
libtool to version 2.2.10, so we can autoreconfigure packages
depending on libtool 2.2 versions (gtk+, glib, etc...).
You can pull from :
git://git.potipota.net/buildroot martins-libtool
Regards,
--
Lionel Landwerlin
^ permalink raw reply
* RE: [PATCH v1 05/16] OMAP3 DSS Driver register moved to mach_omap2
From: Guruswamy, Senthilvadivu @ 2010-10-08 6:54 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: khilman@deeprootsystems.com, tomi.valkeinen@nokia.com,
paul@pwsan.com, Hiremath, Vaibhav, linux-omap@vger.kernel.org
In-Reply-To: <20101007210618.2bb542be@surf>
> -----Original Message-----
> From: Thomas Petazzoni [mailto:thomas.petazzoni@free-electrons.com]
> Sent: Friday, October 08, 2010 12:36 AM
> To: Guruswamy, Senthilvadivu
> Cc: khilman@deeprootsystems.com; tomi.valkeinen@nokia.com; paul@pwsan.com;
> Hiremath, Vaibhav; linux-omap@vger.kernel.org
> Subject: Re: [PATCH v1 05/16] OMAP3 DSS Driver register moved to
> mach_omap2
>
> Hello,
>
> The patch title is a bit misleading, maybe it should rather be
> something like "Move OMAP3 DSS driver registration to
> mach-omap2/devices.c"/
>
> On Wed, 6 Oct 2010 16:44:48 +0530
> Guruswamy Senthilvadivu <svadivu@ti.com> wrote:
>
> > /*---------------------------------------------------------------------
> ------*/
> > +#ifdef CONFIG_OMAP2_DSS
> > +
> > +static struct platform_device omap_display_device = {
> > + .name = "omapdisplay",
> > + .id = -1,
> > + .dev = {
> > + .platform_data = NULL,
> > + },
>
> This .dev = {} part is useless. The compiler will automatically
> initialize unset fields to zero.
>
[Senthil] Thanks. When I do code movement I don't change it.
I can submit additional patches to improvise the code.
> > +};
> > +
> > +void __init omap_display_init(struct omap_dss_board_info
> > + *board_data)
>
> *board_data should probably be on the same line as the argument type.
>
[Senthil] Taken.
> > +{
> > +
>
> The general kernel coding style seems to be that there shouldn't be
> such empty newlines at the beginning of functions.
>
> > + omap_display_device.dev.platform_data = board_data;
> > +
> > + if (platform_device_register(&omap_display_device) < 0)
> > + printk(KERN_ERR "Unable to register OMAP-Display device\n");
> > +
> > +
>
> Unneeded newlines.
>
[Senthil] Taken.
> > + return ;
>
> This return is not needed, we are at the end of a void function.
>
> > @@ -712,7 +712,7 @@ static struct platform_driver omap_dss_driver = {
> > .suspend = omap_dss_suspend,
> > .resume = omap_dss_resume,
> > .driver = {
> > - .name = "omapdss",
> > + .name = "omapdisplay",
> > .owner = THIS_MODULE,
> > },
> > };
>
> There are other boards instantiating a platform_device with the omapdss
> name, so I think this change is going to break those boards. In my
> not-so-old linux-omap tree :
>
> $ grep "\.name.*omapdss" *
> board-3430sdp.c: .name = "omapdss",
> board-am3517evm.c: .name = "omapdss",
> board-cm-t35.c: .name = "omapdss",
> board-devkit8000.c: .name = "omapdss",
> board-igep0020.c: .name = "omapdss",
> board-omap3beagle.c: .name = "omapdss",
> board-omap3evm.c: .name = "omapdss",
> board-omap3pandora.c: .name = "omapdss",
> board-omap3stalker.c: .name = "omapdss",
> board-rx51-video.c: .name = "omapdss",
>
> Shouldn't these board files also be updated to use the new
> omap_display_init() function ?
>
[Senthil] Yes, Taken. I would request for testing these additional changes.
> Regards,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
^ permalink raw reply
* Re: [PATCH] fast-import: Allow filemodify to set the root
From: Johannes Sixt @ 2010-10-08 6:50 UTC (permalink / raw)
To: Jonathan Nieder
Cc: Sverre Rabbelier, David Barr, Git Mailing List,
Ramkumar Ramachandra
In-Reply-To: <20101007202847.GA13234@burratino>
Am 10/7/2010 22:28, schrieb Jonathan Nieder:
> Sverre Rabbelier wrote:
>
>> This means nothing to me
>
> Sorry for the lack of clarity. Probably I should have just said:
>
> | For a command (like filter-branch --subdirectory-filter) that wants
> | to commit a lot of trees that already exist in the object db, writing
> | undeltified objects as loose files only to repack them later can
> | involve a significant amount[*] of overhead.
1. But when an object already exists in the db, it won't be written again,
will it?
2. Even though fast-import puts all (new) objects into a pack file, the
pack is heavily sub-optimal, and you should repack -f anyway. So what's
the point? Only to avoid a loose object?
(I'm not saying that the patch is unwanted, but only that the
justification is still not sufficiently complete.)
-- Hannes
^ permalink raw reply
* [PATCH] Documentation: update-index: -z applies also to --index-info
From: Bert Wesarg @ 2010-10-08 6:50 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Štěpán Němec, Bert Wesarg
In-Reply-To: <AANLkTimWOWHfLtiP8BkQ8ORMhjiyiAZm7Gn+OmQ2USfT@mail.gmail.com>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
Documentation/git-update-index.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 74d1d49..26fd8d0 100644 Documentation/git-update-index.txt
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -144,8 +144,8 @@ you will need to handle the situation manually.
Report what is being added and removed from index.
-z::
- Only meaningful with `--stdin`; paths are separated with
- NUL character instead of LF.
+ Only meaningful with `--stdin` or `--index-info`; paths are
+ separated with NUL character instead of LF.
\--::
Do not interpret any more arguments as options.
--
1.7.1.1067.g5aeb7
^ permalink raw reply related
* [LTP] SMACK
From: ARJIT SHARMA @ 2010-10-08 6:50 UTC (permalink / raw)
To: ltp-list, hannuxx
[-- Attachment #1.1: Type: text/plain, Size: 245 bytes --]
hi,
running SMACK tests, after configuring the kernel accordingly error is
coming as follows :--
The smack label reported for /smack/onlycap is "", not the expected ""
.
what is the problem here? :(
--
Best Regards,
Arjit Sharma.
[-- Attachment #1.2: Type: text/html, Size: 403 bytes --]
[-- Attachment #2: Type: text/plain, Size: 369 bytes --]
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
[-- Attachment #3: Type: text/plain, Size: 155 bytes --]
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply
* RE: [PATCH 2/2] davinci: Platform support for OMAP-L137/AM17x NOR flash driver
From: Nori, Sekhar @ 2010-10-08 6:50 UTC (permalink / raw)
To: Vitaly Wool
Cc: davinci-linux-open-source@linux.davincidsp.com, Sergei Shtylyov,
Aleksey Makarov, David Griego, linux-mtd@lists.infradead.org,
Dharmappa, Savinay
In-Reply-To: <AANLkTi=P8DcjCn_mozmvaNue2d_jn6meBzvXDbk3gpd3@mail.gmail.com>
On Fri, Oct 08, 2010 at 12:14:33, Vitaly Wool wrote:
> On Fri, Oct 8, 2010 at 5:54 AM, Nori, Sekhar <nsekhar@ti.com> wrote:
> > Hi Sergei,
> >
> > On Thu, Oct 07, 2010 at 20:35:28, Sergei Shtylyov wrote:
> >
> >> > +static void da830_evm_nor_done(void *data)
> >> > +{
> >> > + clk_disable(da830_evm_nor.clk);
> >> > + clk_put(da830_evm_nor.clk);
> >> > + iounmap(da830_evm_nor.latch.addr);
> >> > + release_mem_region(DA8XX_AEMIF_CS3_BASE, PAGE_SIZE);
> >> > + iounmap(da830_evm_nor.aemif.addr);
> >> > + release_mem_region(DA8XX_AEMIF_CTL_BASE, SZ_32K);
> >> > +}
> >>
> >> Why you've changed this function which was useful also for the error cleanup
> >> before?
> >
> > The issues down below aside, I think goto based error handling
> > is clearer to follow. Any objections to using goto based
> > error handing per-se?
>
> What you're saying just doesn't make sense in this context. Whatever
> way of error handling is chosen, it first needs to be correct which is
> absolutely not the case here.
Yes, agreed. It needs to be correct first.
Thanks,
Sekhar
^ permalink raw reply
* missing definition of 's3c_gpio_getpull' function in 'plat-samsung'
From: Kukjin Kim @ 2010-10-08 6:50 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <000301cb66af$276b8960$76429c20$@com>
Daein Moon wrote:
>
> Hi Ben Dooks and Kukjin,
>
> I found an issue about s3c_gpio_getpull API.
>
> The 'plat-samsung' provides 's3c_gpio_setpull' and 's3c_gpio_getpull'
> to set and get pull-{none|up|down} of GPIO. But there is no
> 's3c_gpio_getpull' definition in 'arch/arm/plat-samsung/gpio-config.c',
> and there is only declaration in the corresponding header file.
>
> 's3c_gpio_getpull' isn't supported/used. So if providing this api, its
> definition should be inserted.
>
> Otherwise, code that is used to provide s3c_gpio_getpull including
> following code should be removed.
>
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:
> extern s3c_gpio_pull_t s3c_gpio_getpull(unsigned int pin);
>
> arch/arm/mach-{s3c*|s5p*}/gpiolib.c:
> .get_pull = s3c_gpio_getpull_updown,
>
>
> What do you think about that?
>
Oh...you mean s3c_gpio_getpull()?
Yes right..there is no it in gpio-config.c..maybe missed.
Anyway...in this case, I think to add missed function is better.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* RE: missing definition of 's3c_gpio_getpull' function in 'plat-samsung'
From: Kukjin Kim @ 2010-10-08 6:50 UTC (permalink / raw)
To: 'Daein Moon', ben-linux; +Cc: linux-arm-kernel, linux-samsung-soc
In-Reply-To: <000301cb66af$276b8960$76429c20$@com>
Daein Moon wrote:
>
> Hi Ben Dooks and Kukjin,
>
> I found an issue about s3c_gpio_getpull API.
>
> The 'plat-samsung' provides 's3c_gpio_setpull' and 's3c_gpio_getpull'
> to set and get pull-{none|up|down} of GPIO. But there is no
> 's3c_gpio_getpull' definition in 'arch/arm/plat-samsung/gpio-config.c',
> and there is only declaration in the corresponding header file.
>
> 's3c_gpio_getpull' isn't supported/used. So if providing this api, its
> definition should be inserted.
>
> Otherwise, code that is used to provide s3c_gpio_getpull including
> following code should be removed.
>
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:
> extern s3c_gpio_pull_t s3c_gpio_getpull(unsigned int pin);
>
> arch/arm/mach-{s3c*|s5p*}/gpiolib.c:
> .get_pull = s3c_gpio_getpull_updown,
>
>
> What do you think about that?
>
Oh...you mean s3c_gpio_getpull()?
Yes right..there is no it in gpio-config.c..maybe missed.
Anyway...in this case, I think to add missed function is better.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* Re: [PATCH] Documentation: update-index: -z applies also to --index-info
From: Bert Wesarg @ 2010-10-08 6:47 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Štěpán Němec, git
In-Reply-To: <7viq1dwg8v.fsf@alter.siamese.dyndns.org>
On Fri, Oct 8, 2010 at 04:49, Junio C Hamano <gitster@pobox.com> wrote:
> Bert Wesarg <bert.wesarg@googlemail.com> writes:
>
>> diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
>> index 74d1d49..0999950 100644 Documentation/git-update-index.txt
>> --- a/Documentation/git-update-index.txt
>> +++ b/Documentation/git-update-index.txt
>> @@ -18,9 +18,9 @@ SYNOPSIS
>> [--skip-worktree | --no-skip-worktree]
>> [--ignore-submodules]
>> [--really-refresh] [--unresolve] [--again | -g]
>> - [--info-only] [--index-info]
>> - [-z] [--stdin]
>> + [--info-only]
>> [--verbose]
>> + [[-z] --stdin | --index-info]
>
> Hmm, this requires | to bind tighter than [] around -z, but that is a bit
> counterintuitive.
>
> Also, you can put -z much earlier, e.g. "update-index -z --add --stdin",
> and your version gives a false impression that we do not allow that.
>
> Writing it as "[-z] [--stdin | --index-info]" would be much easier to
> read, even though it won't convey that -z will be no-op unless we are
> reading from the standard input, either with --stdin or --index-info.
>
> I actually think we can easily lift the "must be at the end" limitation
> from both codepaths.
>
> Move the --stdin codepath to a separate helper like read_index_info(),
> remove the limitation, and add a new limitation that --stdin/--index-info
> can be given only once (as the reader will read thru EOF and the second
> call to the reader won't help us). And do the reading after processing
> all the command line stuff (i.e. move read_index_info() call after the
> option parsing loop), to allow "update-index --stdin --add hello.c" to add
> new paths read from standard input and also hello.c was given from the
> command line.
>
> Wouldn't it make much more sense to spend brain cycles to write and review
> such a patch, rather than documenting an unnecessary limitation?
>
> Hmm?
As the subject suspects, the main intention was to document that -z
applies also to --index-info. The reminder is only falloff while
fixing this inconsistency in the documentation.
So, yes we should have spend more time to remove this limitation that
they need to be the last option.
I will prepare a patch which handles only the -z/--index-info
documentation issue.
Bert
^ permalink raw reply
* [PATCH] i.MX35: Add mx35_revision function to query the silicon revision
From: Sascha Hauer @ 2010-10-08 6:45 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20101007182137.GU29673@pengutronix.de>
On Thu, Oct 07, 2010 at 08:21:37PM +0200, Uwe Kleine-K?nig wrote:
> Hallo Sascha,
>
> I put you patch in my (still private) tree and suggest the following on
> top of the two. If you're OK I'd squash the hunks into the respective
> patches and send them to you.
Yes, I'm ok.
Here's another one I would like to put ontop of it.
SAscha
[PATCH] ARM i.MX31: use MX3x_ prefixed version of CHIP_REV_x
Also, remove the depreacated symbols from arch/arm/mach-mx3/cpu.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-mx3/Makefile | 1 -
arch/arm/mach-mx3/cpu.c | 20 ++++++++++----------
arch/arm/plat-mxc/include/mach/mx3x.h | 15 +--------------
3 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-mx3/Makefile b/arch/arm/mach-mx3/Makefile
index 2bd7bec..8a182d0a 100644
--- a/arch/arm/mach-mx3/Makefile
+++ b/arch/arm/mach-mx3/Makefile
@@ -7,7 +7,6 @@
obj-y := mm.o devices.o cpu.o
CFLAGS_mm.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
-CFLAGS_cpu.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
obj-$(CONFIG_ARCH_MX31) += clock-imx31.o iomux-imx31.o
obj-$(CONFIG_ARCH_MX35) += clock-imx35.o
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
diff --git a/arch/arm/mach-mx3/cpu.c b/arch/arm/mach-mx3/cpu.c
index 161dfff..db7af50 100644
--- a/arch/arm/mach-mx3/cpu.c
+++ b/arch/arm/mach-mx3/cpu.c
@@ -25,15 +25,15 @@ struct mx3_cpu_type {
};
static struct mx3_cpu_type mx31_cpu_type[] __initdata = {
- { .srev = 0x00, .name = "i.MX31(L)", .v = "1.0", .rev = CHIP_REV_1_0 },
- { .srev = 0x10, .name = "i.MX31", .v = "1.1", .rev = CHIP_REV_1_1 },
- { .srev = 0x11, .name = "i.MX31L", .v = "1.1", .rev = CHIP_REV_1_1 },
- { .srev = 0x12, .name = "i.MX31", .v = "1.15", .rev = CHIP_REV_1_1 },
- { .srev = 0x13, .name = "i.MX31L", .v = "1.15", .rev = CHIP_REV_1_1 },
- { .srev = 0x14, .name = "i.MX31", .v = "1.2", .rev = CHIP_REV_1_2 },
- { .srev = 0x15, .name = "i.MX31L", .v = "1.2", .rev = CHIP_REV_1_2 },
- { .srev = 0x28, .name = "i.MX31", .v = "2.0", .rev = CHIP_REV_2_0 },
- { .srev = 0x29, .name = "i.MX31L", .v = "2.0", .rev = CHIP_REV_2_0 },
+ { .srev = 0x00, .name = "i.MX31(L)", .v = "1.0", .rev = MX3x_CHIP_REV_1_0 },
+ { .srev = 0x10, .name = "i.MX31", .v = "1.1", .rev = MX3x_CHIP_REV_1_1 },
+ { .srev = 0x11, .name = "i.MX31L", .v = "1.1", .rev = MX3x_CHIP_REV_1_1 },
+ { .srev = 0x12, .name = "i.MX31", .v = "1.15", .rev = MX3x_CHIP_REV_1_1 },
+ { .srev = 0x13, .name = "i.MX31L", .v = "1.15", .rev = MX3x_CHIP_REV_1_1 },
+ { .srev = 0x14, .name = "i.MX31", .v = "1.2", .rev = MX3x_CHIP_REV_1_2 },
+ { .srev = 0x15, .name = "i.MX31L", .v = "1.2", .rev = MX3x_CHIP_REV_1_2 },
+ { .srev = 0x28, .name = "i.MX31", .v = "2.0", .rev = MX3x_CHIP_REV_2_0 },
+ { .srev = 0x29, .name = "i.MX31L", .v = "2.0", .rev = MX3x_CHIP_REV_2_0 },
};
void __init mx31_read_cpu_rev(void)
@@ -41,7 +41,7 @@ void __init mx31_read_cpu_rev(void)
u32 i, srev;
/* read SREV register from IIM module */
- srev = __raw_readl(IO_ADDRESS(IIM_BASE_ADDR + MXC_IIMSREV));
+ srev = __raw_readl(MX31_IO_ADDRESS(MX31_IIM_BASE_ADDR + MXC_IIMSREV));
for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
if (srev == mx31_cpu_type[i].srev) {
diff --git a/arch/arm/plat-mxc/include/mach/mx3x.h b/arch/arm/plat-mxc/include/mach/mx3x.h
index 581db46..d1bd26d 100644
--- a/arch/arm/plat-mxc/include/mach/mx3x.h
+++ b/arch/arm/plat-mxc/include/mach/mx3x.h
@@ -240,7 +240,7 @@
#define MX3x_PROD_SIGNATURE 0x1 /* For MX31 */
-/* silicon revisions specific to i.MX31 */
+/* silicon revisions specific to i.MX31 and i.MX35 */
#define MX3x_CHIP_REV_1_0 0x10
#define MX3x_CHIP_REV_1_1 0x11
#define MX3x_CHIP_REV_1_2 0x12
@@ -397,19 +397,6 @@ static inline int mx35_revision(void)
#define MXC_INT_EXT_WDOG MX3x_INT_EXT_WDOG
#define MXC_INT_EXT_TV MX3x_INT_EXT_TV
#define PROD_SIGNATURE MX3x_PROD_SIGNATURE
-#define CHIP_REV_1_0 MX3x_CHIP_REV_1_0
-#define CHIP_REV_1_1 MX3x_CHIP_REV_1_1
-#define CHIP_REV_1_2 MX3x_CHIP_REV_1_2
-#define CHIP_REV_1_3 MX3x_CHIP_REV_1_3
-#define CHIP_REV_2_0 MX3x_CHIP_REV_2_0
-#define CHIP_REV_2_1 MX3x_CHIP_REV_2_1
-#define CHIP_REV_2_2 MX3x_CHIP_REV_2_2
-#define CHIP_REV_2_3 MX3x_CHIP_REV_2_3
-#define CHIP_REV_3_0 MX3x_CHIP_REV_3_0
-#define CHIP_REV_3_1 MX3x_CHIP_REV_3_1
-#define CHIP_REV_3_2 MX3x_CHIP_REV_3_2
-#define SYSTEM_REV_MIN MX3x_SYSTEM_REV_MIN
-#define SYSTEM_REV_NUM MX3x_SYSTEM_REV_NUM
#endif
#endif /* ifndef __MACH_MX3x_H__ */
--
1.7.2.3
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply related
* [PATCH v6 3/3] OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3
From: Guruswamy Senthilvadivu @ 2010-10-08 6:44 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
In-Reply-To: <1286520273-4892-3-git-send-email-svadivu@ti.com>
From: Senthilvadivu Guruswamy <svadivu@ti.com>
VRFB is supported only on OMAP2 and OMAP3 platforms. If VRFB rotation is
not supported by the hardware and the user requests VRFB rotation,
print a warning and ignore the request from the user.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
drivers/video/omap2/omapfb/omapfb-main.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index bddfca6..fcd9038 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2198,6 +2198,16 @@ static int omapfb_probe(struct platform_device *pdev)
goto err0;
}
+ /* TODO : Replace cpu check with omap_has_vrfb once HAS_FEATURE
+ * available for OMAP2 and OMAP3
+ */
+ if (def_vrfb && !cpu_is_omap24xx() && !cpu_is_omap34xx()) {
+ def_vrfb = 0;
+ dev_warn(&pdev->dev, "VRFB is not supported in this hardware,"
+ "ignoring the module parameter vrfb=y\n");
+ }
+
+
mutex_init(&fbdev->mtx);
fbdev->dev = &pdev->dev;
--
1.6.3.3
^ permalink raw reply related
* [PATCH v6 2/3] OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
From: Guruswamy Senthilvadivu @ 2010-10-08 6:44 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
In-Reply-To: <1286520273-4892-2-git-send-email-svadivu@ti.com>
From: Senthilvadivu Guruswamy <svadivu@ti.com>
config VRFB should depend on ARCH_OMAP2 or ARCH_OMAP3.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
drivers/video/omap2/omapfb/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 43496d6..65149b2 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -3,7 +3,7 @@ menuconfig FB_OMAP2
depends on FB && OMAP2_DSS
select OMAP2_VRAM
- select OMAP2_VRFB
+ select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
--
1.6.3.3
^ permalink raw reply related
* [PATCH v6 1/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
From: Guruswamy Senthilvadivu @ 2010-10-08 6:44 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
In-Reply-To: <1286520273-4892-1-git-send-email-svadivu@ti.com>
From: Senthilvadivu Guruswamy <svadivu@ti.com>
FB_OMAP2 can work without VRFB, but currently does not build. Fix this.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
arch/arm/plat-omap/include/plat/vrfb.h | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/vrfb.h b/arch/arm/plat-omap/include/plat/vrfb.h
index d8a03ce..3792bde 100644
--- a/arch/arm/plat-omap/include/plat/vrfb.h
+++ b/arch/arm/plat-omap/include/plat/vrfb.h
@@ -35,6 +35,7 @@ struct vrfb {
bool yuv_mode;
};
+#ifdef CONFIG_OMAP2_VRFB
extern int omap_vrfb_request_ctx(struct vrfb *vrfb);
extern void omap_vrfb_release_ctx(struct vrfb *vrfb);
extern void omap_vrfb_adjust_size(u16 *width, u16 *height,
@@ -47,4 +48,19 @@ extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
extern int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot);
extern void omap_vrfb_restore_context(void);
+#else
+static inline int omap_vrfb_request_ctx(struct vrfb *vrfb) { return 0; }
+static inline void omap_vrfb_release_ctx(struct vrfb *vrfb) {}
+static inline void omap_vrfb_adjust_size(u16 *width, u16 *height,
+ u8 bytespp) {}
+static inline u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp)
+ { return 0; }
+static inline u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp)
+ { return 0; }
+static inline void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
+ u16 width, u16 height, unsigned bytespp, bool yuv_mode) {}
+static inline int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot)
+ { return 0; }
+static inline void omap_vrfb_restore_context(void) {}
+#endif
#endif /* __VRFB_H */
--
1.6.3.3
^ permalink raw reply related
* [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
From: Guruswamy Senthilvadivu @ 2010-10-08 6:44 UTC (permalink / raw)
To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy
From: Senthilvadivu Guruswamy <svadivu@ti.com>
The changelog till v6 are:
- Address Multi-omap build issue
- Added a check to warn the wrong usage of vrfb
in non-vrfb omap devices.
- The patch subject is as per the naming conventions
- patch 2/3 now has the changes in omap2/omapfb/Kconfig
instead of omap2/Kconfig. The functional effect remains
the same, and the place of implementation is more appropriate.
- Provide details of non-vrfb devices in commit description in patch 3/3
- Removed extra paranthesis in cpu checks
Senthilvadivu Guruswamy (3):
OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3
arch/arm/plat-omap/include/plat/vrfb.h | 16 ++++++++++++++++
drivers/video/omap2/omapfb/Kconfig | 2 +-
drivers/video/omap2/omapfb/omapfb-main.c | 10 ++++++++++
3 files changed, 27 insertions(+), 1 deletions(-)
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.