[oe-commits] org.oe.dev merge of '43f0162e257c27b3b68e689fc1e52fc7d296db3d'

mickeyl commit openembedded-commits at lists.openembedded.org
Fri Jun 22 04:35:20 UTC 2007


merge of '43f0162e257c27b3b68e689fc1e52fc7d296db3d'
     and 'b1be59f70fc52177a67b15d29fc93897c548b5a8'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8af80fbb05d2078b7d02b76d66c1b17297580c40
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8af80fbb05d2078b7d02b76d66c1b17297580c40
Files:
1
packages/glibmm/glibmm_2.8.4.bb
packages/glibmm/glibmm_2.12.10.bb
packages/uclibc/uclibc-0.9.29/armeb
packages/cairo/cairomm_1.2.4.bb
packages/uclibc/uclibc-0.9.29/armeb/uClibc.machine
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-dsmg600.h
packages/db/db_4.3.29.bb
packages/efl1/evas.inc
packages/linux/linux.inc
packages/tasks/task-boot.bb
packages/linux/gta01-kernel_2.6.bb
packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
packages/linux/linux-gta01/defconfig-fic-gta01
packages/linux/linux-gta01/udc-nomodule-misccr.patch
packages/linux/linux-gta01_2.6.17.14.bb
packages/linux/linux-gta01_2.6.17.7.bb
packages/linux/linux-gta01_2.6.20.bb
packages/linux/linux-gta01_2.6.21.1.bb
packages/uboot/files/gta01_nand.h
packages/uboot/files/qt2410.h
packages/uboot/files/qt2410_nand.h
packages/uboot/files/qt2410_ram.h
packages/uboot/files/u-boot-20060807-qt2410.patch
packages/uboot/files/u-boot-20060907-gta01.patch
packages/uboot/files/u-boot-20061030-gta01bv2.patch
packages/uboot/files/u-boot-20061030-gta01v4.patch
packages/uboot/files/u-boot-20061030-qt2410-gta01.patch
packages/uboot/u-boot-mkimage-gta01-native
packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch
packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch
packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch
packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch
packages/uboot/u-boot-mkimage-gta01-native/default-env.patch
packages/uboot/u-boot-mkimage-gta01-native/dontask.patch
packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch
packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch
packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch
packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch
packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch
packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch
packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch
packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch
packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch
packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch
packages/uboot/u-boot-mkimage-gta01-native/series
packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch
packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch
packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch
packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/uboot/u-boot-mkimage-gta01-native_svn.bb
packages/uboot/uboot-qt2410_0.0+cvs20061030.bb
packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
packages/linux/linux-gta01_2.6.21.3.bb
packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
packages/uboot/files/uboot-eabi-fix-HACK.patch
packages/linux/linux-gta01.inc
packages/uboot/uboot-gta01_svn.bb
Diffs:

#
# mt diff -r43f0162e257c27b3b68e689fc1e52fc7d296db3d -r8af80fbb05d2078b7d02b76d66c1b17297580c40
#
# 
# 
# rename "packages/glibmm/glibmm_2.8.4.bb"
#     to "packages/glibmm/glibmm_2.12.10.bb"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/armeb"
# 
# add_file "packages/cairo/cairomm_1.2.4.bb"
#  content [dd66a4dedd593fd19a3dbdd501692b451e67cc22]
# 
# add_file "packages/uclibc/uclibc-0.9.29/armeb/uClibc.machine"
#  content [3d3e88f583b5cab8f613215dacf78af2b3f30644]
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
#  from [03183c3151029ae4353feb0d5f2cafdbc9bfbe49]
#    to [363539e6aa9b48b4075ef6f22841c250058075ba]
# 
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
#  from [d00909cd9a1463bc0408385eccc82a7aabbdb7f4]
#    to [e1e4b562c2e75b563db67b4f23659eb5d2586f41]
# 
# patch "packages/db/db_4.3.29.bb"
#  from [ac62c653321f799c3e82eb83e6f784a82d29ae22]
#    to [1435118c93b68e2c0ac08756d52aa21da920348a]
# 
# patch "packages/efl1/evas.inc"
#  from [34438cac7d5ab703bca84012125c68cc6bf63148]
#    to [6017e94718de8094aa8b5883c55927c7c943c226]
# 
# patch "packages/glibmm/glibmm_2.12.10.bb"
#  from [f65adea3541283a9f134c688ceb34d8dae685f2e]
#    to [79ded0998e146ec9831dfbc0391c51bd8ca5d611]
# 
# patch "packages/linux/linux.inc"
#  from [06e3cd51af5792d89ccd3dca0d5ef3f6e25d33a8]
#    to [571ad2731ad0b3d6172a72c2f807cbcc9bb6c840]
# 
# patch "packages/tasks/task-boot.bb"
#  from [115ab0b2bdb81d2173743f94013740150247661e]
#    to [f0102706fa429388765dd03fb5cbad2d98527a2f]
# 
============================================================
--- packages/cairo/cairomm_1.2.4.bb	dd66a4dedd593fd19a3dbdd501692b451e67cc22
+++ packages/cairo/cairomm_1.2.4.bb	dd66a4dedd593fd19a3dbdd501692b451e67cc22
@@ -0,0 +1,9 @@
+require cairo.inc
+
+DEPENDS = "cairo"
+DESCRIPTION = "C++ bindings for Cairo graphics library"
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz"
+
+#EXTRA_OECONF = "--disable-docs"
============================================================
--- packages/uclibc/uclibc-0.9.29/armeb/uClibc.machine	3d3e88f583b5cab8f613215dacf78af2b3f30644
+++ packages/uclibc/uclibc-0.9.29/armeb/uClibc.machine	3d3e88f583b5cab8f613215dacf78af2b3f30644
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 22:07:03 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_WANTS_BIG_ENDIAN=y
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	03183c3151029ae4353feb0d5f2cafdbc9bfbe49
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	363539e6aa9b48b4075ef6f22841c250058075ba
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "ARM Kernel Shim"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
 
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h	d00909cd9a1463bc0408385eccc82a7aabbdb7f4
+++ packages/arm-kernel-shim/files/config-dsmg600.h	e1e4b562c2e75b563db67b4f23659eb5d2586f41
@@ -18,6 +18,8 @@
 
 #define MACH_TYPE		   964
 
