[oe-commits] org.oe.dev merge of '5a1eeba70ddedb225afa7bcf6a948e3d1e376069'
svolpe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:12:46 UTC 2008
merge of '5a1eeba70ddedb225afa7bcf6a948e3d1e376069'
and '73007fe3d4a6a4798e007ad2a1106b860e763c07'
Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: c05229a8c5246cada336c3cfe5a3417367366836
ViewMTN: http://monotone.openembedded.org/revision/info/c05229a8c5246cada336c3cfe5a3417367366836
Files:
1
packages/directfb/fusionsound_1.0.0.bb
packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
packages/maemo/hildon-base-lib_0.8.6-2.bb
packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
packages/maemo/hildon-fm_0.9.1-2.bb
packages/nonworking/maemo/hildon-fm_0.9.1-2.bb
packages/maemo/hildon-home
packages/nonworking/maemo/hildon-home
packages/maemo/hildon-home_0.8.20-2.bb
packages/nonworking/maemo/hildon-home_0.8.20-2.bb
packages/maemo/hildon-initscripts
packages/nonworking/maemo/hildon-initscripts
packages/maemo/hildon-initscripts_0.8.14-1.bb
packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb
packages/maemo/hildon-lgpl
packages/nonworking/maemo/hildon-lgpl
packages/maemo/hildon-lgpl_0.9.14-2.bb
packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb
packages/maemo/hildon-libs
packages/nonworking/maemo/hildon-libs
packages/maemo/hildon-libs_0.9.6-2.bb
packages/nonworking/maemo/hildon-libs_0.9.6-2.bb
packages/maemo/hildon-navigator
packages/nonworking/maemo/hildon-navigator
packages/maemo/hildon-navigator_0.9.6-2.bb
packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb
packages/maemo/osso-screenshot-tool_1.20-1.bb
packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb
packages/maemo/osso-thumbnail_0.3.1-1.bb
packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb
packages/maemo/sapwood
packages/nonworking/maemo/sapwood
packages/maemo/sapwood_1.20-1.bb
packages/nonworking/maemo/sapwood_1.20-1.bb
packages/gpe-memo
packages/nonworking/gpe-contacts
packages/nonworking/maemo
packages/u-boot/u-boot-git/akita
packages/u-boot/u-boot-git/c7x0
packages/gnash/files/libintl.patch
packages/gpe-memo/gpe-memo_0.2.bb
packages/nandlogical/nandlogical-static_1.0.0.bb
packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch
packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/apt/apt-native_0.6.46.2.bb
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-native_0.7.3.bb
packages/apt/apt-package.inc
packages/apt/apt_0.5.28.6.bb
packages/apt/apt_0.6.25.bb
packages/apt/apt_0.6.46.2.bb
packages/apt/apt_0.7.2.bb
packages/apt/apt_0.7.3.bb
packages/dhcp/dhcp_3.0.1.bb
packages/dhcp/dhcp_3.0.2.bb
packages/efl1/imlib2_cvs.bb
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/illume-theme-freesmartphone_git.bb
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
packages/gstreamer/gst-ffmpeg_0.10.4.bb
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/nandlogical/nandlogical_1.0.0.bb
packages/openmax/libomxil-bellagio_0.9.0.bb
packages/phoneme/phoneme-advanced.inc
packages/python/python-pycap_0.1.6.bb
packages/tangogps/tangogps-fso_0.9.2.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-slugos.bb
packages/telepathy/telepathy-python_0.14.0.bb
packages/u-boot/u-boot_git.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
Diffs:
#
# mt diff -r5a1eeba70ddedb225afa7bcf6a948e3d1e376069 -rc05229a8c5246cada336c3cfe5a3417367366836
#
#
#
# delete "packages/directfb/fusionsound_1.0.0.bb"
#
#
# mt diff -r73007fe3d4a6a4798e007ad2a1106b860e763c07 -rc05229a8c5246cada336c3cfe5a3417367366836
#
#
#
# rename "packages/gpe-contacts/gpe-contacts-hildon_0.40.bb"
# to "packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb"
#
# rename "packages/gpe-contacts/gpe-contacts-hildon_0.42.bb"
# to "packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb"
#
# rename "packages/maemo/hildon-base-lib_0.8.6-2.bb"
# to "packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb"
#
# rename "packages/maemo/hildon-fm_0.9.1-2.bb"
# to "packages/nonworking/maemo/hildon-fm_0.9.1-2.bb"
#
# rename "packages/maemo/hildon-home"
# to "packages/nonworking/maemo/hildon-home"
#
# rename "packages/maemo/hildon-home_0.8.20-2.bb"
# to "packages/nonworking/maemo/hildon-home_0.8.20-2.bb"
#
# rename "packages/maemo/hildon-initscripts"
# to "packages/nonworking/maemo/hildon-initscripts"
#
# rename "packages/maemo/hildon-initscripts_0.8.14-1.bb"
# to "packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb"
#
# rename "packages/maemo/hildon-lgpl"
# to "packages/nonworking/maemo/hildon-lgpl"
#
# rename "packages/maemo/hildon-lgpl_0.9.14-2.bb"
# to "packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb"
#
# rename "packages/maemo/hildon-libs"
# to "packages/nonworking/maemo/hildon-libs"
#
# rename "packages/maemo/hildon-libs_0.9.6-2.bb"
# to "packages/nonworking/maemo/hildon-libs_0.9.6-2.bb"
#
# rename "packages/maemo/hildon-navigator"
# to "packages/nonworking/maemo/hildon-navigator"
#
# rename "packages/maemo/hildon-navigator_0.9.6-2.bb"
# to "packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb"
#
# rename "packages/maemo/osso-screenshot-tool_1.20-1.bb"
# to "packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb"
#
# rename "packages/maemo/osso-thumbnail_0.3.1-1.bb"
# to "packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb"
#
# rename "packages/maemo/sapwood"
# to "packages/nonworking/maemo/sapwood"
#
# rename "packages/maemo/sapwood_1.20-1.bb"
# to "packages/nonworking/maemo/sapwood_1.20-1.bb"
#
# add_dir "packages/gpe-memo"
#
# add_dir "packages/nonworking/gpe-contacts"
#
# add_dir "packages/nonworking/maemo"
#
# add_dir "packages/u-boot/u-boot-git/akita"
#
# add_dir "packages/u-boot/u-boot-git/c7x0"
#
# add_file "packages/gnash/files/libintl.patch"
# content [8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9]
#
# add_file "packages/gpe-memo/gpe-memo_0.2.bb"
# content [388b2fac728542b4c47ba5fa38942475892fd5e8]
#
# add_file "packages/nandlogical/nandlogical-static_1.0.0.bb"
# content [c6eb029366961e0afd263bbe27cd2e6cd0078dcf]
#
# add_file "packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch"
# content [1745cb136349f6b3095458128c6e4db6076b8864]
#
# add_file "packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch"
# content [f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f]
#
# add_file "packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch"
# content [fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2]
#
# add_file "packages/u-boot/u-boot-git/pdaXrom-u-boot.patch"
# content [4408ce632dc8396c6b94f28eef04221966d57e5f]
#
# add_file "packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch"
# content [fc8a7fd372731a45ff3a96eb8e871e75b8f11f48]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [03774e09909d289cb199f67da23c9d23a86db032]
# to [cbbb69b48411373416615825a20788cb411d02dc]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
# to [647a26cd30973ca6a2a668fa840c7bff50c53ae3]
#
# patch "packages/apt/apt-native_0.6.46.2.bb"
# from [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
# to [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#
# patch "packages/apt/apt-native_0.7.2.bb"
# from [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
# to [b0989d5e0870cc4e217b461d8365a97faa3193c6]
#
# patch "packages/apt/apt-native_0.7.3.bb"
# from [b0989d5e0870cc4e217b461d8365a97faa3193c6]
# to [b296813333921222120126bf76051ba8dcbd29cd]
#
# patch "packages/apt/apt-package.inc"
# from [776b438ed4e20204678a1baba2ed113b69e73334]
# to [82aefdf060f85e22aa8a3f790687444c01de80c1]
#
# patch "packages/apt/apt_0.5.28.6.bb"
# from [97cef0ebac33a0363846bc944cb9e768a614e2fa]
# to [dd4e71e08d5ca242b3f590ca87ea5d555a20bce4]
#
# patch "packages/apt/apt_0.6.25.bb"
# from [0f3a5a95b1f9de3a0c08c450223a098240be0e11]
# to [16d6cbc9351adceca7f15831bf0bfba0c2c82c12]
#
# patch "packages/apt/apt_0.6.46.2.bb"
# from [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
# to [ae7a0357c0bb8db7bbe66b435fc016d45fb1db98]
#
# patch "packages/apt/apt_0.7.2.bb"
# from [63322e840f089261ba0cacb99e97bda6eb5b1998]
# to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
#
# patch "packages/apt/apt_0.7.3.bb"
# from [b35d540f7bc7597c24ad2ee48b326f68b11b2a73]
# to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
#
# patch "packages/dhcp/dhcp_3.0.1.bb"
# from [508e25e8ed777c42989948a97808577033112e60]
# to [561093eb489c489029221984b0556f3de883d7c2]
#
# patch "packages/dhcp/dhcp_3.0.2.bb"
# from [22a60b2567e7a2cf31517547c1c7800734714419]
# to [ec84b1ca88bad4389f98262e2bbcb8f313bd2556]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [c32847438359b0993cb9eadcf6f4b6019585f54c]
# to [c526c87f355a9b89f816e20b1a5592773eb70178]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [793a30383983a318ac57259d83df5926de1aa01b]
# to [3dbc091185870b33314c866b8ab9802f88af1c32]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [3c8cfda704e6a539e468453e2b038c001d05a9d3]
# to [490cc47f155fb1d62f9f852f8eebe2323fae27e1]
#
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
# from [3b404c6f9bbe799efebf5c54853e2ef3acc160dd]
# to [aaa2ede39c269671da1b463d943cda006ff393cf]
#
# patch "packages/freesmartphone/illume-theme-freesmartphone_git.bb"
# from [7d8251f9fa4e5a7357094ef5e02174512e643850]
# to [4e2384d985f0f4aed6d613bd4e69a5509bd23665]
#
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
# from [6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2]
# to [c0be1ee88262033c9d6942a9e663cd67fd8f9cf0]
#
# patch "packages/gnash/gnash-minimal_0.8.3.bb"
# from [6396b4820385850e505d3bf5e1590f4dac5ff6b6]
# to [36448f84bc62c99b5090bf2b25d855cc753f82a3]
#
# patch "packages/gnash/gnash-minimal_cvs.bb"
# from [62f9652b7093e6633562fd3ed356c137c7dba781]
# to [db4c2629fdbc1291308a0a48419a39a584264d1d]
#
# patch "packages/gstreamer/gst-ffmpeg_0.10.4.bb"
# from [31cd5a76daaa2a0ea225ea4270941d6d5ef2aa73]
# to [9ad7b01ede614d0fc142a01b7546007b40441f34]
#
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
# from [3665eb673cea6a75e2df36a17daa87464aeb50c4]
# to [7586b901cf335cd8829daea1fe516b43468ba635]
#
# patch "packages/nandlogical/nandlogical_1.0.0.bb"
# from [f493f382978d1edc9d0c042c782c35c2142ae57c]
# to [e8d8e415634193d69b9888bc2a858b0cda67e6d9]
#
# patch "packages/openmax/libomxil-bellagio_0.9.0.bb"
# from [b1d186c225ca307e729a0086cd6b55dbbb70f5f2]
# to [3fa766b2661c34b5ef2f3ad60eff1fb05eeee2ec]
#
# patch "packages/phoneme/phoneme-advanced.inc"
# from [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
# to [71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac]
#
# patch "packages/python/python-pycap_0.1.6.bb"
# from [5c95e2aad4740b75fcf55cd0d2136e6caf2dff31]
# to [5968e263ec11a89dcdc59e13683ea260e4e27f45]
#
# patch "packages/tangogps/tangogps-fso_0.9.2.bb"
# from [5cbb978159e893365e050b41da156f5424b7d760]
# to [625bd01843b531550ed8c10bb2dd04c1d9fab151]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [7ef80d3236128df7070e50415a62f1b4e280d8d3]
# to [baa4e904acab8916566bec7f5b14359d063354e9]
#
# patch "packages/tasks/task-slugos.bb"
# from [d6b87da4b933dc8e8d279fbe5f97a6c31fd1e8ec]
# to [284471adae95c9090b461c40a1d4215a4545b8cc]
#
# patch "packages/telepathy/telepathy-python_0.14.0.bb"
# from [b72e5e36875b783b40a06c426e30d901358c86a7]
# to [337dc44149aebc1554bcb6e930da136baa207cc1]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [dd5c9df20b550f8e184483944ba911d7de096d98]
# to [d93f9d9cf79035943fc20dd1da8a9819c287ce12]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [fa97c83984b56db433bad80d69a6a49429af862a]
# to [078fa05fc808e44e42477177038c538bc6fcff9c]
#
============================================================
--- packages/gnash/files/libintl.patch 8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
+++ packages/gnash/files/libintl.patch 8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
@@ -0,0 +1,13 @@
+Index: gnash-0.8.3/gui/am-frag/fb.am
+===================================================================
+--- gnash-0.8.3.orig/gui/am-frag/fb.am 2008-08-19 00:37:45.000000000 +0200
++++ gnash-0.8.3/gui/am-frag/fb.am 2008-08-19 00:38:04.000000000 +0200
+@@ -30,7 +30,7 @@
+ fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+ fb_gnash_SOURCES +=
+ fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+- $(GNASH_LIBS) $(AGG_LIBS)
++ $(GNASH_LIBS) $(AGG_LIBS) $(INTLLIBS)
+ endif # BUILD_AGG_RENDERER
+ endif # BUILD_FB_GUI
+
============================================================
--- packages/gpe-memo/gpe-memo_0.2.bb 388b2fac728542b4c47ba5fa38942475892fd5e8
+++ packages/gpe-memo/gpe-memo_0.2.bb 388b2fac728542b4c47ba5fa38942475892fd5e8
@@ -0,0 +1,9 @@
+DESCRIPTION = "GPE Voice Notes Recorder"
+SECTION = "gpe/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libgsm gpe-soundserver"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
+
============================================================
--- packages/nandlogical/nandlogical-static_1.0.0.bb c6eb029366961e0afd263bbe27cd2e6cd0078dcf
+++ packages/nandlogical/nandlogical-static_1.0.0.bb c6eb029366961e0afd263bbe27cd2e6cd0078dcf
@@ -0,0 +1,5 @@
+require nandlogical_${PV}.bb
+
+do_compile () {
+ ${CC} -o nandlogical ${WORKDIR}/nandlogical.c -static
+}
============================================================
--- packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch 1745cb136349f6b3095458128c6e4db6076b8864
+++ packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch 1745cb136349f6b3095458128c6e4db6076b8864
@@ -0,0 +1,18 @@
+--- tangogps-0.9.2/src/gps_functions.c~ 2008-08-15 05:54:26.000000000 +0930
++++ tangogps-0.9.2/src/gps_functions.c 2008-08-15 23:29:19.000000000 +0930
+@@ -649,6 +649,7 @@
+ int timestamp, double latitude, double longitude, double altitude, void *user_data)
+ {
+ if (gpsdata->valid) {
++ gpsdata->fix.time = timestamp;
+ gpsdata->fix.latitude = latitude;
+ gpsdata->fix.longitude = longitude;
+ gpsdata->fix.altitude = altitude;
+@@ -664,6 +665,7 @@
+ static void on_course_changed(GypsyCourse *course, GypsyCourseFields fields_set,
+ int timestamp, double speed, double direction, double climb, void *user_data)
+ {
++ gpsdata->fix.time = timestamp;
+ gpsdata->fix.speed = speed/3.6;
+ gpsdata->fix.track = direction;
+ }
============================================================
--- packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f
+++ packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f
@@ -0,0 +1,112 @@
+--- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ "if testkey 101 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x00060000 0x00540000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 2 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 18 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 3 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \
+ "bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND "" // "run boot_flash"
+ #endif
+
+-#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
+ #define CONFIG_INITRD_TAG 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT "nand0=laze-0"
++#define MTDIDS_DEFAULT "nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)"
+
+ /*
+ * SHARP SL NAND logical partition
+--- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ "if testkey 101 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x00060000 0x00540000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 2 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 18 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 3 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \
+ "bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND "" // "run boot_flash"
%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list