[oe-commits] org.oe.dev merge of '0675e9a3e7f3d9faa1311df4548be2e200c02760'
thesing commit
oe at amethyst.openembedded.net
Mon Sep 1 17:53:43 UTC 2008
merge of '0675e9a3e7f3d9faa1311df4548be2e200c02760'
and 'ed7f086a6f3dc6bc06899e467a960cd37d7f2a9c'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 604e4566ff77ba4e877e134951341dca1fbf145e
ViewMTN: http://monotone.openembedded.org/revision/info/604e4566ff77ba4e877e134951341dca1fbf145e
Files:
1
packages/libusb/libusb-compat-0.0.9+0.1.0-beta1
packages/libusb/libusb-compat-0.0.9+0.1.0-beta2
packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb
packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
packages/libusb/libusb1-0.9.0
packages/libusb/libusb1-0.9.2
packages/libusb/libusb1_0.9.0.bb
packages/libusb/libusb1_0.9.2.bb
packages/fontconfig/fontconfig-2.6.0
packages/gsoap/gsoap-native
packages/nandlogical
packages/nandlogical/files
packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
packages/fontconfig/fontconfig-native_2.6.0.bb
packages/fontconfig/fontconfig_2.6.0.bb
packages/gsoap/gsoap-native/use-just-built-binary.patch
packages/nandlogical/files/nandlogical.c
packages/nandlogical/nandlogical_1.0.0.bb
packages/neuros-public/neuros-app-photoalbum_git.bb
packages/neuros-public/neuros-app-vplayer_git.bb
packages/neuros-public/neuros-lib-gui_git.bb
packages/opensync/libopensync-0.36/build-in-src.patch
packages/opensync/libopensync-0.36/cmake.patch
packages/opensync/libopensync-0.36/no-python-check.patch
packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
packages/dgen/dgen-sdl_1.23.bb
packages/ffmpeg/ffmpeg_git.bb
packages/glibc/glibc.inc
packages/glibc/glibc_2.6.1.bb
packages/gsoap/gsoap-native_2.7.7.bb
packages/linux/linux-neuros_git.bb
packages/neuros-pkggen/files/package.c
packages/neuros-pkggen/neuros-pkggen-native.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/nfs-utils/nfs-utils_1.1.2.bb
packages/vlc/vlc-davinci_0.8.6h.bb
packages/kexecboot/files
packages/kexecboot/files/rootdelay.patch
Diffs:
#
# mt diff -r0675e9a3e7f3d9faa1311df4548be2e200c02760 -r604e4566ff77ba4e877e134951341dca1fbf145e
#
#
#
# rename "packages/libusb/libusb-compat-0.0.9+0.1.0-beta1"
# to "packages/libusb/libusb-compat-0.0.9+0.1.0-beta2"
#
# rename "packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb"
# to "packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb"
#
# rename "packages/libusb/libusb1-0.9.0"
# to "packages/libusb/libusb1-0.9.2"
#
# rename "packages/libusb/libusb1_0.9.0.bb"
# to "packages/libusb/libusb1_0.9.2.bb"
#
# add_dir "packages/fontconfig/fontconfig-2.6.0"
#
# add_dir "packages/gsoap/gsoap-native"
#
# add_dir "packages/nandlogical"
#
# add_dir "packages/nandlogical/files"
#
# add_file "packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch"
# content [5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c]
#
# add_file "packages/fontconfig/fontconfig-native_2.6.0.bb"
# content [24c03de8b197db8f1a84eb259d920c904b79f74b]
#
# add_file "packages/fontconfig/fontconfig_2.6.0.bb"
# content [5554f91bd476e11e0bb44b471239d177ef4b0faa]
#
# add_file "packages/gsoap/gsoap-native/use-just-built-binary.patch"
# content [3494a4c5a9654fc35b3d6f43f4b3cf74187df695]
#
# add_file "packages/nandlogical/files/nandlogical.c"
# content [3fd269d18fc80cb452eb8173dfcf8a67228ea72d]
#
# add_file "packages/nandlogical/nandlogical_1.0.0.bb"
# content [08c2eb3a4bb34c4e5c03d312718add26413df421]
#
# add_file "packages/neuros-public/neuros-app-photoalbum_git.bb"
# content [416328da2e90add3a3853d718ccea008eda78656]
#
# add_file "packages/neuros-public/neuros-app-vplayer_git.bb"
# content [299d2a1a69bef11fae99e7febe2ea7a51c2b3dc2]
#
# add_file "packages/neuros-public/neuros-lib-gui_git.bb"
# content [7348c5d289f759314009104632995680329630b8]
#
# add_file "packages/opensync/libopensync-0.36/build-in-src.patch"
# content [f33e99322f9822e3719b7a4a138c733baf5c8409]
#
# add_file "packages/opensync/libopensync-0.36/cmake.patch"
# content [b50f3637f4dd635c1de2fed11af7b8bcb85f29a4]
#
# add_file "packages/opensync/libopensync-0.36/no-python-check.patch"
# content [f04d85e907104ca7e6f381658daf76fb31888385]
#
# patch "packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch"
# from [f5ec6489f490fbe135c91e1d2aa9145eacbabdd6]
# to [8d8a0491ca3bb65bbcb1eba647de9f447ce859c6]
#
# patch "packages/dgen/dgen-sdl_1.23.bb"
# from [a3aecaa526b1fad198c4eeff09990398df3eafbc]
# to [5385ad78b79a29edbb73c8dccd827c3466dc7881]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [ef01666ee577eb22fd1c4f1eeedd7544540df46b]
# to [b95d010568a0ab37a6ab0ef5c267c9d3580ace9d]
#
# patch "packages/glibc/glibc.inc"
# from [616d34fb71075168d558a2c23652b0847b62e379]
# to [2d332284f28dce392d63f89441b2747b62db4751]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [77cf632ae1fc1464c20204d36e370aa655ffa09a]
# to [57bf7eb6dae142987a9e81c5916a9181d7ec554a]
#
# patch "packages/gsoap/gsoap-native_2.7.7.bb"
# from [e2f96667aeea0e85e754378570e59305d6476439]
# to [a137c032ea061e49419203c45e853ea4bd81b14e]
#
# patch "packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb"
# from [eca681d4a91dfb5cb7fa4e2d5326809890304bba]
# to [e5d649a0a56ef19311c60e326a809da275cdba29]
#
# patch "packages/libusb/libusb1_0.9.2.bb"
# from [b413efeaadf36cc125444ba8f9db23c724492158]
# to [daa46b7579d1a354a7b7107c31e52b4629a48180]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [f776e221893fa16a1e86401186421973419fa57e]
# to [c0d3d98cd5c172f91ccbb86f1a5b442cdfd710d6]
#
# patch "packages/neuros-pkggen/files/package.c"
# from [5b9ae408e185322aca1c6b3fb68aa5c38ec7f44a]
# to [cf8bc159d1fc793a93448e82dcc0f69ad8d075a5]
#
# patch "packages/neuros-pkggen/neuros-pkggen-native.bb"
# from [a724aaecd6c0bae0cdcb4a47a1c834877c51045d]
# to [2fb19efa21fb1da401e283f710a450ea60527202]
#
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
# from [066f779d14370cd80cffd7fd784d04df7990a255]
# to [52eb100795eab3da97793d1a0c56f1d37c3cf2d0]
#
# patch "packages/neuros-public/neuros-nwm_git.bb"
# from [8066ae3bdfcaa465ac10245698627f7a5653631c]
# to [69c49f36ea0a2a061449099bf15772969f100cf4]
#
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
# from [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
# to [2e1adba40fc931ff78f3cd1d9c44960eb03eb99a]
#
# patch "packages/nfs-utils/nfs-utils_1.1.2.bb"
# from [c8fc676bb8563f810f362e205ae46c3b75388b51]
# to [1815e0ef2aa6e30bdea10f6313e236b9f67ac58f]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [b6c1bda931bc3931b51360e18ec6341576756a47]
# to [52ee814151b9134b026968bc047921f383abf0a6]
#
============================================================
--- packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
+++ packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}
============================================================
--- packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
+++ packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+ oe_runmake install
+ install fc-lang/fc-lang ${STAGING_BINDIR}
+ install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
============================================================
--- packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
+++ packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
@@ -0,0 +1,76 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+ file://fix-pkgconfig.patch;patch=1"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+ chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+ bb.build.exec_func('base_do_unpack', d)
+ bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/fontconfig
+ for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+ autotools_do_install
+}
+
============================================================
--- packages/gsoap/gsoap-native/use-just-built-binary.patch 3494a4c5a9654fc35b3d6f43f4b3cf74187df695
+++ packages/gsoap/gsoap-native/use-just-built-binary.patch 3494a4c5a9654fc35b3d6f43f4b3cf74187df695
@@ -0,0 +1,19 @@
+---
+ soapcpp2/wsdl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am
++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am
+@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp
+ SOAPHEADER=wsdl.h
+ SOAP_FLAGS=-SC -pwsdl
+ BUILT_SOURCES=$(SOAP_CPP_SRC)
+
+ $(SOAP_CPP_SRC) : $(SOAPHEADER)
+- $(SOAP) $(SOAP_FLAGS) $(SOAPHEADER)
++ ../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER)
+
+ #LIBS=
+
+ bin_PROGRAMS=wsdl2h
+
============================================================
--- packages/nandlogical/files/nandlogical.c 3fd269d18fc80cb452eb8173dfcf8a67228ea72d
+++ packages/nandlogical/files/nandlogical.c 3fd269d18fc80cb452eb8173dfcf8a67228ea72d
@@ -0,0 +1,386 @@
+/*
+ NAND logical utility for Sharp Zaurus SL-C7x0/860/7500/Cxx00
+ version 1.0
+ Copyright 2006 Alexander Chukov <sash at pdaXrom.org>
+
+ 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 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ */
+
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <asm/types.h>
+#include <mtd/mtd-user.h>
+
+int fd;
+
+unsigned char *readbuf;
+unsigned char *oobbuf;
+unsigned long *log2phy;
+
+struct mtd_oob_buf oob = {0, 16, NULL};
+
+struct nand_oobinfo none_oobinfo = {
+ .useecc = MTD_NANDECC_OFF,
+};
+
+#define NAND_LOGICAL_SIZE (7 * 1024 * 1024)
+
+/////////////////////////////////////////////////////////////////////
+// oob structure
+/////////////////////////////////////////////////////////////////////
+
+#define NAND_NOOB_LOGADDR_00 8
+#define NAND_NOOB_LOGADDR_01 9
+#define NAND_NOOB_LOGADDR_10 10
+#define NAND_NOOB_LOGADDR_11 11
+#define NAND_NOOB_LOGADDR_20 12
+#define NAND_NOOB_LOGADDR_21 13
+
+static uint nand_get_logical_no(unsigned char *oob)
+{
+ unsigned short us,bit;
+ int par;
+ int good0, good1;
+
+ if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] &&
+ oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){
+ good0 = NAND_NOOB_LOGADDR_00;
+ good1 = NAND_NOOB_LOGADDR_01;
+ }else
+ if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] &&
+ oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){
+ good0 = NAND_NOOB_LOGADDR_10;
+ good1 = NAND_NOOB_LOGADDR_11;
+ }else
+ if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] &&
+ oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){
+ good0 = NAND_NOOB_LOGADDR_20;
+ good1 = NAND_NOOB_LOGADDR_21;
+ }else{
+ return (uint)-1;
+ }
+
+ us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) |
+ (((unsigned short)(oob[good1]) & 0x00ff) << 8);
+
+ par = 0;
+ for(bit = 0x0001; bit != 0; bit <<= 1){
+ if(us & bit){
+ par++;
+ }
+ }
+ if(par & 1){
+ return (uint)-2;
+ }
+
+ if(us == 0xffff){
+ return 0xffff;
+ }else{
+ return ((us & 0x07fe) >> 1);
+ }
+}
+
+static void nand_set_logical_no(uint log_no, unsigned char *oob)
+{
+ unsigned short us,bit;
+ int par;
+
+ us = (((log_no & 0x03ff) << 1) | 0x1000);
+
+ par = 0;
+ for(bit = 0x0001; bit != 0; bit <<= 1){
+ if(us & bit){
+ par++;
+ }
+ }
+ if(par & 1){
+ us |= 0x0001;
+ }
+
+ oob[NAND_NOOB_LOGADDR_00] = (unsigned char)((us & 0x00ff) >> 0);
+ oob[NAND_NOOB_LOGADDR_01] = (unsigned char)((us & 0xff00) >> 8);
+ oob[NAND_NOOB_LOGADDR_10] = oob[NAND_NOOB_LOGADDR_00];
+ oob[NAND_NOOB_LOGADDR_11] = oob[NAND_NOOB_LOGADDR_01];
+ oob[NAND_NOOB_LOGADDR_20] = oob[NAND_NOOB_LOGADDR_00];
+ oob[NAND_NOOB_LOGADDR_21] = oob[NAND_NOOB_LOGADDR_01];
+}
+
+void scan_logical(int blocks, int erasesize)
+{
+ int i;
+ unsigned long offset;
+ int ret = 1;
+ for (i = 0; i < blocks; i++)
+ log2phy[i] = (uint) -1;
+ offset = 0;
+ for (i = 0; i < blocks; i++) {
+ oob.start = offset;
+ ret = ioctl(fd, MEMREADOOB, &oob);
+
+ //ret = nand_read_raw(nand, oobuf, offset, nand->writesize, nand->oobsize);
+ if (!ret) {
+ int log_no = nand_get_logical_no(oobbuf);
+ if (((int)log_no >= 0) && (log_no < blocks)) {
+ log2phy[log_no] = offset;
+ //printf("NAND logical - %08X -> %04X\n", offset, log_no * erasesize);
+ } else {
+ //printf("NAND logical - %08X - skip (%x)\n", offset, log_no);
+ }
+ } else {
+ //printf("NAND logical - offset %x read OOB problem\n", offset);
+ }
+ offset += erasesize;
+ }
+}
+
+unsigned long add_logical(unsigned long ofs, int blocks, int erasesize, int bs)
+{
+ erase_info_t erase;
+ unsigned long offset = 0;
+ int i;
+ int ret;
+
+ erase.length = erasesize;
+
+ for (i = 0; i < blocks; i++) {
+ oob.start = offset;
+ ret = ioctl(fd, MEMREADOOB, &oob);
+
+ if (!ret) {
+ int log_no = nand_get_logical_no(oobbuf);
+
+//printf("-- %x\n", log_no);
+
+ if ((short)log_no == -1) {
+ int j = 0;
+ {
+ loff_t offs = offset;
+ erase.start = offset;
+ int ret = ioctl(fd, MEMGETBADBLOCK, &offs);
+ if (ret > 0) {
+ printf ("\nSkipping bad block at 0x%08x\n", erase.start);
+ goto nextblock;
+ } else if (ret < 0) {
+ perror("ioctl(MEMGETBADBLOCK)");
+ exit(1);
+ } else {
+ printf("%x - no bad block\n", offset);
+ }
+
+ if (ioctl(fd, MEMERASE, &erase) != 0) {
+ perror("ioctl(MEMERASE)");
+ goto nextblock;
+ }
+
+ //printf("%x - erased\n", offset);
+
+ }
+
+ //printf("NAND logical - found free block %x, mapped as %x\n", offset, ofs);
+
+ log2phy[ofs / erasesize] = offset;
+
+ return offset;
+ } else {
+ //fprintf(stderr, "found: %x\n", log_no);
+ }
+ } else {
+ perror ("ioctl(MEMREADOOB)");
+ }
+
+ nextblock:
+ offset += erasesize;
+ }
+
+ return (unsigned long)-1;
+}
+
+void usage(void)
+{
+ fprintf(stderr, "Usage:\nnandlogical <mtd char device> READ|WRITE <start> <length> <file>\n");
+ exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+ mtd_info_t meminfo;
+ char *mtddev;
+ int blocks;
+ unsigned long start_addr;
+ unsigned long end_addr;
+ unsigned long length;
+ unsigned long ofs;
+ int bs;
+ int ofd;
+ int func_write = 0;
+ int oobinfochanged = 0;
+ struct nand_oobinfo old_oobinfo;
+
+ if (argc < 6)
+ usage();
+
+ if (strcmp(argv[2], "WRITE") == 0)
+ func_write = 1;
+ else if (strcmp(argv[2], "READ") != 0)
+ usage();
+
+ mtddev = argv[1];
+ start_addr = strtoul(argv[3], NULL, 0);
+ length = strtoul(argv[4], NULL, 0);
+
+ if (func_write) {
+ if ((ofd = open(argv[5], O_RDONLY)) == -1) {
+ perror("open input file");
+ exit(1);
+ }
+ /* Open MTD device */
+ if ((fd = open(mtddev, O_RDWR)) == -1) {
+ perror("open flash");
+ exit (1);
+ }
+ } else {
+ if ((ofd = open(argv[5], O_WRONLY | O_TRUNC | O_CREAT%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -red7f086a6f3dc6bc06899e467a960cd37d7f2a9c -r604e4566ff77ba4e877e134951341dca1fbf145e
#
#
#
# add_dir "packages/kexecboot/files"
#
# add_file "packages/kexecboot/files/rootdelay.patch"
# content [4aac2eeabb2c5f35e3565672496f0a14ddca9c00]
#
============================================================
--- packages/kexecboot/files/rootdelay.patch 4aac2eeabb2c5f35e3565672496f0a14ddca9c00
+++ packages/kexecboot/files/rootdelay.patch 4aac2eeabb2c5f35e3565672496f0a14ddca9c00
@@ -0,0 +1,11 @@
+--- kexecboot-0.3/kexecboot.c 2008-08-03 17:08:31.000000000 +0200
++++ kexecboot/kexecboot.c 2008-08-04 13:35:32.167062391 +0200
+@@ -84,7 +84,7 @@
+ char command[COMMAND_LINE_SIZE + 60];
+ mount(boot->device, "/mnt", boot->fstype, MS_RDONLY, NULL);
+ if( boot->cmdline )
+- sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s\" -l %s",
++ sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s rootdelay=3\" -l %s",
+ boot->cmdline, boot->device, boot->fstype, boot->kernelpath);
+ else
+ sprintf(command,"kexec -l %s", boot->kernelpath);
More information about the Openembedded-commits
mailing list