r1095 - trunk/src/target/u-boot/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-02-24 13:59:47 +0100 (Sat, 24 Feb 2007)
New Revision: 1095

Added:
   trunk/src/target/u-boot/patches/uboot-s3c2410-misccr-definitions.patch
Modified:
   trunk/src/target/u-boot/patches/series
   trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
Log:
split 'MISCCR' definitions to separate patch


Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2007-02-24 07:10:50 UTC (rev 1094)
+++ trunk/src/target/u-boot/patches/series	2007-02-24 12:59:47 UTC (rev 1095)
@@ -20,6 +20,7 @@
 uboot-20061030-neo1973.patch 
 
 # 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

Added: trunk/src/target/u-boot/patches/uboot-s3c2410-misccr-definitions.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-misccr-definitions.patch	2007-02-24 07:10:50 UTC (rev 1094)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-misccr-definitions.patch	2007-02-24 12:59:47 UTC (rev 1095)
@@ -0,0 +1,45 @@
+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__*/

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 07:10:50 UTC (rev 1094)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch	2007-02-24 12:59:47 UTC (rev 1095)
@@ -3,13 +3,13 @@
 
 Index: u-boot/cpu/arm920t/start.S
 ===================================================================
---- u-boot.orig/cpu/arm920t/start.S
-+++ u-boot/cpu/arm920t/start.S
-@@ -328,6 +328,22 @@ done_nand_read:
- 	strb	r1, [r0]
- #endif /* CONFIG_S3C2410_NAND_BOOT */
- done_relocate:
-+
+--- 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 */
 +#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,9 +22,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						    */