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. r1098 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
2. r1099 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r1100 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
4. r1101 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r1102 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
6. r1103 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
7. r1104 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
8. r1105 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-02-24 14:04:08 +0100 (Sat, 24 Feb 2007)
New Revision: 1098
Modified:
trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
Log:
remove MISCCR definitions in resume patch
Modified: trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-24
13:03:41 UTC (rev 1097)
+++ trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-24
13:04:08 UTC (rev 1098)
@@ -61,48 +61,4 @@
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
adr r0, _start /* r0 <- current position of code */
-Index: u-boot/include/s3c2410.h
-===================================================================
---- u-boot.orig/include/s3c2410.h
-+++ u-boot/include/s3c2410.h
-@@ -233,4 +233,40 @@ static inline S3C2410_SDI * S3C2410_GetB
- rINTPND;\
- }
- /* Wait until rINTPND is changed for the case that the ISR is very short. */
-+
-+#define S3C2410_MISCCR_USBDEV (0<<3)
-+#define S3C2410_MISCCR_USBHOST (1<<3)
-+
-+#define S3C2410_MISCCR_CLK0_MPLL (0<<4)
-+#define S3C2410_MISCCR_CLK0_UPLL (1<<4)
-+#define S3C2410_MISCCR_CLK0_FCLK (2<<4)
-+#define S3C2410_MISCCR_CLK0_HCLK (3<<4)
-+#define S3C2410_MISCCR_CLK0_PCLK (4<<4)
-+#define S3C2410_MISCCR_CLK0_DCLK0 (5<<4)
-+#define S3C2410_MISCCR_CLK0_MASK (7<<4)
-+
-+#define S3C2410_MISCCR_CLK1_MPLL (0<<8)
-+#define S3C2410_MISCCR_CLK1_UPLL (1<<8)
-+#define S3C2410_MISCCR_CLK1_FCLK (2<<8)
-+#define S3C2410_MISCCR_CLK1_HCLK (3<<8)
-+#define S3C2410_MISCCR_CLK1_PCLK (4<<8)
-+#define S3C2410_MISCCR_CLK1_DCLK1 (5<<8)
-+#define S3C2410_MISCCR_CLK1_MASK (7<<8)
-+
-+#define S3C2410_MISCCR_USBSUSPND0 (1<<12)
-+#define S3C2410_MISCCR_USBSUSPND1 (1<<13)
-+
-+#define S3C2410_MISCCR_nRSTCON (1<<16)
-+
-+#define S3C2410_MISCCR_nEN_SCLK0 (1<<17)
-+#define S3C2410_MISCCR_nEN_SCLK1 (1<<18)
-+#define S3C2410_MISCCR_nEN_SCLKE (1<<19)
-+#define S3C2410_MISCCR_SDSLEEP (7<<17)
-+
-+#define S3C2410_CLKSLOW_UCLK_OFF (1<<7)
-+#define S3C2410_CLKSLOW_MPLL_OFF (1<<5)
-+#define S3C2410_CLKSLOW_SLOW (1<<4)
-+#define S3C2410_CLKSLOW_SLOWVAL(x) (x)
-+#define S3C2410_CLKSLOW_GET_SLOWVAL(x) ((x) & 7)
-+
- #endif /*__S3C2410_H__*/
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-24 14:04:21 +0100 (Sat, 24 Feb 2007)
New Revision: 1099
Modified:
trunk/src/target/u-boot/patches/series
Log:
comment out all 'suspicious' patches
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-24 13:04:08 UTC (rev
1098)
+++ trunk/src/target/u-boot/patches/series 2007-02-24 13:04:21 UTC (rev
1099)
@@ -21,10 +21,12 @@
# under construction, but intended for mainline
uboot-s3c2410-misccr-definitions.patch
-boot-from-ram-reloc.patch
-boot-from-ram-and-nand.patch
-wakeup-reason-nand-only.patch
-uboot-neo1973-resume.patch
+
+#boot-from-ram-reloc.patch
+#boot-from-ram-and-nand.patch
+#wakeup-reason-nand-only.patch
+#uboot-neo1973-resume.patch
+
uboot-arm920t-gd_in_irq.patch
# this will be somewhat more difficult
@@ -42,9 +44,6 @@
dynpart-absorb-bad.patch
uboot-bbt-quiet.patch
-# those have to be implemented fully
-uboot-dfu.patch
-
# splash screen
raise-limits.patch
set-hwswp.patch
@@ -53,10 +52,13 @@
enable-splash-bmp.patch
# for automated installation
-preboot-override.patch
+#preboot-override.patch
lowlevel_foo.patch
+# those have to be implemented fully
+uboot-dfu.patch
+
# move these later, once the dust has settled
-default-env.patch
-console-ansi.patch
-boot-menu.patch
+#default-env.patch
+#console-ansi.patch
+#boot-menu.patch
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-24 14:20:18 +0100 (Sat, 24 Feb 2007)
New Revision: 1100
Modified:
trunk/src/target/u-boot/patches/series
Log:
re-enable obviously unrelated patches
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-24 13:04:21 UTC (rev
1099)
+++ trunk/src/target/u-boot/patches/series 2007-02-24 13:20:18 UTC (rev
1100)
@@ -60,5 +60,5 @@
# move these later, once the dust has settled
#default-env.patch
-#console-ansi.patch
-#boot-menu.patch
+console-ansi.patch
+boot-menu.patch
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-24 14:21:16 +0100 (Sat, 24 Feb 2007)
New Revision: 1101
Modified:
trunk/src/target/u-boot/patches/series
Log:
too early :( back out bootmeny due to default_env() dependency
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-24 13:20:18 UTC (rev
1100)
+++ trunk/src/target/u-boot/patches/series 2007-02-24 13:21:16 UTC (rev
1101)
@@ -61,4 +61,4 @@
# move these later, once the dust has settled
#default-env.patch
console-ansi.patch
-boot-menu.patch
+#boot-menu.patch
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-24 14:47:14 +0100 (Sat, 24 Feb 2007)
New Revision: 1102
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
Log:
merge and activate wakeup-reason-nand-only.patch, it's not the culprit
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-24 13:21:16 UTC (rev
1101)
+++ trunk/src/target/u-boot/patches/series 2007-02-24 13:47:14 UTC (rev
1102)
@@ -24,7 +24,7 @@
#boot-from-ram-reloc.patch
#boot-from-ram-and-nand.patch
-#wakeup-reason-nand-only.patch
+wakeup-reason-nand-only.patch
#uboot-neo1973-resume.patch
uboot-arm920t-gd_in_irq.patch
Modified: trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
===================================================================
--- trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
2007-02-24 13:21:16 UTC (rev 1101)
+++ trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
2007-02-24 13:47:14 UTC (rev 1102)
@@ -10,9 +10,9 @@
Index: u-boot/board/neo1973/neo1973.c
===================================================================
---- u-boot.orig/board/neo1973/neo1973.c
-+++ u-boot/board/neo1973/neo1973.c
-@@ -193,12 +193,16 @@ int board_init (void)
+--- u-boot.orig/board/neo1973/neo1973.c 2007-02-24 14:43:12.000000000
+0100
++++ u-boot/board/neo1973/neo1973.c 2007-02-24 14:43:14.000000000 +0100
+@@ -193,12 +193,16 @@
int board_late_init(void)
{
@@ -29,7 +29,7 @@
/* obtain wake-up reason, save INT1 in environment */
tmp = pcf50606_reg_read(PCF50606_REG_INT1);
sprintf(buf, "0x%02x", tmp);
-@@ -241,6 +245,7 @@ int board_late_init(void)
+@@ -241,6 +245,7 @@
neo1973_poweroff();
}
@@ -39,30 +39,28 @@
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S
-+++ u-boot/cpu/arm920t/start.S
-@@ -77,6 +77,14 @@ _fiq: .word fiq
+--- u-boot.orig/cpu/arm920t/start.S 2007-02-24 14:43:12.000000000 +0100
++++ u-boot/cpu/arm920t/start.S 2007-02-24 14:45:20.000000000 +0100
+@@ -77,6 +77,12 @@
*************************************************************************
*/
-+#ifdef CONFIG_S3C2410_NAND_BOOT
+.globl booted_from_nand
+booted_from_nand:
+ .word 0
+_booted_from_nand:
+ .word booted_from_nand
-+#endif /* CONFIG_S3C2410_NAND_BOOT */
+
_TEXT_BASE:
.word TEXT_BASE
-@@ -281,6 +289,9 @@ notmatch:
+@@ -269,6 +275,9 @@
#endif
1: b 1b
done_nand_read:
+ ldr r0, _booted_from_nand
+ mov r1, #1
+ strb r1, [r0]
- #endif /* CONFIG_S3C2410_NAND_BOOT */
- done_relocate:
- #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+ #endif /* NAND_BOOT */
+ #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-24 15:20:43 +0100 (Sat, 24 Feb 2007)
New Revision: 1103
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
Log:
* we always have to configure UPLLCON when reconfiguring MPLLCON (!)
* re-enable uboot-neo1973-resume.patch
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-24 13:47:14 UTC (rev
1102)
+++ trunk/src/target/u-boot/patches/series 2007-02-24 14:20:43 UTC (rev
1103)
@@ -25,7 +25,7 @@
#boot-from-ram-reloc.patch
#boot-from-ram-and-nand.patch
wakeup-reason-nand-only.patch
-#uboot-neo1973-resume.patch
+uboot-neo1973-resume.patch
uboot-arm920t-gd_in_irq.patch
Modified: trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-24
13:47:14 UTC (rev 1102)
+++ trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-24
14:20:43 UTC (rev 1103)
@@ -4,9 +4,9 @@
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S
-+++ u-boot/cpu/arm920t/start.S
-@@ -158,18 +158,52 @@ reset:
+--- u-boot.orig/cpu/arm920t/start.S 2007-02-24 15:14:00.000000000 +0100
++++ u-boot/cpu/arm920t/start.S 2007-02-24 15:17:47.000000000 +0100
+@@ -156,11 +156,37 @@
str r1, [r0]
# endif
@@ -14,6 +14,7 @@
+#define LOCKTIME 0x4c000000
+#define MPLLCON 0x4c000004
+#define MPLLCFG ((0x90 << 12) + (0x2 << 4) + 0x2)
++#define UPLLCFG ((0x78 << 12) + (0x2 << 4) + 0x3)
+ ldr r0, =LOCKTIME
+ mov r1, #0xffffff
+ str r1, [r0]
@@ -22,6 +23,9 @@
+ ldr r1, =MPLLCFG
+ str r1, [r0]
+
++ ldr r1, =UPLLCFG
++ str r1, [r0, #4] /* UPLLCON */
++
/* FCLK:HCLK:PCLK = 1:2:4 */
- /* default FCLK is 120 MHz ! */
ldr r0, =CLKDIVN
@@ -40,17 +44,18 @@
+ bpl 1b
#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
+ /*
+@@ -169,7 +195,19 @@
+ */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
- #ifndef CONFIG_LL_INIT_NAND_ONLY
bl cpu_init_crit
- #endif
-#endif
+#if defined(CONFIG_S3C2410)
+ /* ensure some refresh has happened */
+ mov r1, #4096
+1: subs r1, r1, #1
+ bpl 1b
-+
++
+ /* test for resume */
+ ldr r1, =0x560000B4 /* gstatus2 */
+ ldr r0, [ r1 ]
@@ -60,5 +65,4 @@
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
- adr r0, _start /* r0 <- current position of code */
-
+ #ifndef CONFIG_S3C2410_NAND_BOOT
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-24 15:24:26 +0100 (Sat, 24 Feb 2007)
New Revision: 1104
Modified:
trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch
Log:
* we always have to re-configure UPLL when reconfiguring MPLL
Modified: trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch 2007-02-24
14:20:43 UTC (rev 1103)
+++ trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch 2007-02-24
14:24:26 UTC (rev 1104)
@@ -5,8 +5,8 @@
Index: u-boot/cpu/arm920t/s3c24x0/Makefile
===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-16 23:24:10.000000000
+0100
-+++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-16 23:27:58.000000000
+0100
+--- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-24 15:14:00.000000000
+0100
++++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-24 15:21:02.000000000
+0100
@@ -26,7 +26,7 @@
LIB = $(obj)lib$(SOC).a
@@ -19,8 +19,8 @@
Index: u-boot/cpu/arm920t/s3c24x0/cmd_s3c2410.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/cpu/arm920t/s3c24x0/cmd_s3c2410.c 2007-02-16 23:27:31.000000000
+0100
-@@ -0,0 +1,151 @@
++++ u-boot/cpu/arm920t/s3c24x0/cmd_s3c2410.c 2007-02-24 15:22:17.000000000
+0100
+@@ -0,0 +1,152 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -118,6 +118,7 @@
+
+ /* configure MPLL */
+ clk_power->MPLLCON = pll_configs[i].mpllcon;
++ clk_power->UPLLCON = ((0x78 << 12) + (0x2 << 4) + 0x3),
+ clk_power->CLKDIVN = pll_configs[i].clkdivn;
+
+ /* If we changed the speed, we need to re-configure
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-02-24 17:00:11 +0100 (Sat, 24 Feb 2007)
New Revision: 1105
Modified:
trunk/src/target/u-boot/patches/lowlevel_foo.patch
trunk/src/target/u-boot/patches/preboot-override.patch
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
Log:
series: enabled all backed out patches
wakeup-reason-nand-only.patch:
cpu/arm920t/start.S: manually applied failing hunk
cpu/arm920t/start.S: brought back #ifdef around booted_from_nand variable
uboot-neo1973-resume.patch:
cpu/arm920t/start.S: moved hunk "patch" applies to wrong spot (offset 33 lines)
uboot-s3c2410-norelocate_irqvec_cpy.patch:
cpu/arm920t/start.S: manually applied failing hunk, trimmed jump logic
cpu/arm920t/start.S: moved vector table copying into
!CONFIG_SKIP_RELOCATE_UBOOT
preboot-override.patch:
cpu/arm920t/start.S: moved hunk "patch" applies to wrong spot (offset 133 lines)
lowlevel_foo.patch:
board/neo1973/Makefile: lowlevel_foo also depends on lowlevel_foo.lds
Modified: trunk/src/target/u-boot/patches/lowlevel_foo.patch
===================================================================
--- trunk/src/target/u-boot/patches/lowlevel_foo.patch 2007-02-24 14:24:26 UTC
(rev 1104)
+++ trunk/src/target/u-boot/patches/lowlevel_foo.patch 2007-02-24 16:00:11 UTC
(rev 1105)
@@ -170,7 +170,7 @@
+ $(CC) -c -DTEXT_BASE=0x33F80000 -march=armv4 \
+ -o lowlevel_foo.o lowlevel_foo.S
+
-+lowlevel_foo: lowlevel_foo.o lowlevel_init.o
++lowlevel_foo: lowlevel_foo.o lowlevel_init.o lowlevel_foo.lds
+ $(LD) -T ./lowlevel_foo.lds -Ttext 0x33f80000 -Bstatic \
+ lowlevel_init.o lowlevel_foo.o -o lowlevel_foo
+
Modified: trunk/src/target/u-boot/patches/preboot-override.patch
===================================================================
--- trunk/src/target/u-boot/patches/preboot-override.patch 2007-02-24
14:24:26 UTC (rev 1104)
+++ trunk/src/target/u-boot/patches/preboot-override.patch 2007-02-24
16:00:11 UTC (rev 1105)
@@ -17,10 +17,11 @@
===================================================================
--- u-boot.orig/cpu/arm920t/start.S
+++ u-boot/cpu/arm920t/start.S
-@@ -77,6 +77,13 @@ _fiq: .word fiq
+@@ -77,6 +77,14 @@ _fiq: .word fiq
*************************************************************************
*/
++
+/* Must follow the .balign above, so we get a well-known address ! */
+#ifdef CFG_PREBOOT_OVERRIDE
+.globl preboot_override
@@ -35,7 +36,7 @@
===================================================================
--- u-boot.orig/include/configs/neo1973.h
+++ u-boot/include/configs/neo1973.h
-@@ -205,6 +205,7 @@
+@@ -207,6 +207,7 @@
#define CFG_ENV_IS_IN_NAND 1
#define CFG_ENV_SIZE 0x4000 /* 16k Total Size of
Environment Sector */
#define CFG_ENV_OFFSET_OOB 1 /* Location of ENV stored in
block 0 OOB */
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-24 14:24:26 UTC (rev
1104)
+++ trunk/src/target/u-boot/patches/series 2007-02-24 16:00:11 UTC (rev
1105)
@@ -22,8 +22,8 @@
# under construction, but intended for mainline
uboot-s3c2410-misccr-definitions.patch
-#boot-from-ram-reloc.patch
-#boot-from-ram-and-nand.patch
+boot-from-ram-reloc.patch
+boot-from-ram-and-nand.patch
wakeup-reason-nand-only.patch
uboot-neo1973-resume.patch
@@ -52,13 +52,13 @@
enable-splash-bmp.patch
# for automated installation
-#preboot-override.patch
+preboot-override.patch
lowlevel_foo.patch
# those have to be implemented fully
uboot-dfu.patch
# move these later, once the dust has settled
-#default-env.patch
+default-env.patch
console-ansi.patch
-#boot-menu.patch
+boot-menu.patch
Modified: trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-24
14:24:26 UTC (rev 1104)
+++ trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-24
16:00:11 UTC (rev 1105)
@@ -4,9 +4,9 @@
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S 2007-02-24 15:14:00.000000000 +0100
-+++ u-boot/cpu/arm920t/start.S 2007-02-24 15:17:47.000000000 +0100
-@@ -156,11 +156,37 @@
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -156,18 +156,56 @@ reset:
str r1, [r0]
# endif
@@ -44,11 +44,10 @@
+ bpl 1b
#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
- /*
-@@ -169,7 +195,19 @@
- */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
+ #ifndef CONFIG_LL_INIT_NAND_ONLY
bl cpu_init_crit
+ #endif
-#endif
+#if defined(CONFIG_S3C2410)
+ /* ensure some refresh has happened */
@@ -65,4 +64,4 @@
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
- #ifndef CONFIG_S3C2410_NAND_BOOT
+ adr r0, _start /* r0 <- current position of code */
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
2007-02-24 14:24:26 UTC (rev 1104)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
2007-02-24 16:00:11 UTC (rev 1105)
@@ -3,13 +3,14 @@
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S 2007-02-24 12:36:20.000000000 +0100
-+++ u-boot/cpu/arm920t/start.S 2007-02-24 12:39:54.000000000 +0100
-@@ -270,6 +270,23 @@
- 1: b 1b
- done_nand_read:
- #endif /* NAND_BOOT */
-+#else /* CONFIG_SKIP_RELOCATE_UBOOT */
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -332,7 +332,23 @@ done_nand_read:
+ strb r1, [r0]
+ #endif /* CONFIG_S3C2410_NAND_BOOT */
+ done_relocate:
+-#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
++
+#if defined(CONFIG_USE_IRQ) && defined(CONFIG_S3C2410)
+ /* In the case of the S3C2410, if we've somehow magically (JTAG, ...)
+ ended up in RAM, then that ram is mapped to 0x30000000 and not 0.
@@ -22,10 +23,10 @@
+ ldr r3, [r1], #4
+ str r3, [r0], #4
+ subs r2, r2, #4
-+ beq irqvec_cpy_done
+ bne irqvec_cpy_next
-+irqvec_cpy_done:
+#endif /* CONFIG_USE_IRQ */
- #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
++
++#endif /* !CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
+ stack_setup:
Modified: trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
===================================================================
--- trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
2007-02-24 14:24:26 UTC (rev 1104)
+++ trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
2007-02-24 16:00:11 UTC (rev 1105)
@@ -10,9 +10,9 @@
Index: u-boot/board/neo1973/neo1973.c
===================================================================
---- u-boot.orig/board/neo1973/neo1973.c 2007-02-24 14:43:12.000000000
+0100
-+++ u-boot/board/neo1973/neo1973.c 2007-02-24 14:43:14.000000000 +0100
-@@ -193,12 +193,16 @@
+--- u-boot.orig/board/neo1973/neo1973.c
++++ u-boot/board/neo1973/neo1973.c
+@@ -193,12 +193,16 @@ int board_init (void)
int board_late_init(void)
{
@@ -29,7 +29,7 @@
/* obtain wake-up reason, save INT1 in environment */
tmp = pcf50606_reg_read(PCF50606_REG_INT1);
sprintf(buf, "0x%02x", tmp);
-@@ -241,6 +245,7 @@
+@@ -241,6 +245,7 @@ int board_late_init(void)
neo1973_poweroff();
}
@@ -39,28 +39,30 @@
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S 2007-02-24 14:43:12.000000000 +0100
-+++ u-boot/cpu/arm920t/start.S 2007-02-24 14:45:20.000000000 +0100
-@@ -77,6 +77,12 @@
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -77,6 +77,14 @@ _fiq: .word fiq
*************************************************************************
*/
++#ifdef CONFIG_S3C2410_NAND_BOOT
+.globl booted_from_nand
+booted_from_nand:
+ .word 0
+_booted_from_nand:
+ .word booted_from_nand
++#endif /* CONFIG_S3C2410_NAND_BOOT */
+
_TEXT_BASE:
.word TEXT_BASE
-@@ -269,6 +275,9 @@
+@@ -281,6 +289,9 @@ notmatch:
#endif
1: b 1b
done_nand_read:
+ ldr r0, _booted_from_nand
+ mov r1, #1
+ strb r1, [r0]
- #endif /* NAND_BOOT */
- #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
-
+ #endif /* CONFIG_S3C2410_NAND_BOOT */
+ done_relocate:
+ #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
