Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

15 files changed, 48664 insertions, 21 deletions

diff --git a/packages/cmake/cmake-native_2.6.3.bb b/packages/cmake/cmake-native_2.6.3.bb
new file mode 100644
index 0000000000..faf397614b
--- /dev/null
+++ b/packages/cmake/cmake-native_2.6.3.bb
@@ -0,0 +1,11 @@
+inherit native
+require cmake.inc
+
+do_stage() {
+    oe_runmake install
+    autotools_stage_all
+}
+
+do_install() {
+	:
+}
diff --git a/packages/dsplink/gstreamer-ti_svn.bb b/packages/dsplink/gstreamer-ti_svn.bb
index 824bbd21fe..bcfaa3458b 100644
--- a/packages/dsplink/gstreamer-ti_svn.bb
+++ b/packages/dsplink/gstreamer-ti_svn.bb
@@ -4,7 +4,7 @@ SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=
            file://gst-buffsize.diff;patch=1"
 SRCREV = "127"
 
-PR = "r4"
+PR = "r5"
 
 # Again, no '.' in PWD allowed :(
 PV = "0+svnr${SRCREV}"
diff --git a/packages/llvm/llvm-native_2.5.bb b/packages/llvm/llvm-native_2.5.bb
new file mode 100644
index 0000000000..010f49ab32
--- /dev/null
+++ b/packages/llvm/llvm-native_2.5.bb
@@ -0,0 +1,15 @@
+require llvm.inc
+
+SRC_URI = "http://llvm.org/releases/2.5/llvm-${PV}.tar.gz"
+
+inherit native
+
+S = "${WORKDIR}/llvm-${PV}"
+
+do_stage() {
+	install -m 755 ${S}/Release/bin/* ${STAGING_BINDIR_NATIVE}/
+}
+
+do_rm_work() {
+        :
+}
diff --git a/packages/proftpd/files/make.patch b/packages/proftpd/files/make.patch
new file mode 100644
index 0000000000..66ebf2ce89
--- /dev/null
+++ b/packages/proftpd/files/make.patch
@@ -0,0 +1,51 @@
+Index: proftpd-1.3.2/Makefile.in
+===================================================================
+--- proftpd-1.3.2.orig/Makefile.in
++++ proftpd-1.3.2/Makefile.in
+@@ -76,7 +76,6 @@ check: proftpd$(EXEEXT)
+ $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
+ 	@if [ ! -d $@ ]; then \
+ 		mkdir -p $@; \
+-		chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
+ 		chmod 0755 $@; \
+ 	fi
+ 
+@@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
+ 		rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
+ 	fi
+ 	ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
+-	-chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
+ 
+ install-libs: $(DESTDIR)$(libdir)/proftpd
+ 	cd lib/ && $(MAKE) install
+@@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
+ 	$(INSTALL_SBIN) ftpshut  $(DESTDIR)$(sbindir)/ftpshut
+ 	$(INSTALL_BIN)  ftptop   $(DESTDIR)$(bindir)/ftptop
+ 	$(INSTALL_BIN)  ftpwho   $(DESTDIR)$(bindir)/ftpwho
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
++	$(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
+ 
+ install-conf: $(DESTDIR)$(sysconfdir)
+ 	if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
+-		$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
++		$(INSTALL) -m 0644 \
+ 		           $(top_srcdir)/sample-configurations/basic.conf \
+ 	       	           $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
+ 	fi
+Index: proftpd-1.3.2/Make.rules.in
+===================================================================
+--- proftpd-1.3.2.orig/Make.rules.in
++++ proftpd-1.3.2/Make.rules.in
+@@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
+ INSTALL=@INSTALL@
+ INSTALL_USER=@install_user@
+ INSTALL_GROUP=@install_group@
+-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
++INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_MAN=$(INSTALL) -m 0644
+ 
+ RM=rm -f
+ SHELL=/bin/sh
diff --git a/packages/proftpd/proftpd_1.3.2.bb b/packages/proftpd/proftpd_1.3.2.bb
new file mode 100644
index 0000000000..1a9736dbf3
--- /dev/null
+++ b/packages/proftpd/proftpd_1.3.2.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \
+	file://make.patch;patch=1 \
+	"
+
+
+EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes"
+LDFLAGS += "-Llib"
+PARALLEL_MAKE = ""
+
+do_configure () {
+	 ./configure \
+		   --disable-auth-pam \
+                   --build=${BUILD_SYS} \
+                   --host=${HOST_SYS} \
+                   --target=${TARGET_SYS} \
+                   --prefix=/usr \
+		   --sysconfdir=/etc \
+		   --sharedstatedir=/com \
+		   --localstatedir=/var \
+                   ${EXTRA_OECONF} \
+                   $@;
+}
+
+do_install () {
+	oe_runmake DESTDIR=${D} install
+}
+
+pkg_postinst () {
+	# more chown's might be needed
+        chown root:root /usr/sbin/proftpd
+}
diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb
deleted file mode 100644
index bf9d964f99..0000000000
--- a/packages/python/python-coherence_0.6.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
-SECTION = "devel/python"
-LICENSE = "MIT"
-HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r5"
-
-inherit setuptools
-
-SRC_URI = "http://coherence.beebits.net/download/Coherence-${PV}.tar.gz"
-S = "${WORKDIR}/Coherence-${PV}"
-
-FILES_${PN} += "${datadir}"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
-
-
diff --git a/packages/python/python-coherence_0.6.2.bb b/packages/python/python-coherence_0.6.2.bb
index 7d25f0868e..54eed59574 100644
--- a/packages/python/python-coherence_0.6.2.bb
+++ b/packages/python/python-coherence_0.6.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
 SECTION = "devel/python"
 LICENSE = "MIT"
 HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r0"
+PR = "r1"
 
 inherit setuptools
 
@@ -12,6 +12,9 @@ S = "${WORKDIR}/Coherence-${PV}"
 FILES_${PN} += "${datadir}"
 
 DEPENDS = "libxml2 libxml2-native"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
+RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
+	python-configobj python-twisted python-twisted-core python-twisted-protocols python-misc \
+	python-zopeinterface python-modules python-pygobject python-gdata \
+	python-divmodaxiom"
 
 
diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb
index 6beb01f3d6..c1ec7e73b9 100644
--- a/packages/thttpd/thttpd_2.25b.bb
+++ b/packages/thttpd/thttpd_2.25b.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server."
 LICENSE = "BSD"
 HOMEPAGE = "http://www.acme.com/software/thttpd/"
-PR ="r6"
+PR ="r7"
 
 SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \
 	   file://install.patch;patch=1 \
@@ -10,6 +10,8 @@ SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \
 	   file://htpasswd_shared.diff;patch=1"
 S = "${WORKDIR}/thttpd-${PV}"
 
+PARALLEL_MAKE = ""
+
 INITSCRIPT_NAME = "thttpd"
 INITSCRIPT_PARAMS = "defaults"
 
diff --git a/packages/u-boot/u-boot-1.2.0/dm355-leopard.diff b/packages/u-boot/u-boot-1.2.0/dm355-leopard.diff
new file mode 100644
index 0000000000..b614522f42
--- /dev/null
+++ b/packages/u-boot/u-boot-1.2.0/dm355-leopard.diff
@@ -0,0 +1,48455 @@
+ Makefile                                     |   36 
+ board/davinci/Makefile                       |   47 
+ board/davinci/config.mk                      |   27 
+ board/davinci/davinci.c                      |  417 +
+ board/davinci/dm644x_emac.c                  |  491 +
+ board/davinci/dm644x_emac.h                  |  290 
+ board/davinci/flash.c                        |  686 +
+ board/davinci/flash_params.h                 |  319 
+ board/davinci/lowlevel_init.S                |  764 ++
+ board/davinci/nand.c                         |  111 
+ board/davinci/soc.h                          |  339 
+ board/davinci/timer.c                        |   73 
+ board/davinci/timer.h                        |   51 
+ board/davinci/types.h                        |   46 
+ board/davinci/u-boot.lds                     |   52 
+ board/dm355_evm/Makefile                     |   47 
+ board/dm355_evm/config.mk                    |   25 
+ board/dm355_evm/dm355_evm.c                  |  598 +
+ board/dm355_evm/flash.c                      |  758 ++
+ board/dm355_evm/flash_params.h               |  319 
+ board/dm355_evm/lowlevel_init.S              |  766 ++
+ board/dm355_evm/nand.c                       |  805 ++
+ board/dm355_evm/timer.c                      |   72 
+ board/dm355_evm/timer.h                      |   51 
+ board/dm355_evm/types.h                      |   46 
+ board/dm355_evm/u-boot.lds                   |   52 
+ board/dm355_ipnc/Makefile                    |   47 
+ board/dm355_ipnc/config.mk                   |   25 
+ board/dm355_ipnc/dm355_ipnc.c                |  671 +
+ board/dm355_ipnc/flash.c                     |  758 ++
+ board/dm355_ipnc/flash_params.h              |  319 
+ board/dm355_ipnc/lowlevel_init.S             |  766 ++
+ board/dm355_ipnc/nand.c                      |  830 ++
+ board/dm355_ipnc/timer.c                     |   72 
+ board/dm355_ipnc/timer.h                     |   51 
+ board/dm355_ipnc/types.h                     |   46 
+ board/dm355_ipnc/u-boot.lds                  |   52 
+ board/dm355_leopard/Makefile                 |   47 
+ board/dm355_leopard/config.mk                |   25 
+ board/dm355_leopard/dm355_leopard.c          |  671 +
+ board/dm355_leopard/flash.c                  |  758 ++
+ board/dm355_leopard/flash_params.h           |  319 
+ board/dm355_leopard/lowlevel_init.S          |  766 ++
+ board/dm355_leopard/nand.c                   |  830 ++
+ board/dm355_leopard/timer.c                  |   72 
+ board/dm355_leopard/timer.h                  |   51 
+ board/dm355_leopard/types.h                  |   46 
+ board/dm355_leopard/u-boot.lds               |   52 
+ board/dm700/Makefile                         |   47 
+ board/dm700/config.mk                        |   26 
+ board/dm700/davinci_hd.c                     |  203 
+ board/dm700/dm646x_emac.c                    |  506 +
+ board/dm700/dm646x_emac.h                    |  321 
+ board/dm700/flash.c                          |  686 +
+ board/dm700/flash_params.h                   |  319 
+ board/dm700/lowlevel_init.S                  |  725 ++
+ board/dm700/nand.c                           |  111 
+ board/dm700/soc.h                            |  349 +
+ board/dm700/timer.c                          |   73 
+ board/dm700/timer.h                          |   51 
+ board/dm700/types.h                          |   46 
+ board/dm700/u-boot.lds                       |   52 
+ common/cmd_nand.c                            |   11 
+ common/env_nand.c                            |   14 
+ cpu/arm926ejs/config.mk                      |    4 
+ cpu/arm926ejs/interrupts.c                   |  148 
+ cpu/arm926ejs/interrupts.c.orig              |  191 
+ doc/README.SBC8560                           |   57 
+ doc/README.sbc8560                           |   53 
+ drivers/Makefile                             |    4 
+ drivers/davinci_i2c.c                        |  296 
+ drivers/davinci_i2c.h                        |   87 
+ drivers/dm9000.c                             |  370 +
+ drivers/dm9000.h                             |  181 
+ drivers/dm9000x.c                            |  124 
+ drivers/nand/nand_base.c                     | 1404 ++--
+ drivers/nand/nand_bbt.c                      |   17 
+ drivers/nand/nand_ids.c                      |   44 
+ drivers/nand/nand_util.c                     |    3 
+ examples/hello_world.bin                     |binary
+ examples/hello_world.srec                    |   36 
+ include/asm-arm/arch-arm926ejs/emif_defs.h   |   59 
+ include/asm-arm/arch-arm926ejs/nand_defs.h   |   92 
+ include/asm-arm/arch-arm926ejs/types.h       |   31 
+ include/asm-arm/arch/emif_defs.h             |   59 
+ include/asm-arm/arch/nand_defs.h             |   92 
+ include/asm-arm/arch/sizes.h                 |   51 
+ include/asm-arm/arch/types.h                 |   31 
+ include/asm-arm/proc/domain.h                |   50 
+ include/asm-arm/proc/processor.h             |   74 
+ include/asm-arm/proc/ptrace.h                |  109 
+ include/asm-arm/proc/system.h                |  199 
+ include/asm/arch-arm1136/bits.h              |   48 
+ include/asm/arch-arm1136/clocks.h            |  112 
+ include/asm/arch-arm1136/i2c.h               |  107 
+ include/asm/arch-arm1136/mem.h               |  156 
+ include/asm/arch-arm1136/mux.h               |  158 
+ include/asm/arch-arm1136/omap2420.h          |  221 
+ include/asm/arch-arm1136/sizes.h             |   49 
+ include/asm/arch-arm1136/sys_info.h          |   82 
+ include/asm/arch-arm1136/sys_proto.h         |   54 
+ include/asm/arch-arm720t/hardware.h          |   43 
+ include/asm/arch-arm720t/netarm_dma_module.h |  182 
+ include/asm/arch-arm720t/netarm_eni_module.h |  121 
+ include/asm/arch-arm720t/netarm_eth_module.h |  160 
+ include/asm/arch-arm720t/netarm_gen_module.h |  186 
+ include/asm/arch-arm720t/netarm_mem_module.h |  184 
+ include/asm/arch-arm720t/netarm_registers.h  |   96 
+ include/asm/arch-arm720t/netarm_ser_module.h |  347 
+ include/asm/arch-arm720t/s3c4510b.h          |  272 
+ include/asm/arch-arm925t/sizes.h             |   50 
+ include/asm/arch-arm926ejs/emif_defs.h       |   59 
+ include/asm/arch-arm926ejs/nand_defs.h       |   92 
+ include/asm/arch-arm926ejs/sizes.h           |   51 
+ include/asm/arch-arm926ejs/types.h           |   31 
+ include/asm/arch-at91rm9200/AT91RM9200.h     |  762 ++
+ include/asm/arch-at91rm9200/hardware.h       |   77 
+ include/asm/arch-imx/imx-regs.h              |  577 +
+ include/asm/arch-ixp/ixp425.h                |  543 +
+ include/asm/arch-ixp/ixp425pci.h             |  312 
+ include/asm/arch-ks8695/platform.h           |  306 
+ include/asm/arch-omap/sizes.h                |   52 
+ include/asm/arch-pxa/bitfield.h              |  112 
+ include/asm/arch-pxa/hardware.h              |  158 
+ include/asm/arch-pxa/mmc.h                   |  200 
+ include/asm/arch-pxa/pxa-regs.h              | 2399 ++++++
+ include/asm/arch-s3c24x0/memory.h            |  162 
+ include/asm/arch-s3c44b0/hardware.h          |  281 
+ include/asm/arch-sa1100/bitfield.h           |  112 
+ include/asm/arch/emif_defs.h                 |   59 
+ include/asm/arch/nand_defs.h                 |   92 
+ include/asm/arch/sizes.h                     |   51 
+ include/asm/arch/types.h                     |   31 
+ include/asm/atomic.h                         |  113 
+ include/asm/bitops.h                         |  144 
+ include/asm/byteorder.h                      |   32 
+ include/asm/errno.h                          |  138 
+ include/asm/global_data.h                    |   66 
+ include/asm/hardware.h                       |   18 
+ include/asm/io.h                             |  307 
+ include/asm/mach-types.h                     | 9415 +++++++++++++++++++++++++++
+ include/asm/memory.h                         |  137 
+ include/asm/posix_types.h                    |   79 
+ include/asm/proc-armv/domain.h               |   50 
+ include/asm/proc-armv/processor.h            |   74 
+ include/asm/proc-armv/ptrace.h               |  109 
+ include/asm/proc-armv/system.h               |  199 
+ include/asm/proc/domain.h                    |   50 
+ include/asm/proc/processor.h                 |   74 
+ include/asm/proc/ptrace.h                    |  109 
+ include/asm/proc/system.h                    |  199 
+ include/asm/processor.h                      |  134 
+ include/asm/ptrace.h                         |   33 
+ include/asm/setup.h                          |  269 
+ include/asm/sizes.h                          |   52 
+ include/asm/string.h                         |   47 
+ include/asm/types.h                          |   50 
+ include/asm/u-boot-arm.h                     |   62 
+ include/asm/u-boot.h                         |   60 
+ include/config.h                             |    2 
+ include/config.mk                            |    3 
+ include/configs/SBC8560.h                    |  410 -
+ include/configs/davinci.h                    |  222 
+ include/configs/dm355_evm.h                  |  227 
+ include/configs/dm355_ipnc.h                 |  234 
+ include/configs/dm355_leopard.h              |  234 
+ include/configs/dm700.h                      |  204 
+ include/configs/omap2420h4.h                 |    2 
+ include/configs/sbc8560.h                    |  408 +
+ include/flash.h                              |    2 
+ include/linux/mtd/nand.h                     |  190 
+ include/linux/mtd/nand_ids.h                 |    1 
+ include/version_autogenerated.h              |    1 
+ lib_arm/board.c                              |    8 
+ tools/crc32.c                                |  198 
+ tools/environment.c                          |  214 
+ 176 files changed, 44713 insertions(+), 982 deletions(-)
+diff -Nurd u-boot-1.2.0/Makefile u-boot-1.2.0-leopard/Makefile
+--- u-boot-1.2.0/Makefile	2007-01-06 20:13:11.000000000 -0300
++++ u-boot-1.2.0-leopard/Makefile	2009-03-10 02:16:35.000000000 -0300
+@@ -125,7 +125,7 @@
+ CROSS_COMPILE = powerpc-linux-
+ endif
+ ifeq ($(ARCH),arm)
+-CROSS_COMPILE = arm-linux-
++CROSS_COMPILE = arm_v5t_le-
+ endif
+ ifeq ($(ARCH),i386)
+ ifeq ($(HOSTARCH),i386)
+@@ -233,10 +233,12 @@
+ __OBJS := $(subst $(obj),,$(OBJS))
+ __LIBS := $(subst $(obj),,$(LIBS))
+ 
++U-BOOT = u-boot-1.2.0-$(BOARD).bin
++
+ #########################################################################
+ #########################################################################
+ 
+-ALL = $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
++ALL = $(obj)u-boot.srec $(obj)$(U-BOOT) $(obj)System.map $(U_BOOT_NAND)
+ 
+ all:		$(ALL)
+ 
+@@ -249,7 +251,10 @@
+ $(obj)u-boot.bin:	$(obj)u-boot
+ 		$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
+ 
+-$(obj)u-boot.img:	$(obj)u-boot.bin
++$(obj)$(U-BOOT):   $(obj)u-boot
++		$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
++
++$(obj)u-boot.img:	$(obj)$(U-BOOT)
+ 		./tools/mkimage -A $(ARCH) -T firmware -C none \
+ 		-a $(TEXT_BASE) -e 0 \
+ 		-n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
+@@ -277,8 +282,8 @@
+ $(NAND_SPL):	version
+ 		$(MAKE) -C nand_spl/board/$(BOARDDIR) all
+ 
+-$(U_BOOT_NAND):	$(NAND_SPL) $(obj)u-boot.bin
+-		cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
++$(U_BOOT_NAND):	$(NAND_SPL) $(obj)$(U-BOOT)
++		cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)$(U-BOOT) > $(obj)u-boot-nand.bin
+ 
+ version:
+ 		@echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \
+@@ -320,7 +325,7 @@
+ 
+ #########################################################################
+ else
+-all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
++all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)$(U-BOOT) \
+ $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
+ $(SUBDIRS) version gdbtools updater env depend \
+ dep tags ctags etags $(obj)System.map:
+@@ -336,7 +341,7 @@
+ #########################################################################
+ 
+ unconfig:
+-	@rm -f $(obj)include/config.h $(obj)include/config.mk \
++	@rm -rf $(obj)include/config.h $(obj)include/config.mk \
+ 		$(obj)board/*/config.tmp $(obj)board/*/*/config.tmp
+ 
+ #========================================================================
+@@ -1858,6 +1863,21 @@
+ mx1fs2_config	:	unconfig
+ 	@$(MKCONFIG) $(@:_config=) arm arm920t mx1fs2 NULL imx
+ 
++davinci_config :    unconfig
++	@$(MKCONFIG) $(@:_config=) arm arm926ejs davinci
++
++dm700_config :    unconfig
++	@$(MKCONFIG) $(@:_config=) arm arm926ejs dm700
++
++dm355_evm_config :    unconfig
++	@$(MKCONFIG) $(@:_config=) arm arm926ejs dm355_evm
++
++dm355_ipnc_config :    unconfig
++	@$(MKCONFIG) $(@:_config=) arm arm926ejs dm355_ipnc
++	
++dm355_leopard_config:    unconfig
++	@$(MKCONFIG) $(@:_config=) arm arm926ejs dm355_leopard
++
+ netstar_32_config	\
+ netstar_config:		unconfig
+ 	@mkdir -p $(obj)include
+@@ -2333,7 +2353,7 @@
+ 	rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
+ 	rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c
+ 	rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
+-	rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
++	rm -rf $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
+ 	[ ! -d $(OBJTREE)/nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
+ 
+ ifeq ($(OBJTREE),$(SRCTREE))
+diff -Nurd u-boot-1.2.0/board/davinci/Makefile u-boot-1.2.0-leopard/board/davinci/Makefile
+--- u-boot-1.2.0/board/davinci/Makefile	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-1.2.0-leopard/board/davinci/Makefile	2007-12-04 07:50:28.000000000 -0300
+@@ -0,0 +1,47 @@
++#
++# (C) Copyright 2000, 2001, 2002
++# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
++#
++# See file CREDITS for list of people who contributed to this
++# project.
++#
++# 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
++#
++
++include $(TOPDIR)/config.mk
++
++LIB	= lib$(BOARD).a
++
++OBJS	:= davinci.o flash.o timer.o dm644x_emac.o nand.o
++SOBJS	:= lowlevel_init.o
++
++$(LIB):	$(OBJS) $(SOBJS)
++	$(AR) crv $@ $^
++
++clean:
++	rm -f $(SOBJS) $(OBJS)
++
++distclean:	clean
++	rm -f $(LIB) core *.bak .depend
++
++#########################################################################
++
++.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
++		$(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
++
++-include .depend
++
++#########################################################################
+diff -Nurd u-boot-1.2.0/board/davinci/config.mk u-boot-1.2.0-leopard/board/davinci/config.mk
+--- u-boot-1.2.0/board/davinci/config.mk	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-1.2.0-leopard/board/davinci/config.mk	2007-12-04 07:50:28.000000000 -0300
+@@ -0,0 +1,27 @@
++#
++# (C) Copyright 2002
++# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
++# David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
++#
++# (C) Copyright 2003
++# Texas Instruments, <www.ti.com>
++# Swaminathan <swami.iyer@ti.com>
++#
++# Davinci EVM board (ARM925EJS) cpu
++# see http://www.ti.com/ for more information on Texas Instruments
++#
++# Davinci EVM has 1 bank of 256 MB DDR RAM 
++# Physical Address:
++# 8000'0000 to 9000'0000
++#
++#
++# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
++# (mem base + reserved)
++#
++# we load ourself to 8100 '0000
++#
++#
++
++#Provide a atleast 16MB spacing between us and the Linux Kernel image
++TEXT_BASE = 0x81080000
++BOARDLIBS = drivers/nand/libnand.a
+diff -Nurd u-boot-1.2.0/board/davinci/davinci.c u-boot-1.2.0-leopard/board/davinci/davinci.c
+--- u-boot-1.2.0/board/davinci/davinci.c	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-1.2.0-leopard/board/davinci/davinci.c	2007-12-04 07:50:28.000000000 -0300
+@@ -0,0 +1,417 @@
++/*
++ *
++ * Copyright (C) 2004 Texas Instruments.
++ *
++ * ----------------------------------------------------------------------------
++ *
++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * ----------------------------------------------------------------------------
++ Modifications:
++ ver. 1.0: Oct 2005, Swaminathan S
++ *
++ */
++
++#include <common.h>
++#include <i2c.h>
++
++#if 0
++void flash__init (void);
++void ether__init (void);
++#endif
++#define PLL1_PLLM   *(volatile unsigned int *)0x01c40910
++#define PLL2_PLLM   *(volatile unsigned int *)0x01c40D10
++#define PLL2_DIV2   *(volatile unsigned char *)0x01c40D1C
++
++void davinci_psc_all_enable(void);
++
++/*******************************************
++ Routine: delay
++ Description:  Delay function
++*******************************************/
++static inline void delay (unsigned long loops)
++{
++	       __asm__ volatile ("1:\n"
++		     "subs %0, %1, #1\n"
++		     "bne 1b":"=r" (loops):"0" (loops));
++}
++
++/*******************************************
++ Routine: board_init
++ Description:  Board Initialization routine
++*******************************************/
++int board_init (void)
++{
++    	  DECLARE_GLOBAL_DATA_PTR;
++
++        /* arch number of DaVinci DVDP-Board */
++        gd->bd->bi_arch_number = 901;
++
++      	/* adress of boot parameters */
++       	gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
++        /* Configure MUX settings */
++
++      /* Power on required peripherals */
++    	davinci_psc_all_enable();
++#if 0
++      	/* this speeds up your boot a quite a bit.  However to make it
++ 	 *  work, you need make sure your kernel startup flush bug is fixed.
++	 *  ... rkw ...
++	 */
++	icache_enable ();
++#endif
++      	inittimer ();
++
++      	return 0;
++}
++
++/* PSC Domains */
++#define LPSC_VPSSMSTR       0       // VPSS Master LPSC
++#define LPSC_VPSSSLV        1       // VPSS Slave LPSC
++#define LPSC_TPCC           2       // TPCC LPSC
++#define LPSC_TPTC0          3       // TPTC0 LPSC
++#define LPSC_TPTC1          4       // TPTC1 LPSC
++#define LPSC_EMAC           5       // EMAC LPSC
++#define LPSC_EMAC_WRAPPER   6       // EMAC WRAPPER LPSC
++#define LPSC_MDIO           7       // MDIO LPSC
++#define LPSC_IEEE1394       8       // IEEE1394 LPSC
++#define LPSC_USB            9       // USB LPSC
++#define LPSC_ATA            10      // ATA LPSC
++#define LPSC_VLYNQ          11      // VLYNQ LPSC
++#define LPSC_UHPI           12      // UHPI LPSC
++#define LPSC_DDR_EMIF       13      // DDR_EMIF LPSC
++#define LPSC_AEMIF          14      // AEMIF LPSC
++#define LPSC_MMC_SD         15      // MMC_SD LPSC
++#define LPSC_MEMSTICK       16      // MEMSTICK LPSC
++#define LPSC_McBSP          17      // McBSP LPSC
++#define LPSC_I2C            18      // I2C LPSC
++#define LPSC_UART0          19      // UART0 LPSC
++#define LPSC_UART1          20      // UART1 LPSC
++#define LPSC_UART2          21      // UART2 LPSC
++#define LPSC_SPI            22      // SPI LPSC
++#define LPSC_PWM0           23      // PWM0 LPSC
++#define LPSC_PWM1           24      // PWM1 LPSC
++#define LPSC_PWM2           25      // PWM2 LPSC
++#define LPSC_GPIO           26      // GPIO LPSC
++#define LPSC_TIMER0         27      // TIMER0 LPSC
++#define LPSC_TIMER1         28      // TIMER1 LPSC
++#define LPSC_TIMER2         29      // TIMER2 LPSC
++#define LPSC_SYSTEM_SUBSYS  30      // SYSTEM SUBSYSTEM LPSC
++#define LPSC_ARM            31      // ARM LPSC
++#define LPSC_SCR2           32      // SCR2 LPSC
++#define LPSC_SCR3           33      // SCR3 LPSC
++#define LPSC_SCR4           34      // SCR4 LPSC
++#define LPSC_CROSSBAR       35      // CROSSBAR LPSC
++#define LPSC_CFG27          36      // CFG27 LPSC
++#define LPSC_CFG3           37      // CFG3 LPSC
++#define LPSC_CFG5           38      // CFG5 LPSC
++#define LPSC_GEM            39      // GEM LPSC
++#define LPSC_IMCOP          40      // IMCOP LPSC
++
++#define CHP_SHRTSW          *( volatile unsigned int* )( 0x01C40038 )   
++#define GBLCTL              *( volatile unsigned int* )( 0x01C41010 ) 
++#define EPCPR               *( volatile unsigned int* )( 0x01C41070 )
++#define EPCCR               *( volatile unsigned int* )( 0x01C41078 )
++#define PTCMD               *( volatile unsigned int* )( 0x01C41120 )
++#define PTSTAT              *( volatile unsigned int* )( 0x01C41128 )
++#define PDSTAT              *( volatile unsigned int* )( 0x01C41200 )
++#define PDSTAT1             *( volatile unsigned int* )( 0x01C41204 )
++#define PDCTL               *( volatile unsigned int* )( 0x01C41300 )
++#define PDCTL1              *( volatile unsigned int* )( 0x01C41304 )
++#define VBPR                *( volatile unsigned int* )( 0x20000020 )
++
++/**************************************
++ Routine: board_setup_psc_on
++ Description:  Enable a PSC domain
++**************************************/
++void board_setup_psc_on( unsigned int domain, unsigned int id )
++{
++        volatile unsigned int* mdstat = ( unsigned int* )( 0x01C41800 + 4 * id );
++	      volatile unsigned int* mdctl  = ( unsigned int* )( 0x01C41A00 + 4 * id );
++
++	      *mdctl |= 0x00000003; // Set PowerDomain to turn on
++
++    	  if ( ( PDSTAT & 0x00000001 ) == 0 )
++    	  {
++                PDCTL1 |= 0x1;
++        	      PTCMD = ( 1 << domain );
++        	      while ( ( ( ( EPCPR >> domain ) & 1 ) == 0 ) );
++
++        	      PDCTL1 |= 0x100 ;
++        	      while( ! ( ( ( PTSTAT >> domain ) & 1 ) == 0 ) );
++    	  }
++    	  else
++    	  {
++        	      PTCMD = ( 1<<domain );
++        	      while( ! ( ( ( PTSTAT >> domain ) & 1 ) == 0 ) );
++    	  }
++
++    	  while( ! ( ( *mdstat & 0x0000001F ) == 0x3 ) );
++}
++
++/**************************************
++ Routine: davinci_psc_all_enable
++ Description:  Enable all PSC domains
++**************************************/
++void davinci_psc_all_enable(void)
++{
++#define PSC_ADDR            0x01C41000
++#define PTCMD               (PSC_ADDR+0x120)
++#define PTSTAT              (PSC_ADDR+0x128)
++
++        unsigned int alwaysOnPdNum = 0, dspPdNum = 1, i;
++	int waiting;
++	unsigned int state;
++
++    	  /* This function turns on all clocks in the ALWAYSON and DSP Power
++	       * Domains.  Note this function assumes that the Power Domains are
++	       * already on.
++	       */
++#if 0
++    	  /* Write ENABLE (0x3) to all 41 MDCTL[i].NEXT bit fields. */
++    	  for( i = 0; i < 41; i++){
++                *(volatile unsigned int*) (PSC_ADDR+0xA00+4*i) =
++				        *(volatile unsigned int*) (PSC_ADDR+0xA00+4*i) | 0x3;
++    	  }
++
++    	  /* For special workaround:  Set MDCTL[i].EMURSTIE to 0x1 for all of the
++	       * following Modules.  VPSSSLV, EMAC, EMACCTRL, MDIO, USB, ATA, VLYNQ,
++         * HPI, DDREMIF, AEMIF, MMCSD, MEMSTICK, ASP, GPIO, IMCOP.
++         */
++        /**(unsigned int*) (PSC_ADDR+0xA00+4*1) = *(unsigned int*) (PSC_ADDR+0xA00+4*1) | 0x203;*/
++        *(unsigned int*) (PSC_ADDR+0xA00+4*5) = *(unsigned int*) (PSC_ADDR+0xA00+4*5) | 0x203;
++        *(unsigned int*) (PSC_ADDR+0xA00+4*6) = *(unsigned int*) (PSC_ADDR+0xA00+4*6) | 0x203;
++        *(unsigned int*) (PSC_ADDR+0xA00+4*7) = *(unsigned int*) (PSC_ADDR+0xA00+4*7) | 0x203;
++        /**(unsigned int*) (PSC_ADDR+0xA00+4*9) = *(unsigned int*) (PSC_ADDR+0xA00+4*9) | 0x203;
++        *(unsigned int*) (PSC_ADDR+0xA00+4*10) = *(unsigned int*) (PSC_ADDR+0xA00+4*10) | 0x203;
++        *(unsigned int*) (PSC_ADDR+0xA00+4*11) = *(unsigned int*) (PSC_ADDR+0xA00+4*11) | 0x203;
++        *(unsigned int*) (PSC_ADDR+0xA00+4*12) = *(unsigned int*) (PSC_ADDR+0xA00+4*12) | 0x203;*/
++        *(unsigned int*) (PSC_ADDR+0xA00+4*13) = *(unsigned int*) (PSC_ADDR+0xA00+4*13) | 0x203;
++        *(unsigned int*) (PSC_ADDR+0xA00+4*14) = *(unsigned int*) (PSC_ADDR+0xA00+4*14) | 0x203;
++        /**(unsigned int*) (PSC_ADDR+0xA00+4*15) = *(unsigned int*) (PSC_ADDR+0xA00+4*15) | 0x203;
++        *(unsigned int*) (PSC_A