[oe-commits] org.oe.dev merge of '0ab238b94b1334bafe81ee7d6a1453fef174daef'

oe commit openembedded-commits at lists.openembedded.org
Mon Feb 18 16:46:43 UTC 2008


merge of '0ab238b94b1334bafe81ee7d6a1453fef174daef'
     and '706fd42c80157eab994b346e94eaa415faff2486'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e5cf611328b8e10d98d8b86e000fd32381ec401c
ViewMTN: http://monotone.openembedded.org/revision/info/e5cf611328b8e10d98d8b86e000fd32381ec401c
Files:
1
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/xorg-lib/libxcalibrate
packages/xorg-lib/libxcalibrate/coords.patch
packages/xorg-proto/calibrateproto
packages/xorg-proto/calibrateproto/coords.patch
packages/amule
packages/amule/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/preferred-xorg-versions-X11R7.0.inc
conf/distro/include/preferred-xorg-versions-X11R7.1.inc
conf/distro/include/preferred-xorg-versions-X11R7.2.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
conf/distro/include/preferred-xorg-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/gtk-webcore/osb-nrcore.inc
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/xorg-lib/libxcalibrate_git.bb
packages/xorg-proto/calibrateproto_git.bb
Diffs:

#
# mt diff -r0ab238b94b1334bafe81ee7d6a1453fef174daef -re5cf611328b8e10d98d8b86e000fd32381ec401c
#
# 
# 
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
#  from [bee779cc4c4133738b9494b780167ddb0d0d99d9]
#    to [3665eb673cea6a75e2df36a17daa87464aeb50c4]
# 
============================================================
--- packages/maemo4/osso-gnome-vfs2_2.16.3.bb	bee779cc4c4133738b9494b780167ddb0d0d99d9
+++ packages/maemo4/osso-gnome-vfs2_2.16.3.bb	3665eb673cea6a75e2df36a17daa87464aeb50c4
@@ -6,12 +6,13 @@ PR = "r0"
 
 PR = "r0"
 
+inherit gnome
+
 SRC_URI = "\
   http://repository.maemo.org/pool/maemo4.0/free/source/o/${PN}/${PN}_${PV}-1osso31.tar.gz \
   file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0 \
   "
 
-inherit gnome
 
 EXTRA_OECONF = " \
 	--disable-openssl \


