[Aesop-embedded-devel] u-boot-aesop/include/configs aesop2440.h

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

jeenspa     2005/07/05 07:16:45

  Modified:    include/configs aesop2440.h
  Log:
  usbdmass fixup, nand, mkyaffs
  
  Revision  Changes    Path
  1.2       +48 -7     u-boot-aesop/include/configs/aesop2440.h
  
  Index: aesop2440.h
  ===================================================================
  RCS file: /cvsroot/aesop-embedded/u-boot-aesop/include/configs/aesop2440.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aesop2440.h	27 Jun 2005 17:05:53 -0000	1.1
  +++ aesop2440.h	5 Jul 2005 14:16:44 -0000	1.2
  @@ -36,7 +36,7 @@
    * so we MUST NOT initialize critical regs like mem-timing ...
    */
   //#define CONFIG_INIT_CRITICAL		/* undef for developing */
  -#undef CONFIG_INIT_CRITICAL
  +#define CONFIG_INIT_CRITICAL
   /*
    * High Level Configuration Options
    * (easy to change)
  @@ -46,8 +46,11 @@
   #define CONFIG_AESOP2440	1	/* on a Kernelproject aESOP2440 Board  */
   
   /* input clock of PLL */
  +#if 1
   #define CONFIG_SYS_CLK_FREQ	16934400/* the SMDK2410 has 12MHz input clock */
  -
  +#else
  +#define CONFIG_SYS_CLK_FREQ	12000000/* the SMDK2410 has 12MHz input clock */
  +#endif
   
   #define USE_920T_MMU		1
   #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
  @@ -109,7 +112,7 @@
   #define CONFIG_COMMANDS \
   			(CONFIG_CMD_DFL	 | \
   			CFG_CMD_CACHE	 | \
  -			/*CFG_CMD_NAND	 |*/ \
  +			CFG_CMD_NAND	 | \
   			/*CFG_CMD_EEPROM |*/ \
   			/*CFG_CMD_I2C	 |*/ \
   			/*CFG_CMD_USB	 |*/ \
  @@ -123,7 +126,7 @@
   /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
   #include <cmd_confdefs.h>
   
  -#define CONFIG_BOOTDELAY	3
  +#define CONFIG_BOOTDELAY	1
   /*#define CONFIG_BOOTARGS    	"root=ramfs devfs=mount console=ttySA0,9600" */
   #define CONFIG_ETHADDR		08:00:3e:26:0a:5b 
   #define CONFIG_NETMASK          255.255.255.0
  @@ -133,9 +136,14 @@
   /*#define CONFIG_BOOTFILE	"elinos-lart" */
   /*#define CONFIG_BOOTCOMMAND	"tftp; bootm" */
   
  -
  +/* jeenspa fix - nand boot */
  +#if 0
   /* ghcstop fix */
   #define CONFIG_BOOTCOMMAND	"tftp 32000000 aesopk;bootm 32000000"
  +#else
  +#define CONFIG_BOOTCOMMAND	"nand read 32000000 0 200000;bootm 32000000"
  +#endif
  +
   /*
    * ghcstop add
    * NFS setting howto
  @@ -147,10 +155,14 @@
   //#if UBOOT_FOR_LINUX_2420 
   #if 1 /* 2.4.x kernel */
   	//#define CONFIG_BOOTARGS     "root=/dev/nfs rw nfsroot=192.168.1.1:/root/mmsp2nfs ip=192.168.1.9:192.168.1.1:192.168.1.1:255.255.255.0::eth0:off ethaddr=08:00:3e:26:0a:5b"
  -	#define CONFIG_BOOTARGS     "root=/dev/nfs rw nfsroot=192.168.10.10:/korea-dokdo/nfsmount/rootfs-aesop ip=192.168.10.21:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off ethaddr=08:00:3e:26:0a:5b"
  +/* jeenspa fix - nand boot */
  +#define CONFIG_BOOTARGS	"root=/dev/mtdblock1 ip=192.168.10.21:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off ethaddr=11:22:33:44:55:66 noinitrd console=ttyS0"
  +	//#define CONFIG_BOOTARGS     "root=/dev/nfs rw nfsroot=192.168.10.10:/korea-dokdo/nfsmount/rootfs-aesop ip=192.168.10.21:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off ethaddr=08:00:3e:26:0a:5b"
   	//#define CONFIG_BOOTARGS     "root=/dev/nfs rw nfsroot=192.168.10.10:/root/mmsp2nfs ip=192.168.10.4:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off ethaddr=08:00:3e:26:0a:5b"
   #else /* 2.6.x kernel */
  -	#define CONFIG_BOOTARGS     "root=/dev/nfs rw nfsroot=192.168.10.10:/korea-dokdo/nfsmount/rootfs-aesop ip=192.168.10.21:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off console=ttySAC0,115200n81 ethaddr=08:00:3e:26:0a:5b"
  +/* jeenspa fix - nand boot */
  +#define CONFIG_BOOTARGS	"root=/dev/mtdblock1 ip=192.168.10.21:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off ethaddr=11:22:33:44:55:66 noinitrd console=ttySAC0,115200n81"
  +	//#define CONFIG_BOOTARGS     "root=/dev/nfs rw nfsroot=192.168.10.10:/korea-dokdo/nfsmount/rootfs-aesop ip=192.168.10.21:192.168.10.10:192.168.10.1:255.255.255.0::eth0:off console=ttySAC0,115200n81 ethaddr=08:00:3e:26:0a:5b"
   #endif	
   
   
  @@ -245,6 +257,35 @@
   
   /* u-boot environment(in flash) area setting  */
   #define	CFG_ENV_IS_IN_FLASH	1
  +
  +/*-----------------------------------------------------------------------
  + * NAND FLASH organization
  + */
  +#define CONFIG_AESOP_YAFFS
  +#define CFG_MAX_NAND_DEVICE 1
  +#define SECTORSIZE 512
  +#define ADDR_COLUMN 1
  +#define ADDR_PAGE 3
  +#define ADDR_COLUMN_PAGE 4
  +#define NAND_ChipID_UNKNOWN 0x00
  +#define NAND_MAX_FLOORS 1
  +#define NAND_MAX_CHIPS 1
  +#define NAND_WAIT_READY(nand)		udelay(10); while(!(rNFSTAT & 0x01))
  +#define WRITE_NAND_COMMAND(d, adr)	rNFCMD = d
  +#define WRITE_NAND_ADDRESS(d, adr)	rNFADDR = d
  +#define WRITE_NAND(d, adr)		rNFDATA = d
  +#define READ_NAND(adr)			rNFDATA
  +#define NAND_DISABLE_CE(nand)		rNFCONT |= 0x02
  +#define NAND_ENABLE_CE(nand)		rNFCONT &= ~(0x02)
  +#define NAND_CTL_CLRALE(nandptr)
  +#define NAND_CTL_SETALE(nandptr)
  +#define NAND_CTL_CLRCLE(nandptr)
  +#define NAND_CTL_SETCLE(nandptr)
  +
  +/*-----------------------------------------------------------------------
  + * aESOP USB Device Mass-storage support
  + */
  +#define CONFIG_AESOP_USBDMASS
   /*-------------------------------------------------------------------------*/