[Aesop-embedded-devel] u-boot-aesop/include s3c2440.h s3c24x0.h
Status: Beta
Brought to you by:
linuxpark
|
From: jeenspa <je...@li...> - 2005-07-05 14:16:54
|
jeenspa 2005/07/05 07:16:44
Modified: include s3c2440.h s3c24x0.h
Log:
usbdmass fixup, nand, mkyaffs
Revision Changes Path
1.2 +3 -3 u-boot-aesop/include/s3c2440.h
Index: s3c2440.h
===================================================================
RCS file: /cvsroot/aesop-embedded/u-boot-aesop/include/s3c2440.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s3c2440.h 27 Jun 2005 17:05:51 -0000 1.1
+++ s3c2440.h 5 Jul 2005 14:16:44 -0000 1.2
@@ -51,7 +51,7 @@
#define S3C24X0_DMA_BASE 0x4B000000
#define S3C24X0_CLOCK_POWER_BASE 0x4C000000
#define S3C24X0_LCD_BASE 0x4D000000
-#define S3C2410_NAND_BASE 0x4E000000
+#define S3C2440_NAND_BASE 0x4E000000
#define S3C24X0_UART_BASE 0x50000000
#define S3C24X0_TIMER_BASE 0x51000000
#define S3C24X0_USB_DEVICE_BASE 0x52000140
@@ -93,9 +93,9 @@
{
return (S3C24X0_LCD * const)S3C24X0_LCD_BASE;
}
-static inline S3C2410_NAND * const S3C2410_GetBase_NAND(void)
+static inline S3C2440_NAND * const S3C2440_GetBase_NAND(void)
{
- return (S3C2410_NAND * const)S3C2410_NAND_BASE;
+ return (S3C2440_NAND * const)S3C2440_NAND_BASE;
}
static inline S3C24X0_UART * const S3C24X0_GetBase_UART(S3C24X0_UARTS_NR nr)
{
1.2 +44 -5 u-boot-aesop/include/s3c24x0.h
Index: s3c24x0.h
===================================================================
RCS file: /cvsroot/aesop-embedded/u-boot-aesop/include/s3c24x0.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s3c24x0.h 27 Jun 2005 17:05:52 -0000 1.1
+++ s3c24x0.h 5 Jul 2005 14:16:44 -0000 1.2
@@ -156,7 +156,7 @@
#endif
} /*__attribute__((__packed__))*/ S3C24X0_LCD;
-
+#if defined(CONFIG_S3C2410)
/* NAND FLASH (see S3C2410 manual chapter 6) */
typedef struct {
S3C24X0_REG32 NFCONF;
@@ -166,6 +166,27 @@
S3C24X0_REG32 NFSTAT;
S3C24X0_REG32 NFECC;
} /*__attribute__((__packed__))*/ S3C2410_NAND;
+#elif defined(CONFIG_S3C2440)
+/* NAND FLASH (see S3C2440 manual chapter 6) */
+typedef struct {
+ S3C24X0_REG32 NFCONF;
+ S3C24X0_REG32 NFCONT;
+ S3C24X0_REG32 NFCMD;
+ S3C24X0_REG32 NFADDR;
+ S3C24X0_REG32 NFDATA;
+ S3C24X0_REG32 NFMECCD0;
+ S3C24X0_REG32 NFMECCD1;
+ S3C24X0_REG32 NFSECCD;
+ S3C24X0_REG32 NFSTAT;
+ S3C24X0_REG32 NFESTAT0;
+ S3C24X0_REG32 NFESTAT1;
+ S3C24X0_REG32 NFMECC0;
+ S3C24X0_REG32 NFMECC1;
+ S3C24X0_REG32 NFSECC;
+ S3C24X0_REG32 NFSBLK;
+ S3C24X0_REG32 NFEBLK;
+} /*__attribute__((__packed__))*/ S3C2440_NAND;
+#endif
/* UART (see manual chapter 11) */
@@ -657,7 +678,7 @@
} /*__attribute__((__packed__))*/ S3C2410_SDI;
-#if 0
+#if 1
/* Memory control */
#define rBWSCON (*(volatile unsigned *)0x48000000)
#define rBANKCON0 (*(volatile unsigned *)0x48000004)
@@ -777,15 +798,33 @@
#define rLCDSRCPND (*(volatile unsigned *)0x4D000058)
#define rLCDINTMSK (*(volatile unsigned *)0x4D00005C)
-
-/* NAND FLASH */
+#if defined(CONFIG_S3C2410)
+/* NAND FLASH 2410 */
#define rNFCONF (*(volatile unsigned *)0x4E000000)
#define rNFCMD (*(volatile unsigned *)0x4E000004)
#define rNFADDR (*(volatile unsigned *)0x4E000008)
#define rNFDATA (*(volatile unsigned *)0x4E00000C)
#define rNFSTAT (*(volatile unsigned *)0x4E000010)
#define rNFECC (*(volatile unsigned *)0x4E000014)
-
+#elif defined(CONFIG_S3C2440)
+/* NAND FLASH 2440 */
+#define rNFCONF (*(volatile unsigned *)0x4E000000)
+#define rNFCONT (*(volatile unsigned *)0x4E000004)
+#define rNFCMD (*(volatile unsigned *)0x4E000008)
+#define rNFADDR (*(volatile unsigned *)0x4E00000C)
+#define rNFDATA (*(volatile unsigned char *)0x4E000010)
+#define rNFMECCD0 (*(volatile unsigned *)0x4E000014)
+#define rNFMECCD1 (*(volatile unsigned *)0x4E000018)
+#define rNFSECCD (*(volatile unsigned *)0x4E00001C)
+#define rNFSTAT (*(volatile unsigned *)0x4E000020)
+#define rNFESTAT0 (*(volatile unsigned *)0x4E000024)
+#define rNFESTAT1 (*(volatile unsigned *)0x4E000028)
+#define rNFMECC0 (*(volatile unsigned *)0x4E00002C)
+#define rNFMECC1 (*(volatile unsigned *)0x4E000030)
+#define rNFSECC (*(volatile unsigned *)0x4E000034)
+#define rNFSBLK (*(volatile unsigned *)0x4E000038)
+#define rNFEBLK (*(volatile unsigned *)0x4E00003C)
+#endif
/* UART */
#define rULCON0 (*(volatile unsigned *)0x50000000)
|