[oe-commits] org.oe.dev merge of '1af32cac223255a8b64acab6e9b8aa5a8c5f3142'

ifaistos commit oe at amethyst.openembedded.net
Sat Mar 29 12:07:50 UTC 2008


merge of '1af32cac223255a8b64acab6e9b8aa5a8c5f3142'
     and '1d205cceb88799688dad02620d65bb08678fccd9'

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 6ed033b5ebd18217b767c79c336455c89d8808cd
ViewMTN: http://monotone.openembedded.org/revision/info/6ed033b5ebd18217b767c79c336455c89d8808cd
Files:
1
packages/mamona/bash-noemu-3.2
packages/mamona/binutils-noemu-2.17.50.0.5
packages/mamona/gcc-noemu-4.1.1
packages/opkg/files
packages/popt/popt-1.13
packages/mamona/bash-noemu_3.2.bb
packages/mamona/binutils-noemu_2.17.50.0.5.bb
packages/mamona/gcc-noemu_4.1.1.bb
packages/mamona/gcc-package-noemu.inc
packages/opkg/files/fix_endianness.patch
packages/popt/popt-1.13/iconv.patch
packages/inetutils/inetutils_1.5.bb
packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch
packages/linux/linux_2.6.24.bb
packages/opkg/opkg.inc
packages/opkg/opkg_svn.bb
packages/popt/popt_1.13.bb
packages/slugos-init/files/modulefunctions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_4.8.bb
Diffs:

#
# mt diff -r1af32cac223255a8b64acab6e9b8aa5a8c5f3142 -r6ed033b5ebd18217b767c79c336455c89d8808cd
#
#
# no changes
#