#
# mt diff -r706fd42c80157eab994b346e94eaa415faff2486 -re5cf611328b8e10d98d8b86e000fd32381ec401c
#
# 
# 
# delete "packages/xorg-lib/libxcalibrate"
# 
# delete "packages/xorg-lib/libxcalibrate/coords.patch"
# 
# delete "packages/xorg-proto/calibrateproto"
# 
# delete "packages/xorg-proto/calibrateproto/coords.patch"
# 
# add_dir "packages/amule"
# 
# add_dir "packages/amule/files"
# 
# add_file "packages/amule/amule_2.1.3.bb"
#  content [e94b17ff6a0526951854c033da5fe53b89be7198]
# 
# add_file "packages/amule/files/parser.patch"
#  content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
# 
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch"
#  content [84ca7646072efff95ac1ba21996214de0887506e]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
#    to [dd29a8bfa10a0d3f786220dee4b2c942deb59552]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.0.inc"
#  from [e17d1ac473c7551aa878a4025a0c72d1299ddee1]
#    to [0414701d17a1c2f342d391ce49ccd43dbdf2f92d]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.1.inc"
#  from [22d02a23b97d863397deca71f6cf47ac842a3041]
#    to [be10d29bb8807639b7ec4fff641a33f48a5d33fb]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.2.inc"
#  from [e56e290af0c2177e02d83403e1a8719853127dba]
#    to [554e0995c7ce93e7c76bf2affe531b1e77fd7e1d]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
#  from [f0d0e9e8047b09eef4e513465a8e27652b9757d0]
#    to [5f058c2bfda8331944c60e4241fb698a16acae65]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
#  from [2bd8404a566895df3ee956c8fec2fb169386ffc9]
#    to [1c80460587c91260a4733ef34bf4747aef7fc19b]
# 
# patch "conf/distro/include/preferred-xorg-versions.inc"
#  from [defa236a54b9b69361fb032b1fe6ec8b63cdc8e4]
#    to [20bb18b5b3e0c5b530f74f5b0d3b9b050fcf972c]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d864a60f9ae785c0ec3e27ce5ea71dacd656d7de]
#    to [6b2a26a18e48d1ec0eaba9df63011adb83768109]
# 
# patch "packages/gtk-webcore/osb-nrcore.inc"
#  from [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
#    to [a81dab6970cf3f620379e415339da87027c19963]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
#  from [31fbac69083a743610a7b45b209c1eedf231ea8f]
#    to [226e96adfe6504d2b1c198a787fe70f46c3a0b67]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [f9f0f5550a035d11532343bcf6adeddd9141aacb]
#    to [ec0ab967eff58b5d646241e714a9e0f0ee02b8fa]
# 
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
#  from [71c60d4143f978557ba0717399bc7cc3c0c139b4]
#    to [b1d251def3d0ffe97b8aa186ac96c852061db329]
# 
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
#    to [c65b7970a1e647bf8a77f9cc13d979ea9215072b]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [d0076453dce6a15a60ac441aaedca4b4d35b86da]
#    to [a9d28d2fb58ab00bc0024eb2dc819228bbe6d7ea]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [ac7980a3cabecb85ffc82d86da685f56c1aa8d23]
#    to [90c088b9a606dde51c1eb8148602236bd47b8e9f]
# 
# patch "packages/xorg-lib/libxcalibrate_git.bb"
#  from [0c3313cd068d23c4d45e05f4b6f53a709eafce09]
#    to [df9536d5608ab607d9b6bda50bf32fd193a87a41]
# 
# patch "packages/xorg-proto/calibrateproto_git.bb"
#  from [98eeef1d63972f77c5d646db9e0db9e5b0ebdf7e]
#    to [ed72aebe4fa009216a6b40e35b228cd1d2fd61bb]
# 
============================================================
--- packages/amule/amule_2.1.3.bb	e94b17ff6a0526951854c033da5fe53b89be7198
+++ packages/amule/amule_2.1.3.bb	e94b17ff6a0526951854c033da5fe53b89be7198
@@ -0,0 +1,25 @@
+DESCRIPTION = "aMule is an eMule-like client for the eD2k \
+and Kademlia networks, supporting multiple platforms."
+HOMEPAGE = "http://www.amule.org"
+LICENSE = "GPL"
+SECTION = "web"
+PRIORITY = "optional"
+DEPENDS = "wxbase"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \
+           file://parser.patch;patch=1"
+
+S = "${WORKDIR}/aMule-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-amulecmd \
+                --enable-webserver \
+		--disable-monolithic \
+		--enable-amule-daemon \
+		--disable-nls"
+#		--enable-optimize"
+
+FILES_${PN} += " \
+        ${libdir}/xchat"
============================================================
--- packages/amule/files/parser.patch	aa35fa9621c341aaf36abdc4f0a42887e4e6e384
+++ packages/amule/files/parser.patch	aa35fa9621c341aaf36abdc4f0a42887e4e6e384
@@ -0,0 +1,20 @@
+diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp
+--- aMule-2.1.0_orig/src/Parser.cpp	2005-12-20 05:13:25.000000000 +0100
++++ aMule-2.1.0/src/Parser.cpp	2006-01-29 15:16:45.000000000 +0100
+@@ -203,14 +203,14 @@
+ #   define YYMALLOC malloc
+ #   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifndef YYFREE
+ #   define YYFREE free
+ #   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+-void free (void *); /* INFRINGES ON USER NAME SPACE */
++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifdef __cplusplus
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch	84ca7646072efff95ac1ba21996214de0887506e
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch	84ca7646072efff95ac1ba21996214de0887506e
@@ -0,0 +1,1807 @@
+diff -urN linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts	2008-02-18 16:39:43.000000000 +0100
+@@ -36,6 +36,12 @@
+ 		device_type = "memory";
+ 		reg = <00000000 08000000>;	// 128MB at 0
+ 	};
++	
++	nand0 {
++		device_type = "nand";
++		compatible = "fsl-nand";
++		reg = <e2800000 00000200>;
++	};
+ 
+ 	soc8313 at e0000000 {
+ 		#address-cells = <1>;
+@@ -177,6 +183,16 @@
+ 			reg = <700 100>;
+ 			device_type = "ipic";
+ 		};
++
++		elbc at 5000 {
++			device_type = "elbc";
++			compatible = "fsl-elbc";
++			reg = <5000 1000>;
++			interrupts = <4d 8>;
++			interrupt-parent = < &ipic >;
++			allow-direct-device-sleep;
++		};
++
+ 	};
+ 
+ 	pci at e0008500 {
+diff -urN linux-2.6.24.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c
+--- linux-2.6.24.orig/arch/powerpc/sysdev/fsl_soc.c	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c	2008-02-18 17:07:57.000000000 +0100
+@@ -6,6 +6,12 @@
+  * 2006 (c) MontaVista Software, Inc.
+  * Vitaly Bordug <vbordug at ru.mvista.com>
+  *
++ * Change log:
++ * Copyright (C) 2006 Freescale Semiconductor, Inc.
++ * 2006: Lo Wilson (r43300 at freescale.com)
++ *	     Added support for Enhanced Local Bus Controller
++ *	     Added support for USB UTMI mode on-chip PHY
++ *
+  * 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 of the  License, or (at your
+@@ -28,6 +34,8 @@
+ #include <linux/fsl_devices.h>
+ #include <linux/fs_enet_pd.h>
+ #include <linux/fs_uart_pd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/fsl_elbc.h>
+ 
+ #include <asm/system.h>
+ #include <asm/atomic.h>
+@@ -671,6 +679,75 @@
+ 
+ arch_initcall(fsl_usb_of_init);
+ 
++static int __init fsl_elbc_of_init(void)
++{
++	struct device_node *np;
++	unsigned int i;
++	struct platform_device *elbc_dev = NULL;
++	struct platform_device *nand_dev = NULL;
++	int ret;
++
++	/* find and register the enhanced local bus controller */
++	for (np = NULL, i = 0;
++	     (np = of_find_compatible_node(np, "elbc", "fsl-elbc")) != NULL;
++	     i++) {
++		struct resource r[2];
++
++		memset(&r, 0, sizeof(r));
++
++		ret = of_address_to_resource(np, 0, &r[0]);
++		if (ret)
++			goto err;
++
++		r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
++		r[1].flags = IORESOURCE_IRQ;
++
++		elbc_dev =
++		    platform_device_register_simple("fsl-elbc", i, r, 2);
++		if (IS_ERR(elbc_dev)) {
++			ret = PTR_ERR(elbc_dev);
++			goto err;
++		}
++	}
++
++	/* find and register NAND memories if the eLBC was found */
++	for (np = NULL, i = 0;
++	     elbc_dev &&
++	     (np = of_find_compatible_node(np, "nand", "fsl-nand")) != NULL;
++	     i++) {
++		struct resource r;
++		struct platform_fsl_nand_chip chip_data;
++
++		memset(&r, 0, sizeof(r));
++		memset(&chip_data, 0, sizeof(chip_data));
++
++		ret = of_address_to_resource(np, 0, &r);
++		if (ret)
++			goto err;
++
++		nand_dev =
++		    platform_device_register_simple("fsl-nand", i, &r, 1);
++		if (IS_ERR(nand_dev)) {
++			ret = PTR_ERR(nand_dev);
++			goto err;
++		}
++
++		chip_data.name = of_get_property(np, "name", NULL);
++		chip_data.partitions_str = of_get_property(np, "partitions", NULL);
++
++		ret = platform_device_add_data(nand_dev, &chip_data,
++					sizeof(struct platform_fsl_nand_chip));
++		if (ret)
++			goto err;
++	}
++	return 0;
++
++err:
++	return ret;
++}
++
++arch_initcall(fsl_elbc_of_init);
++
+ #ifndef CONFIG_PPC_CPM_NEW_BINDING
+ #ifdef CONFIG_CPM2
+ 
+diff -urN linux-2.6.24.orig/drivers/mtd/nand/fsl_elbc.c linux-2.6.24/drivers/mtd/nand/fsl_elbc.c
+--- linux-2.6.24.orig/drivers/mtd/nand/fsl_elbc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.24/drivers/mtd/nand/fsl_elbc.c	2008-02-18 17:08:08.000000000 +0100
+@@ -0,0 +1,1324 @@
++/* linux/drivers/mtd/nand/fsl_elbc.c
++ *
++ * Copyright (C) 2006 Freescale Semiconductor, Inc.
++ *
++ * Freescale Enhanced Local Bus Controller NAND driver
++ *
++ * Author: Nick Spence <Nick.Spence at freescale.com>
++ * Maintainer: Tony Li <Tony.Li at freescale.com>
++ *
++ * Changelog:
++ *      2006-12 Tony Li <Tony.Li at freescale.com>
++ *              Adopt to MPC8313ERDB board
++ *
++ * 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 of the License, 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.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++
++//#ifdef CONFIG_MTD_NAND_DEBUG
++//#define DEBUG
++//#endif
++//#define DEBUG
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/ioport.h>
++#include <linux/platform_device.h>
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/interrupt.h>
++#include <linux/device.h>
++#include <linux/fsl_devices.h>
++
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/nand_ecc.h>
++#include <linux/mtd/partitions.h>
++
++#include <asm/io.h>
++#include <linux/mtd/fsl_elbc.h>
++
++#define PFX "fsl-elbc: "
++
++#undef CFG_FCM_DEBUG
++#define CFG_FCM_DEBUG_LVL 3
++#ifdef CFG_FCM_DEBUG
++static int fcm_debug_level = CFG_FCM_DEBUG_LVL;
++#define FCM_DEBUG(n, args...)			\
++	do {					\
++		if (n <= fcm_debug_level)	\
++			printk(args);		\
++	} while(0)
++#else /* CONFIG_FCM_DEBUG */
++#define FCM_DEBUG(n, args...) do { } while(0)
++#endif
++
++#define FCM_SIZE (8 * 1024)
++
++#define MAX_BANKS (8)
++
++/* use interrupt instead of busy waiting TODO */
++#define FCM_USE_INTERRUPT
++
++#define MIN(x, y)		((x < y) ? x : y)
++
++#define ERR_BYTE 0xFF	/* Value returned for read bytes when read failed */
++
++#define FCM_TIMEOUT_MSECS 100 /* Maximum number of mSecs to wait for FCM */
++
++
++
++struct fsl_elbc_ctrl;
++
++/* mtd information per set */
++
++struct fsl_elbc_mtd {
++	struct mtd_info		mtd;
++	struct nand_chip	chip;
++	struct platform_fsl_nand_chip pl_chip;
++	struct fsl_elbc_ctrl	*ctrl;
++
++	struct device		*device;
++//	int			nr_chips;       /* Number of chips in set    */
++//	int			nr_partitions;  /* Number of partitions or 0 */
++	char			*name;          /* Name of set (optional)    */
++	int			*nr_map;        /* Physical chip num (option)*/
++//	struct mtd_partition	*partitions;    /* MTD partition list (option*/
++//	struct nand_ecclayout   *ecclayout;
++	unsigned int		options;
++	struct resource		*area;
++	int			bank;	/* Chip select bank number           */
++	unsigned int		pbase;	/* Chip select base physical address */
++	unsigned int		vbase;	/* Chip select base virtual address  */
++	int			pgs;	/* NAND page size (0=512, 1=2048)    */
++	unsigned int		fmr;	/* FCM Flash Mode Register value     */
++};
++
++/* overview of the fsl elbc controller */
++
++struct fsl_elbc_ctrl {
++	struct nand_hw_control		controller;
++	struct fsl_elbc_mtd		*nmtd[MAX_BANKS];
++
++	/* device info */
++	atomic_t	childs_active;
++	struct device	*device;
++	struct resource	*area;
++	lbus83xx_t	*regs;
++	int		irq;
++	wait_queue_head_t irq_wait;
++	unsigned int	irq_status; /* status read from LTESR by irq handler */
++	u_char	       *addr;       /* Address of assigned FCM buffer        */
++	unsigned int	page;       /* Last page written to / read from      */
++	unsigned int	read_bytes; /* Number of bytes read during command   */
++	unsigned int	index;      /* Pointer to next byte to 'read'        */
++	unsigned int	status;     /* status read from LTESR after last op  */
++	int		oobbuf;     /* Pointer to OOB block                  */
++	unsigned int	mdr;        /* UPM/FCM Data Register value           */
++	unsigned int	use_mdr;    /* Non zero if the MDR is to be set      */
++};
++
++struct fsl_elbc_ctrl elbc_ctrl;
++
++/* These map to the positions used by the FCM hardware ECC generator */
++
++/* Small Page FLASH with FMR[ECCM] = 0 */
++static struct nand_ecclayout fsl_elbc_oob_sp_eccm0 = { /* TODO */
++//TODO	.useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++	.eccbytes = 3,
++	.eccpos = {6, 7, 8},
++	.oobfree = { {0, 5}, {9, 7} }
++};
++
++/* Small Page FLASH with FMR[ECCM] = 1 */
++static struct nand_ecclayout fsl_elbc_oob_sp_eccm1 = { /* TODO */
++//TODO	.useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++	.eccbytes = 3,
++	.eccpos = {8, 9, 10},
++	.oobfree = { {0, 5}, {6, 2}, {11, 5} }
++};
++
++/* Large Page FLASH with FMR[ECCM] = 0 */
++static struct nand_ecclayout fsl_elbc_oob_lp_eccm0 = {
++//TODO	.useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++	.eccbytes = 12,
++	.eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56},
++	.oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} }
++};
++
++/* Large Page FLASH with FMR[ECCM] = 1 */
++static struct nand_ecclayout fsl_elbc_oob_lp_eccm1 = {
++//TODO	.useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++	.eccbytes = 12,
++	.eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58},
++	.oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} }
++};
++
++/*=================================*/
++
++/*
++ * Set up the FCM hardware block and page address fields, and the fcm
++ * structure addr field to point to the correct FCM buffer in memory
++ */
++static void set_addr(struct mtd_info *mtd, int column, int page_addr, int oob)
++{
++	struct nand_chip *chip = mtd->priv;
++	struct fsl_elbc_mtd *nmtd = chip->priv;
++	struct fsl_elbc_ctrl *ctrl = nmtd->ctrl;
++	volatile lbus83xx_t *lbc = ctrl->regs;
++	int buf_num;
++
++	ctrl->page = page_addr;
++
++	lbc->fbar = page_addr >> (chip->phys_erase_shift - chip->page_shift);
++	if (nmtd->pgs) {
++		lbc->fpar = ((page_addr << FPAR_LP_PI_SHIFT) & FPAR_LP_PI) |
++			    ( oob ? FPAR_LP_MS : 0) |
++			      column;
++		buf_num = (page_addr & 1) << 2;
++	} else {
++		lbc->fpar = ((page_addr << FPAR_SP_PI_SHIFT) & FPAR_SP_PI) |
++			    ( oob ? FPAR_SP_MS : 0) |
++			      column;
++		buf_num = page_addr & 7;
++	}
++	ctrl->addr = (unsigned char*)(nmtd->vbase + (b%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list