+#define GUARANTEE_ATAG_CMDLINE
+
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
============================================================
--- packages/db/db_4.3.29.bb	ac62c653321f799c3e82eb83e6f784a82d29ae22
+++ packages/db/db_4.3.29.bb	1435118c93b68e2c0ac08756d52aa21da920348a
@@ -14,7 +14,7 @@ CONFLICTS = "db3"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -71,6 +71,7 @@ do_configure() {
 # configure.
 CONFIG_SITE = ""
 do_configure() {
+	( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize ) 
 	oe_runconf
 }
 
============================================================
--- packages/efl1/evas.inc	34438cac7d5ab703bca84012125c68cc6bf63148
+++ packages/efl1/evas.inc	6017e94718de8094aa8b5883c55927c7c943c226
@@ -1,10 +1,10 @@ LICENSE = "MIT"
 DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
 anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
 # can also depend on valgrind (?)
-DEPENDS = " eet freetype jpeg virtual/libx11 libxext"
+DEPENDS = "directfb eet freetype jpeg virtual/libx11 libxext"
 
 inherit efl1
 
============================================================
--- packages/glibmm/glibmm_2.8.4.bb	f65adea3541283a9f134c688ceb34d8dae685f2e
+++ packages/glibmm/glibmm_2.12.10.bb	79ded0998e146ec9831dfbc0391c51bd8ca5d611
@@ -1,12 +1,12 @@ DEPENDS = "glib-2.0 libsigc++-2.0"
 DESCRIPTION = "C++ bindings for the glib library."
 HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 libsigc++-2.0"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-${PV}.tar.bz2"
 
 inherit autotools pkgconfig flow-lossage
 
@@ -19,6 +19,5 @@ do_stage () {
 	autotools_stage_all
 
 	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
-
 	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
 }
============================================================
--- packages/linux/linux.inc	06e3cd51af5792d89ccd3dca0d5ef3f6e25d33a8
+++ packages/linux/linux.inc	571ad2731ad0b3d6172a72c2f807cbcc9bb6c840
@@ -18,7 +18,11 @@ KERNEL_IMAGETYPE_at91sam9263ek = "uImage
 KERNEL_IMAGETYPE_at91sam9263ek = "uImage"
 
 # Specify the commandline for you device here:
+
+#boot from mmc
 CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
+#boot from nfs
+#CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0"
 
 do_configure_prepend() {
         echo "" > ${S}/.config
@@ -43,11 +47,11 @@ do_install_prepend() {
 
 do_install_prepend() {
         if test -e arch/${ARCH}/boot/Image ; then
-             ln -f arch/arm/boot/Image arch/arm/boot/uImage
+             ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage
         fi
 
         if test -e arch/${ARCH}/boot/images/uImage ; then
-             ln -f arch/arm/boot/images/uImage arch/arm/boot/uImage
+             ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage
         fi
 }
 
============================================================
--- packages/tasks/task-boot.bb	115ab0b2bdb81d2173743f94013740150247661e
+++ packages/tasks/task-boot.bb	f0102706fa429388765dd03fb5cbad2d98527a2f
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a devic
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r36"
+PR = "r37"
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = 'task-boot'
@@ -46,11 +46,9 @@ RDEPENDS_task-boot = "\
     ${DISTRO_DEV_MANAGER} \
     ${DISTRO_INIT_MANAGER} \
     ${DISTRO_LOGIN_MANAGER} \
-    ${DISTRO_EXTRA_RDEPENDS} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
-    ${MACHINE_EXTRA_RDEPENDS}"
+    "
 
 RRECOMMENDS_task-boot = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+    "
-    ${MACHINE_EXTRA_RRECOMMENDS} \
-    ${DISTRO_EXTRA_RRECOMMENDS} "


#
# mt diff -rb1be59f70fc52177a67b15d29fc93897c548b5a8 -r8af80fbb05d2078b7d02b76d66c1b17297580c40
#
# 
# 
# delete "packages/linux/gta01-kernel_2.6.bb"
# 
# delete "packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01"
# 
# delete "packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01"
# 
# delete "packages/linux/linux-gta01/defconfig-fic-gta01"
# 
# delete "packages/linux/linux-gta01/udc-nomodule-misccr.patch"
# 
# delete "packages/linux/linux-gta01_2.6.17.14.bb"
# 
# delete "packages/linux/linux-gta01_2.6.17.7.bb"
# 
# delete "packages/linux/linux-gta01_2.6.20.bb"
# 
# delete "packages/linux/linux-gta01_2.6.21.1.bb"
# 
# delete "packages/uboot/files/gta01_nand.h"
# 
# delete "packages/uboot/files/qt2410.h"
# 
# delete "packages/uboot/files/qt2410_nand.h"
# 
# delete "packages/uboot/files/qt2410_ram.h"
# 
# delete "packages/uboot/files/u-boot-20060807-qt2410.patch"
# 
# delete "packages/uboot/files/u-boot-20060907-gta01.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-gta01bv2.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-gta01v4.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-qt2410-gta01.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/default-env.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/dontask.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/series"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native_svn.bb"
# 
# delete "packages/uboot/uboot-qt2410_0.0+cvs20061030.bb"
# 
# add_file "packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01"
#  content [d37b0d7a88ff3c521069869b88eb1d365aceeffb]
# 
# add_file "packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch"
#  content [e15e615874c119de71e9a1862f9989a3d51c3285]
# 
# add_file "packages/linux/linux-gta01_2.6.21.3.bb"
#  content [a2e7d818d98132928b2ee4a8056f77cef18f111e]
# 
# add_file "packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch"
#  content [575298514df1fc14f35e686d68f10eb0e1584978]
# 
# add_file "packages/uboot/files/uboot-eabi-fix-HACK.patch"
#  content [048fdee069aa7a28b634f89c0e5ffcf480c174a1]
# 
# patch "packages/linux/linux-gta01.inc"
#  from [a905e1e7ffd865b4f347500527281bf7ebcf0c5d]
#    to [3a7770395578a216ea4cae48cbad1a35cdcb367e]
# 
# patch "packages/uboot/uboot-gta01_svn.bb"
#  from [99839c5d6e1423ba68d992f0dfc835c2927b72c6]
#    to [62211a5a9b706926a1f230401f042f8add732e37]
# 
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01	d37b0d7a88ff3c521069869b88eb1d365aceeffb
+++ packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01	d37b0d7a88ff3c521069869b88eb1d365aceeffb
@@ -0,0 +1,1857 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.3
+# Mon Jun 11 18:32:32 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_NO_IOPORT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-moko10"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+CONFIG_ARCH_S3C2410=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_PLAT_S3C24XX=y
+CONFIG_CPU_S3C244X=y
+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
+CONFIG_S3C2410_BOOT_ERROR_RESET=y
+CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
+CONFIG_S3C2410_DMA=y
+# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_MACH_SMDK=y
+
+#
+# S3C2400 Machines
+#
+CONFIG_CPU_S3C2410=y
+CONFIG_CPU_S3C2410_DMA=y
+CONFIG_S3C2410_PM=y
+CONFIG_S3C2410_GPIO=y
+CONFIG_S3C2410_CLOCK=y
+
+#
+# S3C2410 Machines
+#
+# CONFIG_ARCH_SMDK2410 is not set
+# CONFIG_ARCH_H1940 is not set
+# CONFIG_MACH_N30 is not set
+# CONFIG_ARCH_BAST is not set
+# CONFIG_MACH_OTOM is not set
+# CONFIG_MACH_AML_M5900 is not set
+# CONFIG_MACH_VR1000 is not set
+CONFIG_MACH_QT2410=y
+CONFIG_MACH_NEO1973_GTA01=y
+
+#
+# S3C2412 Machines
+#
+# CONFIG_MACH_SMDK2413 is not set
+# CONFIG_MACH_VSTMS is not set
+CONFIG_CPU_S3C2440=y
+CONFIG_S3C2440_DMA=y
+
+#
+# S3C2440 Machines
+#
+# CONFIG_MACH_ANUBIS is not set
+# CONFIG_MACH_OSIRIS is not set
+# CONFIG_MACH_RX3715 is not set
+CONFIG_ARCH_S3C2440=y
+# CONFIG_MACH_NEXCODER_2440 is not set
+CONFIG_SMDK2440_CPU2440=y
+CONFIG_MACH_HXD8=y
+# CONFIG_MACH_NEO1973_GTA02 is not set
+
+#
+# S3C2442 Machines
+#
+# CONFIG_SMDK2440_CPU2442 is not set
+
+#
+# S3C2443 Machines
+#
+# CONFIG_MACH_SMDK2443 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=200
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySAC0,115200n8  ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off   debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+CONFIG_PM_DEBUG=y
+CONFIG_DISABLE_CONSOLE_SUSPEND=y
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFI%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list