Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3818 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
2. r3819 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
3. r3820 - trunk/src/target/u-boot/scripts ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-01-12 18:31:35 +0100 (Sat, 12 Jan 2008)
New Revision: 3818
Modified:
trunk/src/target/u-boot/patches/console-ansi.patch
trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
Log:
Upgrading to upstream version 3afac79ec27b91df185f090b31dad9620779f440 required
two simple changes.
uboot-s3c2410_fb.patch:
- drivers/video/Makefile: trivial patch breakage after upgrade to upstream
version 3afac79ec27b91df185f090b31dad9620779f440
console-ansi.patch:
- drivers/video/cfb_console.c (video_putc): upstream now handles \r, so we
don't have to
Modified: trunk/src/target/u-boot/patches/console-ansi.patch
===================================================================
--- trunk/src/target/u-boot/patches/console-ansi.patch 2008-01-11 21:49:33 UTC
(rev 3817)
+++ trunk/src/target/u-boot/patches/console-ansi.patch 2008-01-12 17:31:35 UTC
(rev 3818)
@@ -8,7 +8,7 @@
===================================================================
--- u-boot.orig/drivers/video/cfb_console.c
+++ u-boot/drivers/video/cfb_console.c
-@@ -181,6 +181,7 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the
+@@ -185,6 +185,7 @@
#include <version.h>
#include <linux/types.h>
@@ -16,10 +16,11 @@
#include <devices.h>
#include <video_font.h>
-@@ -676,10 +677,96 @@ static void console_newline (void)
+@@ -691,10 +692,95 @@
/*****************************************************************************/
++
+static enum {
+ CS_NORMAL = 0,
+ CS_ESC,
@@ -100,6 +101,8 @@
+
void video_putc (const char c)
{
+ static int nl = 1;
+
+ if (state) {
+ escape_sequence(c);
+ CURSOR_SET;
@@ -107,14 +110,9 @@
+ }
+
switch (c) {
-- case 13: /* ignore */
-+ case 13: /* return to beginning of line */
-+ CURSOR_OFF;
-+ console_col = 0;
- break;
-
- case '\n': /* next line */
-@@ -698,6 +785,10 @@ void video_putc (const char c)
+ case 13: /* back to first column */
+ console_cr ();
+@@ -718,6 +804,10 @@
console_back ();
break;
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch 2008-01-11
21:49:33 UTC (rev 3817)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch 2008-01-12
17:31:35 UTC (rev 3818)
@@ -2,10 +2,10 @@
===================================================================
--- u-boot.orig/drivers/video/Makefile
+++ u-boot/drivers/video/Makefile
-@@ -28,6 +28,7 @@
- COBJS-y += ati_radeon_fb.o
+@@ -29,6 +29,7 @@
COBJS-y += cfb_console.o
COBJS-y += ct69000.o
+ COBJS-y += mb862xx.o
+COBJS-y += s3c2410_fb.o
COBJS-y += sed13806.o
COBJS-y += sed156x.o
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-12 22:19:34 +0100 (Sat, 12 Jan 2008)
New Revision: 3819
Added:
trunk/src/target/u-boot/patches/boot-from-nor.patch
Modified:
trunk/src/target/u-boot/patches/series
Log:
Initialize memory also when booting from NOR.
boot-from-nor.patch:
- cpu/arm920t/start.S: added low-level setup if executing from address 0
Added: trunk/src/target/u-boot/patches/boot-from-nor.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-from-nor.patch 2008-01-12 17:31:35 UTC
(rev 3818)
+++ trunk/src/target/u-boot/patches/boot-from-nor.patch 2008-01-12 21:19:34 UTC
(rev 3819)
@@ -0,0 +1,18 @@
+Index: u-boot/cpu/arm920t/start.S
+===================================================================
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -202,6 +202,13 @@
+ #endif /* CONFIG_S3C2410_NAND_BOOT */
+
+ relocate: /* relocate U-Boot to RAM */
++#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
++ teq r0, #0 /* running at address 0 ? */
++ bleq cpu_init_crit /* yes -> do low-level setup */
++#endif /* !CONFIG_SKIP_LOWLEVEL_INIT && CONFIG_LL_INIT_NAND_ONLY */
++
++ adr r0, _start /* the above may have clobbered r0 */
++
+ ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
+ cmp r0, r1 /* don't reloc during debug */
+ beq done_relocate
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2008-01-12 17:31:35 UTC (rev
3818)
+++ trunk/src/target/u-boot/patches/series 2008-01-12 21:19:34 UTC (rev
3819)
@@ -22,6 +22,7 @@
boot-from-ram-reloc.patch
boot-from-ram-and-nand.patch
+boot-from-nor.patch
wakeup-reason-nand-only.patch
uboot-neo1973-resume.patch
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-12 22:41:19 +0100 (Sat, 12 Jan 2008)
New Revision: 3820
Modified:
trunk/src/target/u-boot/scripts/build
Log:
Updated to GIT_HEAD 3afac79ec27b91df185f090b31dad9620779f440 and SVN_REV 3819.
Modified: trunk/src/target/u-boot/scripts/build
===================================================================
--- trunk/src/target/u-boot/scripts/build 2008-01-12 21:19:34 UTC (rev
3819)
+++ trunk/src/target/u-boot/scripts/build 2008-01-12 21:41:19 UTC (rev
3820)
@@ -20,10 +20,10 @@
# DEVICE=gta02v4
#
# GIT_HEAD, if defined, specifies which git head we use, e.g.,
-# GIT_HEAD=80adb2761627ec10eb8997bea6c1e52e34816c6b
+# GIT_HEAD=3afac79ec27b91df185f090b31dad9620779f440
#
# SVN_REV, if defined, specifies which SVN revision we use, e.g.,
-# SVN_REV=3801
+# SVN_REV=3819
#
git clone git://www.denx.de/git/u-boot.git
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
