[oe-commits] org.oe.dev merge of '82673acfb73d52fea0af1765fcc388e06da120fe'
thebohemian commit
oe at amethyst.openembedded.net
Fri Apr 25 10:27:50 UTC 2008
merge of '82673acfb73d52fea0af1765fcc388e06da120fe'
and 'b37044d8c845daa30d482ff54744391de3b55387'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 0b298a54489a7e3db91479ee3796d45b7f1eb01d
ViewMTN: http://monotone.openembedded.org/revision/info/0b298a54489a7e3db91479ee3796d45b7f1eb01d
Files:
1
packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch
packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch
packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch
packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch
packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch
packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff
packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff
packages/linux/linux-mainstone_2.6.25-rc4.bb
packages/linux/linux-mainstone_2.6.25.bb
packages/gdb/gdb-6.8
packages/gdb/gdb-6.8/early_debug_in_nptl.patch
packages/gdb/gdb-cross-sdk_6.8.bb
packages/gdb/gdb-cross_6.8.bb
packages/gdb/gdb_6.8.bb
packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff
packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff
packages/diffutils/diffutils_2.8.1.bb
packages/libpcre/libpcre_7.6.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/make/make.inc
conf/distro/include/preferred-om-2008-versions.inc
Diffs:
#
# mt diff -r82673acfb73d52fea0af1765fcc388e06da120fe -r0b298a54489a7e3db91479ee3796d45b7f1eb01d
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff"
#
# rename "packages/linux/linux-mainstone_2.6.25-rc4.bb"
# to "packages/linux/linux-mainstone_2.6.25.bb"
#
# add_dir "packages/gdb/gdb-6.8"
#
# add_file "packages/gdb/gdb-6.8/early_debug_in_nptl.patch"
# content [6e027b2499da589384a40847de046842934ba44e]
#
# add_file "packages/gdb/gdb-cross-sdk_6.8.bb"
# content [9444a910f04467593c5c669381d5ed60212c8324]
#
# add_file "packages/gdb/gdb-cross_6.8.bb"
# content [0ea423cc4dde24b7f31c9c213c5c9016bcee6ed5]
#
# add_file "packages/gdb/gdb_6.8.bb"
# content [46a7734cc95c48722b3546e977c35ed0591233c9]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff"
# content [bde4f65e0345e087df4f133e72a18c3cde96f4fc]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff"
# content [584bfed74654ff8ea3d5e6daba7a7e3d3e2f58e5]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff"
# content [ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c]
#
# patch "packages/diffutils/diffutils_2.8.1.bb"
# from [8549a96143d03b98e290128f5dbd920fde3f0b15]
# to [56edb2ce56f8f5b687f020e7754b9a64fc49c50d]
#
# patch "packages/libpcre/libpcre_7.6.bb"
# from [603909433dfd8e32909049de4d3e77a2552f140d]
# to [c46013011971789edcc9c8fbdc494ef7dde53070]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [bc15768a00d9732527c58ff3b36e2ea189570eec]
# to [ffa35a912f2d6c8016f6ea1d0f7ebb27987a9b28]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [f6a989195a756909587fd8afd2970c3b15be7872]
# to [572958866b1224d050811203fda9df19ee3f106a]
#
# patch "packages/make/make.inc"
# from [b2b35232537d7fe8c57799427d2bb1fed207e0c9]
# to [4759259ccabb41394e92a35fbaa83fa5775621ad]
#
============================================================
--- packages/gdb/gdb-6.8/early_debug_in_nptl.patch 6e027b2499da589384a40847de046842934ba44e
+++ packages/gdb/gdb-6.8/early_debug_in_nptl.patch 6e027b2499da589384a40847de046842934ba44e
@@ -0,0 +1,306 @@
+http://sourceware.org/ml/gdb-patches/2007-06/msg00479.html
+
+Index: gdb/linux-thread-db.c
+===================================================================
+--- gdb/linux-thread-db.c.orig 2006-10-20 03:08:14.000000000 +0200
++++ gdb/linux-thread-db.c 2008-03-01 14:45:52.000000000 +0100
+@@ -213,6 +213,21 @@
+ }
+ }
+
++/* Return 1 if any threads have been registered. There may be none if
++ the threading library is not fully initialized yet. */
++
++static int
++have_threads_callback (struct thread_info *thread, void *dummy)
++{
++ return 1;
++}
++
++static int
++have_threads (void)
++{
++ return iterate_over_threads (have_threads_callback, NULL) != NULL;
++}
++
+ /* A callback function for td_ta_thr_iter, which we use to map all
+ threads to LWPs.
+
+@@ -700,23 +715,6 @@
+ }
+
+ static void
+-thread_db_attach (char *args, int from_tty)
+-{
+- target_beneath->to_attach (args, from_tty);
+-
+- /* Destroy thread info; it's no longer valid. */
+- init_thread_list ();
+-
+- /* The child process is now the actual multi-threaded
+- program. Snatch its process ID... */
+- proc_handle.pid = GET_PID (inferior_ptid);
+-
+- /* ...and perform the remaining initialization steps. */
+- enable_thread_event_reporting ();
+- thread_db_find_new_threads ();
+-}
+-
+-static void
+ detach_thread (ptid_t ptid, int verbose)
+ {
+ struct thread_info *thread_info;
+@@ -742,14 +740,13 @@
+ disable_thread_event_reporting ();
+
+ /* There's no need to save & restore inferior_ptid here, since the
+- inferior is supposed to be survive this function call. */
++ inferior is not supposed to survive this function call. */
+ inferior_ptid = lwp_from_thread (inferior_ptid);
+
+- /* Forget about the child's process ID. We shouldn't need it
+- anymore. */
+- proc_handle.pid = 0;
+-
+ target_beneath->to_detach (args, from_tty);
++
++ /* Should this be done by detach_command? */
++ target_mourn_inferior ();
+ }
+
+ static int
+@@ -870,12 +867,6 @@
+
+ ptid = target_beneath->to_wait (ptid, ourstatus);
+
+- if (proc_handle.pid == 0)
+- /* The current child process isn't the actual multi-threaded
+- program yet, so don't try to do any special thread-specific
+- post-processing and bail out early. */
+- return ptid;
+-
+ if (ourstatus->kind == TARGET_WAITKIND_EXITED
+ || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
+ return pid_to_ptid (-1);
+@@ -889,23 +880,32 @@
+ return pid_to_ptid (GET_PID (ptid));
+ }
+
++ /* If we do not know about the main thread yet, this would be a good time to
++ find it. */
++ if (ourstatus->kind == TARGET_WAITKIND_STOPPED && !have_threads ())
++ thread_db_find_new_threads ();
++
+ if (ourstatus->kind == TARGET_WAITKIND_STOPPED
+ && ourstatus->value.sig == TARGET_SIGNAL_TRAP)
+ /* Check for a thread event. */
+ check_event (ptid);
+
+- if (!ptid_equal (trap_ptid, null_ptid))
+- trap_ptid = thread_from_lwp (trap_ptid);
++ if (have_threads ())
++ {
++ /* Change ptids back into the higher level PID + TID format. If
++ the thread is dead and no longer on the thread list, we will
++ get back a dead ptid. This can occur if the thread death
++ event gets postponed by other simultaneous events. In such a
++ case, we want to just ignore the event and continue on. */
++
++ if (!ptid_equal (trap_ptid, null_ptid))
++ trap_ptid = thread_from_lwp (trap_ptid);
++
++ ptid = thread_from_lwp (ptid);
++ if (GET_PID (ptid) == -1)
++ ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
++ }
+
+- /* Change the ptid back into the higher level PID + TID format.
+- If the thread is dead and no longer on the thread list, we will
+- get back a dead ptid. This can occur if the thread death event
+- gets postponed by other simultaneous events. In such a case,
+- we want to just ignore the event and continue on. */
+- ptid = thread_from_lwp (ptid);
+- if (GET_PID (ptid) == -1)
+- ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
+-
+ return ptid;
+ }
+
+@@ -944,30 +944,6 @@
+ }
+
+ static void
+-thread_db_create_inferior (char *exec_file, char *allargs, char **env,
+- int from_tty)
+-{
+- unpush_target (&thread_db_ops);
+- using_thread_db = 0;
+- target_beneath->to_create_inferior (exec_file, allargs, env, from_tty);
+-}
+-
+-static void
+-thread_db_post_startup_inferior (ptid_t ptid)
+-{
+- if (proc_handle.pid == 0)
+- {
+- /* The child process is now the actual multi-threaded
+- program. Snatch its process ID... */
+- proc_handle.pid = GET_PID (ptid);
+-
+- /* ...and perform the remaining initialization steps. */
+- enable_thread_event_reporting ();
+- thread_db_find_new_threads ();
+- }
+-}
+-
+-static void
+ thread_db_mourn_inferior (void)
+ {
+ /* Forget about the child's process ID. We shouldn't need it
+@@ -1002,6 +978,22 @@
+
+ ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid);
+
++ if (ti.ti_tid == 0)
++ {
++ /* A thread ID of zero means that this is the main thread, but
++ glibc has not yet initialized thread-local storage and the
++ pthread library. We do not know what the thread's TID will
++ be yet. Just enable event reporting and otherwise ignore
++ it. */
++
++ err = td_thr_event_enable_p (th_p, 1);
++ if (err != TD_OK)
++ error (_("Cannot enable thread event reporting for %s: %s"),
++ target_pid_to_str (ptid), thread_db_err_str (err));
++
++ return 0;
++ }
++
+ if (!in_thread_list (ptid))
+ attach_thread (ptid, th_p, &ti, 1);
+
+@@ -1058,6 +1050,16 @@
+ return NULL;
+ }
+
++/* Return 1 if this thread has the same LWP as the passed PTID. */
++
++static int
++same_ptid_callback (struct thread_info *thread, void *arg)
++{
++ ptid_t *ptid_p = arg;
++
++ return GET_LWP (thread->ptid) == GET_LWP (*ptid_p);
++}
++
+ /* Get the address of the thread local variable in load module LM which
+ is stored at OFFSET within the thread local storage for thread PTID. */
+
+@@ -1066,6 +1068,21 @@
+ CORE_ADDR lm,
+ CORE_ADDR offset)
+ {
++ /* If we have not discovered any threads yet, check now. */
++ if (!is_thread (ptid) && !have_threads ())
++ thread_db_find_new_threads ();
++
++ /* Try to find a matching thread if we still have the LWP ID instead
++ of the thread ID. */
++ if (!is_thread (ptid))
++ {
++ struct thread_info *thread;
++
++ thread = iterate_over_threads (same_ptid_callback, &ptid);
++ if (thread != NULL)
++ ptid = thread->ptid;
++ }
++
+ if (is_thread (ptid))
+ {
+ td_err_e err;
+@@ -1125,14 +1142,11 @@
+ thread_db_ops.to_shortname = "multi-thread";
+ thread_db_ops.to_longname = "multi-threaded child process.";
+ thread_db_ops.to_doc = "Threads and pthreads support.";
+- thread_db_ops.to_attach = thread_db_attach;
+ thread_db_ops.to_detach = thread_db_detach;
+ thread_db_ops.to_resume = thread_db_resume;
+ thread_db_ops.to_wait = thread_db_wait;
+ thread_db_ops.to_xfer_partial = thread_db_xfer_partial;
+ thread_db_ops.to_kill = thread_db_kill;
+- thread_db_ops.to_create_inferior = thread_db_create_inferior;
+- thread_db_ops.to_post_startup_inferior = thread_db_post_startup_inferior;
+ thread_db_ops.to_mourn_inferior = thread_db_mourn_inferior;
+ thread_db_ops.to_find_new_threads = thread_db_find_new_threads;
+ thread_db_ops.to_pid_to_str = thread_db_pid_to_str;
+Index: gdb/gdbserver/thread-db.c
+===================================================================
+--- gdb/gdbserver/thread-db.c.orig 2006-10-17 18:02:27.000000000 +0200
++++ gdb/gdbserver/thread-db.c 2008-03-01 14:44:41.000000000 +0100
+@@ -40,6 +40,7 @@
+ /* Connection to the libthread_db library. */
+ static td_thragent_t *thread_agent;
+
++static void thread_db_find_new_threads (void);
+ static int find_new_threads_callback (const td_thrhandle_t *th_p, void *data);
+
+ static char *
+@@ -134,6 +135,8 @@
+ td_event_msg_t msg;
+ td_err_e err;
+ struct inferior_linux_data *tdata;
++ struct thread_info *inferior;
++ struct process_info *process;
+
+ if (debug_threads)
+ fprintf (stderr, "Thread creation event.\n");
+@@ -149,6 +152,14 @@
+ fprintf (stderr, "thread getmsg err: %s\n",
+ thread_db_err_str (err));
+
++ /* If we do not know about the main thread yet, this would be a good time to
++ find it. We need to do this to pick up the main thread before any newly
++ created threads. */
++ inferior = (struct thread_info *) all_threads.head;
++ process = get_thread_process (inferior);
++ if (process->thread_known == 0)
++ thread_db_find_new_threads ();
++
+ /* msg.event == TD_EVENT_CREATE */
+
+ find_new_threads_callback (msg.th_p, NULL);
+@@ -231,8 +242,24 @@
+ {
+ inferior = (struct thread_info *) all_threads.head;
+ process = get_thread_process (inferior);
++
+ if (process->thread_known == 0)
+ {
++ /* If the new thread ID is zero, a final thread ID will be
++ available later. Do not enable thread debugging yet. */
++ if (ti_p->ti_tid == 0)
++ {
++ err = td_thr_event_enable (th_p, 1);
++ if (err != TD_OK)
++ error ("Cannot enable thread event reporting for %d: %s",
++ ti_p->ti_lid, thread_db_err_str (err));
++ return;
++ }
++
++ if (process->lwpid != ti_p->ti_lid)
++ fatal ("PID mismatch! Expected %ld, got %ld",
++ (long) process->lwpid, (long) ti_p->ti_lid);
++
+ /* Switch to indexing the threads list by TID. */
+ change_inferior_id (&all_threads, ti_p->ti_tid);
+ goto found;
+@@ -331,6 +358,8 @@
+
+ process = get_thread_process (thread);
+ if (!process->thread_known)
++ thread_db_find_new_threads ();
++ if (!process->thread_known)
+ return TD_NOTHR;
+
+ err = td_thr_tls_get_addr (&process->th, (psaddr_t) load_module, offset,
============================================================
--- packages/gdb/gdb-cross-sdk_6.8.bb 9444a910f04467593c5c669381d5ed60212c8324
+++ packages/gdb/gdb-cross-sdk_6.8.bb 9444a910f04467593c5c669381d5ed60212c8324
@@ -0,0 +1,7 @@
+require gdb-cross.inc
+
+inherit sdk
+
+do_stage() {
+ :
+}
============================================================
--- packages/gdb/gdb-cross_6.8.bb 0ea423cc4dde24b7f31c9c213c5c9016bcee6ed5
+++ packages/gdb/gdb-cross_6.8.bb 0ea423cc4dde24b7f31c9c213c5c9016bcee6ed5
@@ -0,0 +1,8 @@
+require gdb-cross.inc
+
+SRC_URI += "file://sim-install-6.6.patch;patch=1"
+SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+
+inherit cross
+
+PR = "r1"
============================================================
--- packages/gdb/gdb_6.8.bb 46a7734cc95c48722b3546e977c35ed0591233c9
+++ packages/gdb/gdb_6.8.bb 46a7734cc95c48722b3546e977c35ed0591233c9
@@ -0,0 +1,3 @@
+require gdb.inc
+
+PR = "r1"
============================================================
--- packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff bde4f65e0345e087df4f133e72a18c3cde96f4fc
+++ packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff bde4f65e0345e087df4f133e72a18c3cde96f4fc
@@ -0,0 +1,71 @@
+From dac3cdc5952ab39fa7ae0545d43e2daa95329b07 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at openembedded.org>
+Date: Wed, 23 Apr 2008 09:38:31 +0200
+Subject: [PATCH] omap3beagle: register SD interface
+
+Signed-off-by: Koen Kooi <koen at openembedded.org>
+---
+ arch/arm/mach-omap2/Makefile | 3 ++-
+ arch/arm/mach-omap2/board-omap3beagle.c | 9 +++++++++
+ include/asm-arm/arch-omap/board-omap3beagle.h | 2 ++
+ 3 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
+index 9414141..84d99d2 100644
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
+@@ -35,7 +35,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
+ board-3430sdp-usb.o \
+ board-3430sdp-flash.o
+ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o
+-obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o
++obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
++ board-sdp-hsmmc.o
+ obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \
+ board-apollon-mmc.o \
+ board-apollon-keys.o
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0727ee2..c03bb26 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -48,8 +48,16 @@ static void __init omap3_beagle_init_irq(void)
+ omap_gpio_init();
+ }
+
++static struct omap_mmc_config omap3beagle_mmc_config __initdata = {
++ .mmc [0] = {
++ .enabled = 1,
++ .wire4 = 1,
++ },
++};
++
+ static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
+ { OMAP_TAG_UART, &omap3_beagle_uart_config },
++ { OMAP_TAG_MMC, &omap3beagle_mmc_config },
+ };
+
+ static void __init omap3_beagle_init(void)
+@@ -57,6 +65,7 @@ static void __init omap3_beagle_init(void)
+ omap_board_config = omap3_beagle_config;
+ omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ omap_serial_init();
++ sdp_mmc_init();
+ }
+
+ arch_initcall(omap3_beagle_i2c_init);
+diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h
+index c42db78..fcdf0bc 100644
+--- a/include/asm-arm/arch-omap/board-omap3beagle.h
++++ b/include/asm-arm/arch-omap/board-omap3beagle.h
+@@ -29,6 +29,8 @@
+ #ifndef __ASM_ARCH_OMAP3_BEAGLE_H
+ #define __ASM_ARCH_OMAP3_BEAGL%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb37044d8c845daa30d482ff54744391de3b55387 -r0b298a54489a7e3db91479ee3796d45b7f1eb01d
#
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [4a4dfbaf4802b29850fa5188e14ebea1859fc414]
# to [9221b3c3dee531353e646bd7d339ff9f3bc99c3b]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 4a4dfbaf4802b29850fa5188e14ebea1859fc414
+++ conf/distro/include/preferred-om-2008-versions.inc 9221b3c3dee531353e646bd7d339ff9f3bc99c3b
@@ -1296,7 +1296,7 @@ PREFERRED_VERSION_nail ?= "11.21"
PREFERRED_VERSION_mythfront-session ?= "1.5"
PREFERRED_VERSION_nabi ?= "0.17"
PREFERRED_VERSION_nail ?= "11.21"
-PREFERRED_VERSION_nano ?= "2.0.6"
+PREFERRED_VERSION_nano ?= "2.0.7"
PREFERRED_VERSION_nasm-native ?= "0.98.38"
PREFERRED_VERSION_nautilus ?= "2.12.2"
PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
More information about the Openembedded-commits
mailing list