#
# mt diff -r1d205cceb88799688dad02620d65bb08678fccd9 -r6ed033b5ebd18217b767c79c336455c89d8808cd
#
#
#
# add_dir "packages/mamona/bash-noemu-3.2"
# 
# add_dir "packages/mamona/binutils-noemu-2.17.50.0.5"
# 
# add_dir "packages/mamona/gcc-noemu-4.1.1"
# 
# add_dir "packages/opkg/files"
# 
# add_dir "packages/popt/popt-1.13"
# 
# add_file "packages/mamona/bash-noemu_3.2.bb"
#  content [1540a1b530abf247e26dc00b255bf6b8637cad93]
# 
# add_file "packages/mamona/binutils-noemu_2.17.50.0.5.bb"
#  content [0a1681bf30546f26f0bbc29b2d3c58c5bb8aa697]
# 
# add_file "packages/mamona/gcc-noemu_4.1.1.bb"
#  content [dc3263b777d13c96bbbc5e84cce9c50c9bec22a9]
# 
# add_file "packages/mamona/gcc-package-noemu.inc"
#  content [a2000c1ed55ac1ed191d55172369e36677df3394]
# 
# add_file "packages/opkg/files/fix_endianness.patch"
#  content [23247e2463410079a8e2917268896a027ddff8eb]
# 
# add_file "packages/popt/popt-1.13/iconv.patch"
#  content [23d54fbb7fb516c0d61f621ae838e276e4208a89]
# 
# patch "packages/inetutils/inetutils_1.5.bb"
#  from [dfddc68af03f52a9106590446cca1d62313b47dc]
#    to [b091ad6ef3df62507494fcddec1dd5c03aa1038d]
# 
# patch "packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch"
#  from [cb7ada70375fee5379806c648aaf22a17737b16d]
#    to [a001854cf3bea54c80b2dcd094dae117725419f5]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [3a65f5f434a205d1dd49627ecc559afbd538e97d]
#    to [4eabbe972f1ffeca4ea26e4d897079e1542a5624]
# 
# patch "packages/opkg/opkg.inc"
#  from [aedace2858631d4fe546f63c2d9af393d084cc49]
#    to [5c3ab08666eb88caab81d54be9c9b289acf76fc4]
# 
# patch "packages/opkg/opkg_svn.bb"
#  from [1437c9d20a4c285cd41b72cab5fb7823cad37584]
#    to [bc27245782ad8e3348db57c3d14c9e75b4f1b404]
# 
# patch "packages/popt/popt_1.13.bb"
#  from [db37282a2a969d0043017d2270519e9e2551fc32]
#    to [03a1f329b8652f9c5184cc7433ba07a16a0a1400]
# 
# patch "packages/slugos-init/files/modulefunctions"
#  from [7ffd6c95d6a361b24b12da8f5bae1e016237a845]
#    to [67adae1c30b980d41ab5e522a495c2850348bded]
# 
# patch "packages/slugos-init/files/turnup"
#  from [9b5fe01bdf98e32a3d849b4f44d57f5329ac5862]
#    to [7f0ad6124d8e29ed12f05fadc80d7688678b8652]
# 
# patch "packages/slugos-init/slugos-init_4.8.bb"
#  from [3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3]
#    to [d527fb3796c109605dc769795fc18fb7f0c2e066]
#
============================================================
--- packages/mamona/bash-noemu_3.2.bb	1540a1b530abf247e26dc00b255bf6b8637cad93
+++ packages/mamona/bash-noemu_3.2.bb	1540a1b530abf247e26dc00b255bf6b8637cad93
@@ -0,0 +1,29 @@
+require ../bash/bash.inc
+PR = "r1"
+
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+           file://001-005.patch;patch=1"
+
+S = "${WORKDIR}/bash-${PV}"
+
+EXTRA_OECONF += "--enable-static-link --without-bash-malloc"
+
+#HOST_SYS = "${BUILD_SYS}"
+#CONFIG_SITE = ""
+
+do_configure () {
+    export CPP="gcc -E"
+    export CC=gcc
+    export AS=as
+    export LD=ld
+    export CXX=g++ 
+    export AR=ar
+    export OBJCOPY=objcopy 
+    export OBJDUMP=objdump 
+    export RANLIB=ranlib 
+    export NM=nm 
+    export STRIP=strip
+    export CFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+    export CXXFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden"
+    oe_runconf
+}
============================================================
--- packages/mamona/binutils-noemu_2.17.50.0.5.bb	0a1681bf30546f26f0bbc29b2d3c58c5bb8aa697
+++ packages/mamona/binutils-noemu_2.17.50.0.5.bb	0a1681bf30546f26f0bbc29b2d3c58c5bb8aa697
@@ -0,0 +1,32 @@
+require ../binutils/binutils.inc
+
+PR = "r1"
+
+SRC_URI = \
+    "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+     file://binutils-configure-texinfo-version.patch;patch=1 \
+     file://110-arm-eabi-conf.patch;patch=1 \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
+     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     "
+
+EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+		--program-prefix=${TARGET_PREFIX} --disable-shared"
+
+HOST_SYS = "${BUILD_SYS}"
+
+do_configure () {
+    CC=gcc AS=as LD=ld CXX=g++ AR=ar OBJCOPY=objcopy OBJDUMP=objdump RANLIB=ranlib NM=nm STRIP=strip oe_runconf
+}
+
+do_compile() {
+    make configure-host
+    make LDFLAGS=\"-all-static\"
+}
+
+do_stage() {
+    :
+}
============================================================
--- packages/mamona/gcc-noemu_4.1.1.bb	dc3263b777d13c96bbbc5e84cce9c50c9bec22a9
+++ packages/mamona/gcc-noemu_4.1.1.bb	dc3263b777d13c96bbbc5e84cce9c50c9bec22a9
@@ -0,0 +1,82 @@
+PR = "r14"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+
+inherit autotools gettext
+
+require gcc-package-noemu.inc
+
+SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
+	file://100-uclibc-conf.patch;patch=1 \
+	file://110-arm-eabi.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://300-libstdc++-pic.patch;patch=1 \
+	file://301-missing-execinfo_h.patch;patch=1 \
+	file://302-c99-snprintf.patch;patch=1 \
+	file://303-c99-complex-ugly-hack.patch;patch=1 \
+	file://304-index_macro.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://740-sh-pr24836.patch;patch=1 \
+	file://800-arm-bigendian.patch;patch=1 \
+	file://801-arm-bigendian-eabi.patch;patch=1 \
+	file://arm-nolibfloat.patch;patch=1 \
+	file://arm-softfloat.patch;patch=1 \
+	file://gcc41-configure.in.patch;patch=1 \
+	file://arm-thumb.patch;patch=1 \
+	file://arm-thumb-cache.patch;patch=1 \
+	file://ldflags.patch;patch=1 \
+	file://cse.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
+	file://unbreak-armv4t.patch;patch=1 \
+        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+        file://gcc-4.1.1-pr13685-1.patch;patch=1 \
+        file://gcc-ignore-cache.patch;patch=1 \
+	"
+
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+#This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc
+#the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
+                         file://ppc-sfp-long-double-gcc411-7.patch;patch=1 "
+
+
+#Set the fortran bits
+# 'fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
+HAS_GFORTRAN = "no"
+HAS_G2C = "no"
+
+#Set the java bits
+JAVA_arm = ""
+JAVA = ""
+
+LANGUAGES = "c,c++${FORTRAN}${JAVA}"
+require packages/gcc/gcc-${PV}.inc
+
+EXTRA_OECONF += "--disable-libspp --with-slibdir=\"/lib\""
+
+EXTRA_OEMAKE += "LDFLAGS=\"-static\" build_tooldir=\"${STAGING_DIR}/${TARGET_SYS}\""
+
+HOST_SYS = ${BUILD_SYS}
+
+CONFIG_SITE=""
+
+do_configure () {
+    export CPP="gcc -E"
+    export CC=gcc
+    export AS=as
+    export LD=ld
+    export CXX=g++ 
+    export AR=ar
+    export OBJCOPY=objcopy 
+    export OBJDUMP=objdump 
+    export RANLIB=ranlib 
+    export NM=nm 
+    export STRIP=strip
+    export CFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+    export CXXFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden"
+    oe_runconf
+}
============================================================
--- packages/mamona/gcc-package-noemu.inc	a2000c1ed55ac1ed191d55172369e36677df3394
+++ packages/mamona/gcc-package-noemu.inc	a2000c1ed55ac1ed191d55172369e36677df3394
@@ -0,0 +1,126 @@
+gcclibdir ?= "${libdir}/gcc"
+BINV ?= "${PV}"
+
+PACKAGES = "libgcc ${PN} ${PN}-symlinks \
+            g++-noemu g++-noemu-symlinks \
+	    cpp-noemu cpp-noemu-symlinks \
+            g77-noemu g77-noemu-symlinks \
+	    gcov-noemu gcov-noemu-symlinks \
+            libmudflap-noemu libmudflap-noemu-dev \
+	    libstdc++-noemu libg2c-noemu \
+	    libstdc++-noemu-dev libg2c-noemu-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+	       ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+	       ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+	       ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+	       ${gcclibdir}/${TARGET_SYS}/${BINV}/include"
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/gccbug"
+
+FILES_g77-noemu = "${bindir}/${TARGET_PREFIX}g77 \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771"
+FILES_g77-noemu-symlinks = "${bindir}/g77 \
+			    ${bindir}/f77"
+
+FILES_cpp-noemu = "${bindir}/${TARGET_PREFIX}cpp \
+	     ${base_libdir}/cpp"
+FILES_cpp-noemu-symlinks = "${bindir}/cpp"
+
+FILES_gcov-noemu = "${bindir}/${TARGET_PREFIX}gcov"
+FILES_gcov-noemu-symlinks = "${bindir}/gcov"
+
+FILES_libgcc-noemu = "${base_libdir}/libgcc*.so.*"
+FILES_libgcc-noemu-dev = "${base_libdir}/libgcc*.so"
+
+# Called from within gcc-cross, so libdir is set wrong
+FILES_libg2c-noemu = "${target_libdir}/libg2c.so.*"
+FILES_libg2c-noemu-dev = "${libdir}/libg2c.so \
+		    ${libdir}/libg2c.a \
+		    ${libdir}/libfrtbegin.a"
+
+FILES_g++-noemu = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
+FILES_g++-noemu-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+FILES_libstdc++-noemu = "${libdir}/libstdc++.so.*"
+FILES_libstdc++-noemu-dev = "${includedir}/c++/${BINV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_libmudflap-noemu = "${libdir}/libmudflap*.so.*"
+FILES_libmudflap-noemu-dev = "${libdir}/libmudflap*.so \
+                        ${libdir}/libmudflap*.a \
+                        ${libdir}/libmudflap*.a"
+
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
+
+do_install () {
+	autotools_do_install
+
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+
+	# Hack around specs file assumptions
+	test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
+
+	# Using --with-slibdir instead of this hack below..
+	## Move libgcc_s into /lib
+	#mkdir -p ${D}${base_libdir}
+	#mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	#rm -f ${D}${libdir}/libgcc_s.so
+	#ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \
+	#	| tr -s / \
+	#	| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
+	#	      ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so
+
+	# We don't need libtool libraries
+	rm -f ${D}${libdir}/libg2c.la &>/dev/null || true
+
+	# Cleanup manpages..
+	rm -rf ${D}${mandir}/man7
+
+	# We use libiberty from binutils
+	rm -f ${D}${libdir}/libiberty.a
+
+	cd ${D}${bindir}
+
+	# We care about g++ not c++
+	rm -f *c++
+
+	# We don't care about the gcc-<version> ones for this
+	rm -f *gcc-?.?*
+
+	# These sometimes show up, they are strange, we remove them
+	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+	# Symlinks so we can use these trivially on the target
+	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g++ g++
+	ln -sf ${TARGET_SYS}-gcc gcc
+	ln -sf g77 f77
+	ln -sf g++ c++
+	ln -sf gcc cc
+	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
+	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
+}
============================================================
--- packages/opkg/files/fix_endianness.patch	23247e2463410079a8e2917268896a027ddff8eb
+++ packages/opkg/files/fix_endianness.patch	23247e2463410079a8e2917268896a027ddff8eb
@@ -0,0 +1,12 @@
+diff -urN opkg.orig/configure.ac opkg/configure.ac
+--- opkg.orig/configure.ac	2008-03-20 13:29:09.000000000 +0100
++++ opkg/configure.ac	2008-03-25 09:39:52.000000000 +0100
+@@ -94,7 +94,7 @@
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+ 
+ # Checks endianness
+-AC_C_BIGENDIAN(ENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
++AC_C_BIGENDIAN(BIGENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
+ AC_SUBST(BIGENDIAN_CFLAGS)
+ 
+ # Don't do annoying tests that don't work when cross-compiling, just trust them.
============================================================
--- packages/popt/popt-1.13/iconv.patch	23d54fbb7fb516c0d61f621ae838e276e4208a89
+++ packages/popt/popt-1.13/iconv.patch	23d54fbb7fb516c0d61f621ae838e276e4208a89
@@ -0,0 +1,13 @@
+Index: popt-1.13/Makefile.am
+===================================================================
+--- popt-1.13.orig/Makefile.am	2008-03-25 21:51:12.000000000 +0100
++++ popt-1.13/Makefile.am	2008-03-25 21:51:42.000000000 +0100
+@@ -39,7 +39,7 @@
+ usrlib_LTLIBRARIES = libpopt.la
+ 
+ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
+-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
++libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+ 
+ if HAVE_LD_VERSION_SCRIPT
+ libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
============================================================
--- packages/inetutils/inetutils_1.5.bb	dfddc68af03f52a9106590446cca1d62313b47dc
+++ packages/inetutils/inetutils_1.5.bb	b091ad6ef3df62507494fcddec1dd5c03aa1038d
@@ -6,7 +6,8 @@ talkd, telnet, telnetd, tftp, tftpd, and
 rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
 talkd, telnet, telnetd, tftp, tftpd, and uucpd."
 
-SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
+"
 
 inherit autotools
 
============================================================
--- packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch	cb7ada70375fee5379806c648aaf22a17737b16d
+++ packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch	a001854cf3bea54c80b2dcd094dae117725419f5
@@ -1,28 +1,68 @@
-diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c linux-2.6.24/drivers/rtc/rtc-sa1100.c
+diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c linux-2.6.24_rtc/drivers/rtc/rtc-sa1100.c
 --- linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c	2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/rtc/rtc-sa1100.c	2008-03-17 20:52:41.000000000 +0100
-@@ -15,6 +15,10 @@
-  * Converted to the RTC subsystem and Driver Model
-  *   by Richard Purdie <rpurdie at rpsys.net>
-  *
-+ * 2008/03/17 mrdata:
-+ *            disable IRQ RTC1Hz and RTCAlrm before request_irq
-+ *            in sa1100_rtc_open()
-+ *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version
-@@ -154,7 +158,12 @@
- static int sa1100_rtc_open(struct device *dev)
++++ linux-2.6.24_rtc/drivers/rtc/rtc-sa1100.c	2008-03-24 13:49:40.000000000 +0100
+@@ -79,7 +79,10 @@
+ 
+ 	rtsr = RTSR;
+ 	/* clear interrupt sources */
+-	RTSR = 0;
++	RTSR &= ~RTSR_HZE; //RTSR = 0; is not possible and does not work
++	RTSR &= ~RTSR_HZ;
++	RTSR &= ~RTSR_ALE;
++	RTSR &= ~RTSR_AL;
+ 	RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2);
+ 
+ 	/* clear alarm interrupt if it has occurred */
+@@ -155,6 +158,20 @@
  {
  	int ret;
--
-+	
+ 
++	/*
++	 * On some devices RTSR is set to some value but it must be set to 0.
++	 * We have to set RTSR to 0 and OIER/OSSR to default. This should not be
++	 * necessary here but it is.
++	 */
 +	spin_lock_irq(&sa1100_rtc_lock);
 +	RTSR &= ~RTSR_HZE;
++	RTSR &= ~RTSR_HZ;
 +	RTSR &= ~RTSR_ALE;
++	RTSR &= ~RTSR_AL;
++	OIER &= ~OIER_E1;
++	OSSR = OSSR_M1;
 +	spin_unlock_irq(&sa1100_rtc_lock);
-+	
++
  	ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
  				"rtc 1Hz", dev);
  	if (ret) {
+@@ -186,7 +203,10 @@
+ static void sa1100_rtc_release(struct device *dev)
+ {
+ 	spin_lock_irq(&sa1100_rtc_lock);
+-	RTSR = 0;
++	RTSR &= ~RTSR_HZE; //RTSR = 0; is not possible and does not work
++	RTSR &= ~RTSR_HZ;
++	RTSR &%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list