r3163 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Mon Oct 15 07:54:26 CEST 2007
Author: laforge
Date: 2007-10-15 07:54:20 +0200 (Mon, 15 Oct 2007)
New Revision: 3163
Added:
trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
trunk/src/target/u-boot/patches/uboot-s3c2442.patch
trunk/src/target/u-boot/patches/uboot-s3c2443.patch
Log:
re-sync with mainline u-boot start.S changes
* correctly boot from NAND (conflict intoruced by AT91RM9200 changes)
* don't call the LED code in lib_arm/board.o since it is not part of
the steppingstone
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/series 2007-10-15 05:54:20 UTC (rev 3163)
@@ -10,6 +10,7 @@
uboot-arm920t-gd_in_irq.patch
uboot-arm920_s3c2410_irq_demux.patch
uboot-s3c2410-nand.patch
+uboot-s3c2410-nand-led.patch
uboot-cmd_s3c2410.patch
uboot-s3c2410-mmc.patch
uboot-s3c24xx_multi_serial.patch
Added: trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch 2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand-led.patch 2007-10-15 05:54:20 UTC (rev 3163)
@@ -0,0 +1,23 @@
+If we boot from the S3C24xx NAND, then we only have access to the
+first 4kByte of memory. Thus, te coloured_LED_init and red_LED_on
+functions defined in lib_arm/board.o cannot be referenced at this
+point.
+
+Index: u-boot/cpu/arm920t/start.S
+===================================================================
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -141,8 +141,13 @@
+ orr r0,r0,#0xd3
+ msr cpsr,r0
+
++ /* in case we run from the s3c24xx NAND stepping stone, the symbols
++ * for LED support are in lib_arm/board.o, i.e. outside of the
++ * steppingstone */
++#ifndef CONFIG_S3C2410_NAND_BOOT
+ bl coloured_LED_init
+ bl red_LED_on
++#endif
+
+ #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+ /*
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-10-15 05:54:20 UTC (rev 3163)
@@ -371,9 +371,13 @@
#include <status_led.h>
/*
-@@ -181,6 +186,7 @@
- #ifdef CONFIG_AT91RM9200
+@@ -178,9 +183,10 @@
+ bl cpu_init_crit
+ #endif
+-#ifdef CONFIG_AT91RM9200
++#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410)
+
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+#ifndef CONFIG_S3C2410_NAND_BOOT
relocate: /* relocate U-Boot to RAM */
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-15 05:54:20 UTC (rev 3163)
@@ -857,7 +857,7 @@
str r1, [r0]
#if 1
-@@ -240,7 +272,7 @@
+@@ -240,14 +272,15 @@
str r1, [r0, #0x28]
#endif
@@ -866,7 +866,16 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -299,7 +331,7 @@
+ bl cpu_init_crit
+ #endif
+
+-#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410)
++#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410) || \
++ defined(CONFIG_S3C2440)
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
+@@ -299,7 +332,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -875,7 +884,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -310,11 +342,12 @@
+@@ -310,11 +343,12 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -889,7 +898,7 @@
@ reset NAND
mov r1, #S3C2410_NAND_BASE
ldr r2, =0xf842 @ initial value enable tacls=3,rph0=6,rph1=0
-@@ -334,6 +367,17 @@
+@@ -334,6 +368,17 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -907,7 +916,7 @@
#if 0
@ get ready to call C functions (for nand_read())
-@@ -402,7 +446,7 @@
+@@ -402,7 +447,7 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2442.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-15 05:54:20 UTC (rev 3163)
@@ -453,7 +453,16 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -331,7 +343,7 @@
+@@ -280,7 +292,7 @@
+ #endif
+
+ #if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410) || \
+- defined(CONFIG_S3C2440)
++ defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
+@@ -332,7 +344,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -462,7 +471,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -342,7 +354,7 @@
+@@ -343,7 +355,7 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -471,7 +480,7 @@
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
/* mov r10, lr */
-@@ -367,7 +379,7 @@
+@@ -368,7 +380,7 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -480,7 +489,7 @@
mov r1, #S3C2440_NAND_BASE
ldr r2, =0xfff0 @ initial value tacls=3,rph0=7,rph1=7
ldr r3, [r1, #oNFCONF]
-@@ -446,7 +458,8 @@
+@@ -447,7 +459,8 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2443.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-14 17:52:31 UTC (rev 3162)
+++ trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-15 05:54:20 UTC (rev 3163)
@@ -11,7 +11,7 @@
#endif
#include <status_led.h>
-@@ -159,7 +161,7 @@
+@@ -164,7 +166,7 @@
#endif
#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440) || \
@@ -20,7 +20,7 @@
/* turn off the watchdog */
# if defined(CONFIG_S3C2400)
-@@ -200,6 +202,11 @@
+@@ -205,6 +207,11 @@
# endif
# define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
# define CAMDIVN 0x4C000018
@@ -32,7 +32,7 @@
#endif
ldr r0, =pWTCON
-@@ -212,7 +219,8 @@
+@@ -217,7 +224,8 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -42,7 +42,7 @@
ldr r1, =INTSUBMSK_val
ldr r0, =INTSUBMSK
str r1, [r0]
-@@ -231,6 +239,43 @@
+@@ -236,6 +244,43 @@
mcr p15, 0, r1, c1, c0, 0
@@ -86,7 +86,7 @@
#define LOCKTIME 0x4c000000
#define UPLLCON 0x4c000008
-@@ -258,6 +303,7 @@
+@@ -263,6 +308,7 @@
ldr r0, =CLKDIVN
mov r1, #CLKDIVN_val
str r1, [r0]
@@ -94,7 +94,7 @@
#if 1
/* enable uart */
-@@ -284,7 +330,8 @@
+@@ -289,7 +335,8 @@
str r1, [r0, #0x28]
#endif
@@ -104,6 +104,16 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
+@@ -297,7 +344,8 @@
+ #endif
+
+ #if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410) || \
+- defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
++ defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442) || \
++ defined(CONFIG_S3C2443)
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
Index: u-boot/cpu/arm920t/s3c24x0/interrupts.c
===================================================================
--- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c
More information about the commitlog
mailing list
