r1105 - trunk/src/target/u-boot/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Sat Feb 24 17:00:16 CET 2007
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 */
More information about the commitlog
mailing list
