Merge commit 'remotes/wd/master' into newmaster
This commit is contained in:
		
						commit
						607b3ae27e
					
				
							
								
								
									
										519
									
								
								CHANGELOG
								
								
								
								
							
							
						
						
									
										519
									
								
								CHANGELOG
								
								
								
								
							| 
						 | 
					@ -1,3 +1,328 @@
 | 
				
			||||||
 | 
					commit e881cb563e32f45832b7b6db77bdcd017adcbb41
 | 
				
			||||||
 | 
					Author: Bruce Adler <bruce.adler@ccpu.com>
 | 
				
			||||||
 | 
					Date:	Fri Nov 2 13:15:42 2007 -0700
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    fix wording in README
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Changed the wording to properly describe the shadowing
 | 
				
			||||||
 | 
					    of the environment from ROM to RAM
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Bruce Adler <bruce.adler@acm.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit ad845beef06245426c57b53dcdc01b7dc70e0d45
 | 
				
			||||||
 | 
					Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
 | 
				
			||||||
 | 
					Date:	Wed Oct 31 02:18:15 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    blackfin: Move `-D__BLACKFIN__' to $(ARCH)_config.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit ec22755799466c8a103664bb3a5e647bf9c238f4
 | 
				
			||||||
 | 
					Author: Vlad Lungu <vlad@comsys.ro>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 16:08:14 2007 +0300
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Trimmed some variables in ne2000.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Vlad Lungu <vlad@comsys.ro>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit eb6f214d3644b2a77968c176ed36dcf858cfe7e0
 | 
				
			||||||
 | 
					Author: Zhang Wei <wei.zhang@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:51:27 2007 +0800
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Fix the issue of usb_kbd driver missing the scan code of key 'z'.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    The scan code of the key 'z' is 0x1d, which should be handled.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    The change has be tested on NOVATEK USB keyboard and ULI PCI OHCI
 | 
				
			||||||
 | 
					    controller.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit bbf4796f6498fbade56d56eff3a0a49b299d93e5
 | 
				
			||||||
 | 
					Author: Zhang Wei <wei.zhang@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:30:04 2007 +0800
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Fix USB support issue for MPC8641HPCN board.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    The configuration file has already enabled USB, but it
 | 
				
			||||||
 | 
					    missed definition of CFG_OHCI_SWAP_REG_ACCESS, the USB
 | 
				
			||||||
 | 
					    on MPC8641HPCN can not work because of the wrong USB
 | 
				
			||||||
 | 
					    register endian.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    And add the USB command to U-Boot commands list.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 4e62041023dc3de9d98d977bb080235bc6d035e0
 | 
				
			||||||
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					Date:	Wed Oct 24 18:16:01 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Use config_cmd_default.h instead of config_cmd_all.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 56622f87857439b1c221e9deef11a9d5bb5d4308
 | 
				
			||||||
 | 
					Author: Marian Balakowicz <m8@semihalf.com>
 | 
				
			||||||
 | 
					Date:	Wed Oct 24 01:37:36 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TQM5200: Call usb_cpu_init() during board init
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    usb_cpu_init() configures GPS USB pins, clocks, etc. and
 | 
				
			||||||
 | 
					    is required for proper operation of kernel USB subsystem.
 | 
				
			||||||
 | 
					    This setup was previously done in the kernel by the fixup
 | 
				
			||||||
 | 
					    code which is being removed, thus low level init must be
 | 
				
			||||||
 | 
					    done by U-boot now.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Marian Balakowicz <m8@semihalf.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 29c29c0267fe857e72014ce90c5d35b2ef6302bd
 | 
				
			||||||
 | 
					Author: Guennadi Liakhovetski <lg@denx.de>
 | 
				
			||||||
 | 
					Date:	Tue Oct 23 16:25:50 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Fix typo in nfs.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    An obvious typo. Originally fixed in linkstation u-boot port.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 59543fe00a4ce720ef9f5aa7fb387c6daf1c7d78
 | 
				
			||||||
 | 
					Author: Guennadi Liakhovetski <lg@denx.de>
 | 
				
			||||||
 | 
					Date:	Tue Oct 23 14:35:05 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Fix a typo in cpu/mpc824x/interrupts.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Since December 2003 the timer_interrupt_cpu() function in
 | 
				
			||||||
 | 
					    cpu/mpc824x/interrupts.c contains what seems to be a superfluous
 | 
				
			||||||
 | 
					    parameter. Remove it.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit c9e7b9b9a1700fe009678d1f9b41e6364ac5df2d
 | 
				
			||||||
 | 
					Author: Sergej Stepanov <Sergej.Stepanov@ids.de>
 | 
				
			||||||
 | 
					Date:	Wed Oct 17 11:13:51 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    add ft_cpu_setup(..) on mpc8260
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Add ft_cpu_setup(..)-function to adapt it for use with libfdt
 | 
				
			||||||
 | 
					    based on code from mpc5xxx
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Sigend-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de>
 | 
				
			||||||
 | 
					    --
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 6abd82e19ae93c0b4d104e50165e235915ec0875
 | 
				
			||||||
 | 
					Author: Sergej Stepanov <Sergej.Stepanov@ids.de>
 | 
				
			||||||
 | 
					Date:	Wed Oct 17 11:18:42 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    changes for IDS8247 board support
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    To get the IDS8247 board working following are done:
 | 
				
			||||||
 | 
					     - FCC2 is deactivated
 | 
				
			||||||
 | 
					     - FCC1 is activated
 | 
				
			||||||
 | 
					     - I2C is activated
 | 
				
			||||||
 | 
					     - CFI driver is activated
 | 
				
			||||||
 | 
					     - Adapted for use with LIBFDT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de>
 | 
				
			||||||
 | 
					    --
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 8b6684a698500be9c142ec2c9f46cfc348e17f0c
 | 
				
			||||||
 | 
					Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
 | 
				
			||||||
 | 
					Date:	Wed Oct 24 15:48:37 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ATSTK1002: Remove default ethernet addresses
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Wolfgang is right: It's not a good idea to set up default initial
 | 
				
			||||||
 | 
					    ethernet addresses for a board, even though they belong to the local
 | 
				
			||||||
 | 
					    range.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This will change the failure mode from "IT manager screams at you for
 | 
				
			||||||
 | 
					    using duplicate ethernet addresses" to a nice error message explaining
 | 
				
			||||||
 | 
					    that the ethernet address hasn't been set properly.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit e5c794e491a57d829b6d8733e2ed8368a2269abf
 | 
				
			||||||
 | 
					Author: Justin Flammia <jflammia@savantav.com>
 | 
				
			||||||
 | 
					Date:	Mon Oct 29 17:40:35 2007 -0400
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    DHCP Client Fix
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This is a multi-part message in MIME format.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    commit e6e505eae94ed721e123e177489291fc4544b7b8
 | 
				
			||||||
 | 
					    Author: Justin Flammia <jflammia@savantav.com>
 | 
				
			||||||
 | 
					    Date:   Mon Oct 29 17:19:03 2007 -0400
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						Found a bug in the way the DHCP Request packet is built, where the IP address
 | 
				
			||||||
 | 
						that is offered by the server is bound to prematurely. This patch is a fix of
 | 
				
			||||||
 | 
						that bug where the IP address offered by the DHCP server is not used until
 | 
				
			||||||
 | 
						after the DHCP ACK from the server is received.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Justin Flammia <jflammia@savantav.com>
 | 
				
			||||||
 | 
					    Signed-off-by: Ben Warren <bwarren@qstreams.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit e8ee8f3ade2a06c1893dd5e68f223070d650c7ed
 | 
				
			||||||
 | 
					Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:16:22 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ColdFire 54455: Fix correct boot location for atmel and intel
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 688e8eb414ac111cca7ce60bdf30e805ab9a7bcb
 | 
				
			||||||
 | 
					Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:14:00 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ColdFire: Fix build error when CONFIG_WATCHDOG is defined
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit c67e12e705b204cfe914e3e3e693d69a445dcabf
 | 
				
			||||||
 | 
					Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:12:36 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ColdFire 5329: Assign correct SDRAM size and fix cache
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 95e9f2c212a65610b2e59a5c00d0113383a4da0b
 | 
				
			||||||
 | 
					Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:10:23 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ColdFire 5253: Assign correct SDRAM size
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 2acefa72ee0026f862ab65597ca687428f63a973
 | 
				
			||||||
 | 
					Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:09:17 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ColdFire 5282: Fix external flash boot and return dramsize
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit d78791ae914d4e7c5edca1cdad73b3dc81a4eb82
 | 
				
			||||||
 | 
					Author: Bartlomiej Sieka <tur@semihalf.com>
 | 
				
			||||||
 | 
					Date:	Thu Oct 25 17:20:01 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TQM5200: increase kernel_addr_r and fdt_addr_r (hinted by Wolfgang Denk).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 1a0ce20aa4cb4e3068da04e7290ee9986fd0b834
 | 
				
			||||||
 | 
					Author: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					Date:	Wed Oct 24 08:42:25 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TQM5200: fix spurious characters on second serial interface
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    With this patch PSC3 is configured as UART. This is done, because if
 | 
				
			||||||
 | 
					    the pins of PSC3 are not configured at all (-> all pins are GPI),
 | 
				
			||||||
 | 
					    due to crosstalk, spurious characters may be send over the RX232_2_TXD
 | 
				
			||||||
 | 
					    signal line.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit be4a87f11e297a5cededbf7dd71c0248f3874acd
 | 
				
			||||||
 | 
					Author: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					Date:	Wed Oct 24 08:41:27 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TQM5200S: fix commands for STK52xx base board because of missing SM501 grafic controller
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Some commands for the STK52xx base board try to access the SM501 grafic
 | 
				
			||||||
 | 
					    controller. But the TQM5200S has no grafic controller (only the TQM5200
 | 
				
			||||||
 | 
					    and the TQM5200B have). This patch deactivates the commands accessing
 | 
				
			||||||
 | 
					    the SM501 for the TQM5200S.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit b31f64343ead9482cd439b1adbe4c34026a641b1
 | 
				
			||||||
 | 
					Author: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					Date:	Mon Oct 22 16:45:53 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TQM5200: fix spurious characters on second serial interface
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    With this patch PSC3 is configured as UART. This is done, because if
 | 
				
			||||||
 | 
					    the pins of PSC3 are not configured at all (-> all pins are GPI),
 | 
				
			||||||
 | 
					    due to crosstalk, spurious characters may be send over the RX232_2_TXD
 | 
				
			||||||
 | 
					    signal line.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 0fc0f91b20ffa802f5a66534ca5c2844910583f6
 | 
				
			||||||
 | 
					Author: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					Date:	Mon Oct 22 16:40:06 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TQM5200S: fix commands for STK52xx base board because of missing SM501 grafic controller
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Some commands for the STK52xx base board try to access the SM501 grafic
 | 
				
			||||||
 | 
					    controller. But the TQM5200S has no grafic controller (only the TQM5200
 | 
				
			||||||
 | 
					    and the TQM5200B have). This patch deactivates the commands accessing
 | 
				
			||||||
 | 
					    the SM501 for the TQM5200S.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Martin Krause <martin.krause@tqs.de>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 7b0a42219f30277f71f4405cbaf8a269f6d2d227
 | 
				
			||||||
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 09:14:28 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Mips: Fix string functions differ prototype declaration
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit cb8250fe4b3c4ed549b270e8a20bc22060e7e1d2
 | 
				
			||||||
 | 
					Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 | 
				
			||||||
 | 
					Date:	Fri Oct 19 17:51:40 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    fsl_pci_init enable COMMAND_MEMORY if inbound window
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Patch 16e23c3f removed PCSRBAR allocation.	But passing zero windows
 | 
				
			||||||
 | 
					    to pciauto_setup_device has the side effect of not getting
 | 
				
			||||||
 | 
					    COMMAND_MEMORY set.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit e9d0d527992566ebef9826962ff1745b2f082b92
 | 
				
			||||||
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					Date:	Fri Oct 19 10:55:24 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    delta: Fix OHCI_REGS_BASE undeclared and wait_ms implicit declaration
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 9c4884f54da982ce990c7d1760ac81b0704d3c64
 | 
				
			||||||
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					Date:	Fri Oct 19 08:10:15 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    fix warning: no return statement in function returning non-void
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit e78220f6e514206757acfe247297fc9a328a881f
 | 
				
			||||||
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					Date:	Fri Oct 19 06:33:45 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    xsengine: Fix no partition type specified, use DOS as default
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 10cdb8dbd67a818823ab9ec88b68fc348903db59
 | 
				
			||||||
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					Date:	Fri Oct 19 00:24:59 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    lubbock: Fix no partition type specified, use DOS as default
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 41b4d282d38fa7231c315c5f6cfff5bdd24e0191
 | 
				
			||||||
 | 
					Author: Wolfgang Denk <wd@denx.de>
 | 
				
			||||||
 | 
					Date:	Tue Oct 23 16:50:03 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Coding style: keep lists sorted; update CHANGELOG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Wolfgang Denk <wd@denx.de>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
commit 58b74b05c621e2835ecf4e2d3243042cf4186777
 | 
					commit 58b74b05c621e2835ecf4e2d3243042cf4186777
 | 
				
			||||||
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
					Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | 
				
			||||||
Date:	Fri Oct 19 00:09:05 2007 +0200
 | 
					Date:	Fri Oct 19 00:09:05 2007 +0200
 | 
				
			||||||
| 
						 | 
					@ -51,6 +376,112 @@ Date:	Wed Oct 17 11:56:31 2007 -0500
 | 
				
			||||||
    are added to u-boot.
 | 
					    are added to u-boot.
 | 
				
			||||||
    Signed-off-by Rune Torgersen <runet@innovsys.com>
 | 
					    Signed-off-by Rune Torgersen <runet@innovsys.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit d3afa1ee19345a31fd1eaad3e98b97d13ca47315
 | 
				
			||||||
 | 
					Author: Bartlomiej Sieka <tur@semihalf.com>
 | 
				
			||||||
 | 
					Date:	Tue Oct 23 13:14:10 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Motion-PRO: Update configuration to accomodate next generation board.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    New board has faster oscillator and a different Flash chip. This affects:
 | 
				
			||||||
 | 
					    - CFG_MPC5XXX_CLKIN
 | 
				
			||||||
 | 
					    - SDRAM timings
 | 
				
			||||||
 | 
					    - Flash CS configuration (timings)
 | 
				
			||||||
 | 
					    - Flash sector size, and thus MTD partition layout
 | 
				
			||||||
 | 
					    - malloc() arena size (due to bigger Flash sectors)
 | 
				
			||||||
 | 
					    - smaller memory test range (due to bigger malloc() arena)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This patch also enables more extensive memory testing via "mtest".
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit eff501904df2bf1724a750062628ba2c51dbb1f8
 | 
				
			||||||
 | 
					Author: Bartlomiej Sieka <tur@semihalf.com>
 | 
				
			||||||
 | 
					Date:	Tue Oct 23 11:36:07 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Motion-PRO: Add setting of SDelay reg. to SDRAM controller configuration.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Per AN3221 (MPC5200B SDRAM Initialization and Configuration), the SDelay
 | 
				
			||||||
 | 
					    register must be written a value of 0x00000004 as the first step of the
 | 
				
			||||||
 | 
					    SDRAM contorller configuration.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 7a9348728ebda63cdbaacffd83099aa71d9d4c54
 | 
				
			||||||
 | 
					Author: Peter Pearse <peter.pearse@arm.com>
 | 
				
			||||||
 | 
					Date:	Tue Oct 23 10:22:16 2007 +0100
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Move PL01* serial drivers to drivers/serial and adjust Makefiles.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit de9a738faa7c2f47286119c3bfebc3dfbfe7d86d
 | 
				
			||||||
 | 
					Author: Vlad Lungu <vlad@comsys.ro>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 22:10:10 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [MIPS] Fix UNCACHED_SDRAM
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    PHYSADDR is for physical address, KSEG1ADDR is for uncached.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Vlad Lungu <vlad@comsys.ro>
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 00101dd7a32d12f698150123e47e4b3420279f86
 | 
				
			||||||
 | 
					Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 21:30:42 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [MIPS] Add PIC-related switches to PLATFORM_{CPP,LD}FLAGS and cleanup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit eb700636db017d310edaeb559b13d82588560674
 | 
				
			||||||
 | 
					Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 10:55:37 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [MIPS] u-boot.lds: Define _gp in a standard manner
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 22069215eb7adf5a3888bf7c7784ea9d70a72cd0
 | 
				
			||||||
 | 
					Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 10:55:36 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [MIPS] Fix $gp usage
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Now we load $gp with _GLOBAL_OFFSET_TABLE_, but this is incorrect use.
 | 
				
			||||||
 | 
					    As a general principle, we should use _gp for $gp.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Thanks to linker script's help we fortunately have _gp which equals to
 | 
				
			||||||
 | 
					    _GLOBAL_OFFSET_TABLE_. But once _gp gets out of alignment, we will not
 | 
				
			||||||
 | 
					    be able to access to GOT entires, global variables and procedure entry
 | 
				
			||||||
 | 
					    points. The right thing to do is to use _gp.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This patch also introduce a new symbol `.gpword _GLOBAL_OFFSET_TABLE_'
 | 
				
			||||||
 | 
					    which holds the offset from _gp. When updating GOT entries, we use this
 | 
				
			||||||
 | 
					    offset and _gp to calculate the final _GLOBAL_OFFSET_TABLE_.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This patch is originally submitted by Vlad Lungu <vlad@comsys.ro>, then
 | 
				
			||||||
 | 
					    I made some change to leave over num_got_entries.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					    Cc: Vlad Lungu <vlad@comsys.ro>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit cbf2323b5b8285ea01acba7bbb905a3162d9b021
 | 
				
			||||||
 | 
					Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 10:55:36 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [MIPS] u-boot.lds: Fix __got_start and __got_end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Ensure that __got_start points to top of the `.got', and __got_end points
 | 
				
			||||||
 | 
					    to bottom as well, so that we never fail to count num_got_entries.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit e5f325fec5b48ae705c89522923ba5a2e37cd5c7
 | 
				
			||||||
 | 
					Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					Date:	Sun Oct 21 10:55:36 2007 +0900
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [MIPS] u-boot.lds: Remove duplicated .sdata section
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
commit 05bf4919c1ce49cdedadacd564d0786a8ed796a1
 | 
					commit 05bf4919c1ce49cdedadacd564d0786a8ed796a1
 | 
				
			||||||
Author: Wolfgang Denk <wd@denx.de>
 | 
					Author: Wolfgang Denk <wd@denx.de>
 | 
				
			||||||
Date:	Sun Oct 21 01:01:17 2007 +0200
 | 
					Date:	Sun Oct 21 01:01:17 2007 +0200
 | 
				
			||||||
| 
						 | 
					@ -73,6 +504,84 @@ Date:	Thu Oct 4 20:47:10 2007 +0300
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Signed-off-by: Vlad Lungu <vlad@comsys.ro>
 | 
					    Signed-off-by: Vlad Lungu <vlad@comsys.ro>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit df90968b48fb34fa9072fab150db2ac89678f537
 | 
				
			||||||
 | 
					Author: urwithsughosh@gmail.com <urwithsughosh@gmail.com>
 | 
				
			||||||
 | 
					Date:	Mon Sep 24 13:32:13 2007 -0400
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Setting MSR[DE] in do_reset
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Hello,
 | 
				
			||||||
 | 
					       This patch ensures the soft reset of the board for the 85xx boards
 | 
				
			||||||
 | 
					       by setting the MSR[DE] in the do_reset function.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 1e701e701304b3c3a3768ca83dd2ab7b9e88c77d
 | 
				
			||||||
 | 
					Author: urwithsughosh@gmail.com <urwithsughosh@gmail.com>
 | 
				
			||||||
 | 
					Date:	Mon Sep 24 13:36:01 2007 -0400
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    MSR overwrite fix
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Hello,
 | 
				
			||||||
 | 
					      This patch fixes the MSR overwrite in the start.S when moving out of
 | 
				
			||||||
 | 
					      the last 4K page.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 5c7ea64bb74a850a2b2303f853a8270695ad8602
 | 
				
			||||||
 | 
					Author: Dan Wilson <dwilson@fulcrummicro.com>
 | 
				
			||||||
 | 
					Date:	Fri Oct 19 11:33:48 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    tsec driver should clear RHALT on startup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This was causing problems for some people.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Alain Gravel <agravel@fulcrummicro.com>
 | 
				
			||||||
 | 
					    Signed-off-by: Dan Wilson <dwilson@fulcrummicro.com>
 | 
				
			||||||
 | 
					    Signed-off-by: Andy Fleming <afleming@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 7600d47b8f6a10019e537dc9a62aa1498df58d25
 | 
				
			||||||
 | 
					Author: Kumar Gala <galak@kernel.crashing.org>
 | 
				
			||||||
 | 
					Date:	Thu Oct 11 00:29:18 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Improve handling of PCI interrupt device tree fixup on MPC85xx CDS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    On the MPC85xx CDS we have two issues:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    1. The device tree fixup code did not check to see if the property we are
 | 
				
			||||||
 | 
					    trying to update is actually found.  Its possible that it would update
 | 
				
			||||||
 | 
					    random memory starting at 0.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    2. Newer Linux kernel's have moved the location of the PCI nodes to be
 | 
				
			||||||
 | 
					    sibilings of the soc node and not children.  The explicit PATH to the PCI
 | 
				
			||||||
 | 
					    node would not be found for these device trees.  Add the ability to handle
 | 
				
			||||||
 | 
					    both paths.  In the future we shouldn't handle such fixups by explicit path.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit a3063eec775719b7e91023bbec3f64b3118791df
 | 
				
			||||||
 | 
					Author: Kumar Gala <galak@kernel.crashing.org>
 | 
				
			||||||
 | 
					Date:	Thu Oct 11 00:18:48 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Set OF_STDOUT_PATH to match the default console on MPC8568 MDS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    On the MPC8568 MDS we use ttyS0, UART0, etc. as the standard configured
 | 
				
			||||||
 | 
					    console.  Make it so we match that config what we tell Linux as the early
 | 
				
			||||||
 | 
					    STDOUT console.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit e1ce3cb617bb06f91f82f98915391175addf3e82
 | 
				
			||||||
 | 
					Author: Kumar Gala <galak@kernel.crashing.org>
 | 
				
			||||||
 | 
					Date:	Tue Oct 2 11:12:27 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Remove magic numbers from cache related operations for mpc85xx
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    The mpc85xx start code uses some magic numbers that we actually
 | 
				
			||||||
 | 
					    have #defines for in <config.h> so use those instead.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
commit 5441f61a3d8b7034f19fc1361183e936198e6dbb
 | 
					commit 5441f61a3d8b7034f19fc1361183e936198e6dbb
 | 
				
			||||||
Author: Detlev Zundel <dzu@denx.de>
 | 
					Author: Detlev Zundel <dzu@denx.de>
 | 
				
			||||||
Date:	Fri Oct 19 16:47:26 2007 +0200
 | 
					Date:	Fri Oct 19 16:47:26 2007 +0200
 | 
				
			||||||
| 
						 | 
					@ -409,6 +918,16 @@ Date:	Tue Sep 11 14:12:55 2007 +0200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Signed-off-by: Stefan Roese <sr@denx.de>
 | 
					    Signed-off-by: Stefan Roese <sr@denx.de>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					commit 1487adbdcf9594bb2eb686325a6f9540dad1b70a
 | 
				
			||||||
 | 
					Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 | 
				
			||||||
 | 
					Date:	Wed Sep 26 16:35:54 2007 -0500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    85xx io out functions need sync after write.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    This fixes the mc146818 rtc_read/write functions for 85xx.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
commit 0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae
 | 
					commit 0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae
 | 
				
			||||||
Author: Grant Likely <grant.likely@secretlab.ca>
 | 
					Author: Grant Likely <grant.likely@secretlab.ca>
 | 
				
			||||||
Date:	Tue Sep 25 15:48:05 2007 -0600
 | 
					Date:	Tue Sep 25 15:48:05 2007 -0600
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								README
								
								
								
								
							
							
						
						
									
										2
									
								
								README
								
								
								
								
							| 
						 | 
					@ -2123,7 +2123,7 @@ to save the current settings.
 | 
				
			||||||
	to be a good choice since it makes it far enough from the
 | 
						to be a good choice since it makes it far enough from the
 | 
				
			||||||
	start of the data area as well as from the stack pointer.
 | 
						start of the data area as well as from the stack pointer.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Please note that the environment is read-only as long as the monitor
 | 
					Please note that the environment is read-only until the monitor
 | 
				
			||||||
has been relocated to RAM and a RAM copy of the environment has been
 | 
					has been relocated to RAM and a RAM copy of the environment has been
 | 
				
			||||||
created; also, when using EEPROM you will have to use getenv_r()
 | 
					created; also, when using EEPROM you will have to use getenv_r()
 | 
				
			||||||
until then to read environment variables.
 | 
					until then to read environment variables.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,4 +21,4 @@
 | 
				
			||||||
# MA 02111-1307 USA
 | 
					# MA 02111-1307 USA
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN
 | 
					PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -D__BLACKFIN__
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,6 +25,12 @@
 | 
				
			||||||
#include <ioports.h>
 | 
					#include <ioports.h>
 | 
				
			||||||
#include <mpc8260.h>
 | 
					#include <mpc8260.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined(CONFIG_OF_LIBFDT)
 | 
				
			||||||
 | 
					#include <libfdt.h>
 | 
				
			||||||
 | 
					#include <libfdt_env.h>
 | 
				
			||||||
 | 
					#include <fdt_support.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DECLARE_GLOBAL_DATA_PTR;
 | 
					DECLARE_GLOBAL_DATA_PTR;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
| 
						 | 
					@ -38,12 +44,12 @@ const iop_conf_t iop_conf_tab[4][32] = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Port A configuration */
 | 
					    /* Port A configuration */
 | 
				
			||||||
    {	/*	      conf ppar psor pdir podr pdat */
 | 
					    {	/*	      conf ppar psor pdir podr pdat */
 | 
				
			||||||
	/* PA31 */ {   0,   1,	 1,   0,   0,	0   }, /* FCC1 COL */
 | 
						/* PA31 */ {   1,   1,	 1,   0,   0,	0   }, /* FCC1 COL */
 | 
				
			||||||
	/* PA30 */ {   0,   1,	 1,   0,   0,	0   }, /* FCC1 CRS */
 | 
						/* PA30 */ {   1,   1,	 1,   0,   0,	0   }, /* FCC1 CRS */
 | 
				
			||||||
	/* PA29 */ {   0,   1,	 1,   1,   0,	0   }, /* FCC1 TXER */
 | 
						/* PA29 */ {   1,   1,	 1,   1,   0,	0   }, /* FCC1 TXER */
 | 
				
			||||||
	/* PA28 */ {   0,   1,	 1,   1,   0,	0   }, /* FCC1 TXEN */
 | 
						/* PA28 */ {   1,   1,	 1,   1,   0,	0   }, /* FCC1 TXEN */
 | 
				
			||||||
	/* PA27 */ {   0,   1,	 1,   0,   0,	0   }, /* FCC1 RXDV */
 | 
						/* PA27 */ {   1,   1,	 1,   0,   0,	0   }, /* FCC1 RXDV */
 | 
				
			||||||
	/* PA26 */ {   0,   1,	 1,   0,   0,	0   }, /* FCC1 RXER */
 | 
						/* PA26 */ {   1,   1,	 1,   0,   0,	0   }, /* FCC1 RXER */
 | 
				
			||||||
	/* PA25 */ {   0,   0,	 0,   0,   1,	0   }, /* 8247_P0 */
 | 
						/* PA25 */ {   0,   0,	 0,   0,   1,	0   }, /* 8247_P0 */
 | 
				
			||||||
#if defined(CONFIG_SOFT_I2C)
 | 
					#if defined(CONFIG_SOFT_I2C)
 | 
				
			||||||
	/* PA24 */ {   1,   0,	 0,   0,   1,	1   }, /* I2C_SDA2 */
 | 
						/* PA24 */ {   1,   0,	 0,   0,   1,	1   }, /* I2C_SDA2 */
 | 
				
			||||||
| 
						 | 
					@ -53,14 +59,14 @@ const iop_conf_t iop_conf_tab[4][32] = {
 | 
				
			||||||
	/* PA23 */ {   0,   0,	 0,   1,   0,	0   }, /* PA23 */
 | 
						/* PA23 */ {   0,   0,	 0,   1,   0,	0   }, /* PA23 */
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
	/* PA22 */ {   0,   0,	 0,   0,   1,	0   }, /* SMC2_DCD */
 | 
						/* PA22 */ {   0,   0,	 0,   0,   1,	0   }, /* SMC2_DCD */
 | 
				
			||||||
	/* PA21 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC1 TXD3 */
 | 
						/* PA21 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC1 TXD3 */
 | 
				
			||||||
	/* PA20 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC1 TXD2 */
 | 
						/* PA20 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC1 TXD2 */
 | 
				
			||||||
	/* PA19 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC1 TXD1 */
 | 
						/* PA19 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC1 TXD1 */
 | 
				
			||||||
	/* PA18 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC1 TXD0 */
 | 
						/* PA18 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC1 TXD0 */
 | 
				
			||||||
	/* PA17 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC1 RXD0 */
 | 
						/* PA17 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC1 RXD0 */
 | 
				
			||||||
	/* PA16 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC1 RXD1 */
 | 
						/* PA16 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC1 RXD1 */
 | 
				
			||||||
	/* PA15 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC1 RXD2 */
 | 
						/* PA15 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC1 RXD2 */
 | 
				
			||||||
	/* PA14 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC1 RXD3 */
 | 
						/* PA14 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC1 RXD3 */
 | 
				
			||||||
	/* PA13 */ {   0,   0,	 0,   1,   1,	0   }, /* SMC2_RTS */
 | 
						/* PA13 */ {   0,   0,	 0,   1,   1,	0   }, /* SMC2_RTS */
 | 
				
			||||||
	/* PA12 */ {   0,   0,	 0,   0,   1,	0   }, /* SMC2_CTS */
 | 
						/* PA12 */ {   0,   0,	 0,   0,   1,	0   }, /* SMC2_CTS */
 | 
				
			||||||
	/* PA11 */ {   0,   0,	 0,   1,   1,	0   }, /* SMC2_DTR */
 | 
						/* PA11 */ {   0,   0,	 0,   1,   1,	0   }, /* SMC2_DTR */
 | 
				
			||||||
| 
						 | 
					@ -79,20 +85,20 @@ const iop_conf_t iop_conf_tab[4][32] = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Port B configuration */
 | 
					    /* Port B configuration */
 | 
				
			||||||
    {	/*	      conf ppar psor pdir podr pdat */
 | 
					    {	/*	      conf ppar psor pdir podr pdat */
 | 
				
			||||||
	/* PB31 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC2 MII TX_ER */
 | 
						/* PB31 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC2 MII TX_ER */
 | 
				
			||||||
	/* PB30 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RX_DV */
 | 
						/* PB30 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII RX_DV */
 | 
				
			||||||
	/* PB29 */ {   1,   1,	 1,   1,   0,	0   }, /* FCC2 MII TX_EN */
 | 
						/* PB29 */ {   0,   1,	 1,   1,   0,	0   }, /* FCC2 MII TX_EN */
 | 
				
			||||||
	/* PB28 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RX_ER */
 | 
						/* PB28 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII RX_ER */
 | 
				
			||||||
	/* PB27 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII COL */
 | 
						/* PB27 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII COL */
 | 
				
			||||||
	/* PB26 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII CRS */
 | 
						/* PB26 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII CRS */
 | 
				
			||||||
	/* PB25 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[3] */
 | 
						/* PB25 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[3] */
 | 
				
			||||||
	/* PB24 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[2] */
 | 
						/* PB24 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[2] */
 | 
				
			||||||
	/* PB23 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[1] */
 | 
						/* PB23 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[1] */
 | 
				
			||||||
	/* PB22 */ {   1,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[0] */
 | 
						/* PB22 */ {   0,   1,	 0,   1,   0,	0   }, /* FCC2 MII TxD[0] */
 | 
				
			||||||
	/* PB21 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[0] */
 | 
						/* PB21 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[0] */
 | 
				
			||||||
	/* PB20 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[1] */
 | 
						/* PB20 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[1] */
 | 
				
			||||||
	/* PB19 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[2] */
 | 
						/* PB19 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[2] */
 | 
				
			||||||
	/* PB18 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[3] */
 | 
						/* PB18 */ {   0,   1,	 0,   0,   0,	0   }, /* FCC2 MII RxD[3] */
 | 
				
			||||||
	/* PB17 */ {   0,   0,	 0,   0,   0,	0   }, /* PB17 */
 | 
						/* PB17 */ {   0,   0,	 0,   0,   0,	0   }, /* PB17 */
 | 
				
			||||||
	/* PB16 */ {   0,   0,	 0,   0,   0,	0   }, /* PB16 */
 | 
						/* PB16 */ {   0,   0,	 0,   0,   0,	0   }, /* PB16 */
 | 
				
			||||||
	/* PB15 */ {   0,   0,	 0,   0,   0,	0   }, /* PB15 */
 | 
						/* PB15 */ {   0,   0,	 0,   0,   0,	0   }, /* PB15 */
 | 
				
			||||||
| 
						 | 
					@ -123,8 +129,8 @@ const iop_conf_t iop_conf_tab[4][32] = {
 | 
				
			||||||
	/* PC26 */ {   0,   0,	 0,   1,   0,	0   }, /* PC26 */
 | 
						/* PC26 */ {   0,   0,	 0,   1,   0,	0   }, /* PC26 */
 | 
				
			||||||
	/* PC25 */ {   0,   1,	 1,   0,   0,	0   }, /* SYNC_IN */
 | 
						/* PC25 */ {   0,   1,	 1,   0,   0,	0   }, /* SYNC_IN */
 | 
				
			||||||
	/* PC24 */ {   0,   0,	 0,   1,   0,	0   }, /* PC24 */
 | 
						/* PC24 */ {   0,   0,	 0,   1,   0,	0   }, /* PC24 */
 | 
				
			||||||
	/* PC23 */ {   0,   1,	 0,   1,   0,	0   }, /* ATMTFCLK */
 | 
						/* PC23 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC1 MII TX_CLK */
 | 
				
			||||||
	/* PC22 */ {   0,   1,	 0,   0,   0,	0   }, /* ATMRFCLK */
 | 
						/* PC22 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC1 MII RX_CLK */
 | 
				
			||||||
	/* PC21 */ {   0,   1,	 0,   0,   0,	0   }, /* SCC1 EN RXCLK */
 | 
						/* PC21 */ {   0,   1,	 0,   0,   0,	0   }, /* SCC1 EN RXCLK */
 | 
				
			||||||
	/* PC20 */ {   0,   1,	 0,   0,   0,	0   }, /* SCC1 EN TXCLK */
 | 
						/* PC20 */ {   0,   1,	 0,   0,   0,	0   }, /* SCC1 EN TXCLK */
 | 
				
			||||||
	/* PC19 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RX_CLK */
 | 
						/* PC19 */ {   1,   1,	 0,   0,   0,	0   }, /* FCC2 MII RX_CLK */
 | 
				
			||||||
| 
						 | 
					@ -180,7 +186,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
 | 
				
			||||||
	/* PD10 */ {   0,   0,	 0,   0,   0,	0   }, /* PD10 */
 | 
						/* PD10 */ {   0,   0,	 0,   0,   0,	0   }, /* PD10 */
 | 
				
			||||||
	/* PD9	*/ {   0,   0,	 0,   0,   0,	0   }, /* PD9 */
 | 
						/* PD9	*/ {   0,   0,	 0,   0,   0,	0   }, /* PD9 */
 | 
				
			||||||
	/* PD8	*/ {   0,   0,	 0,   0,   0,	0   }, /* PD8 */
 | 
						/* PD8	*/ {   0,   0,	 0,   0,   0,	0   }, /* PD8 */
 | 
				
			||||||
	/* PD7	*/ {   0,   0,	 0,   1,   0,	1   }, /* MII_MDIO */
 | 
						/* PD7	*/ {   1,   0,	 0,   1,   0,	1   }, /* MII_MDIO */
 | 
				
			||||||
	/* PD6	*/ {   0,   0,	 0,   1,   0,	1   }, /* PD6 */
 | 
						/* PD6	*/ {   0,   0,	 0,   1,   0,	1   }, /* PD6 */
 | 
				
			||||||
	/* PD5	*/ {   0,   0,	 0,   1,   0,	1   }, /* PD5 */
 | 
						/* PD5	*/ {   0,   0,	 0,   1,   0,	1   }, /* PD5 */
 | 
				
			||||||
	/* PD4	*/ {   0,   0,	 0,   1,   0,	1   }, /* PD4 */
 | 
						/* PD4	*/ {   0,   0,	 0,   1,   0,	1   }, /* PD4 */
 | 
				
			||||||
| 
						 | 
					@ -224,7 +230,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
 | 
				
			||||||
	 * mapped by the controller. That means, that the initial mapping has
 | 
						 * mapped by the controller. That means, that the initial mapping has
 | 
				
			||||||
	 * to be (at least) twice as large as the maximum expected size.
 | 
						 * to be (at least) twice as large as the maximum expected size.
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	maxsize = (1 + (~orx | 0x7fff)) / 2;
 | 
						maxsize = (1 + (~orx | 0x7fff))/* / 2*/;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sdmr_ptr = &memctl->memc_psdmr;
 | 
						sdmr_ptr = &memctl->memc_psdmr;
 | 
				
			||||||
	orx_ptr = &memctl->memc_or2;
 | 
						orx_ptr = &memctl->memc_or2;
 | 
				
			||||||
| 
						 | 
					@ -315,4 +321,38 @@ nand_init (void)
 | 
				
			||||||
	printf ("%4lu MB\n", totlen >>20);
 | 
						printf ("%4lu MB\n", totlen >>20);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif	/* CFG_CMD_NAND */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * update "memory" property in the blob
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					void ft_blob_update(void *blob, bd_t *bd)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						int ret, nodeoffset = 0;
 | 
				
			||||||
 | 
						ulong memory_data[2] = {0};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						memory_data[0] = cpu_to_be32(bd->bi_memstart);
 | 
				
			||||||
 | 
						memory_data[1] = cpu_to_be32(bd->bi_memsize);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						nodeoffset = fdt_find_node_by_path (blob, "/memory");
 | 
				
			||||||
 | 
						if (nodeoffset >= 0) {
 | 
				
			||||||
 | 
							ret = fdt_setprop(blob, nodeoffset, "reg", memory_data,
 | 
				
			||||||
 | 
										sizeof(memory_data));
 | 
				
			||||||
 | 
						if (ret < 0)
 | 
				
			||||||
 | 
							printf("ft_blob_update): cannot set /memory/reg "
 | 
				
			||||||
 | 
								"property err:%s\n", fdt_strerror(ret));
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						else {
 | 
				
			||||||
 | 
							/* memory node is required in dts */
 | 
				
			||||||
 | 
							printf("ft_blob_update(): cannot find /memory node "
 | 
				
			||||||
 | 
							"err:%s\n", fdt_strerror(nodeoffset));
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ft_board_setup(void *blob, bd_t *bd)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						ft_cpu_setup( blob, bd);
 | 
				
			||||||
 | 
						ft_blob_update(blob, bd);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -441,15 +441,21 @@ ulong post_word_load (void)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
#endif	/* CONFIG_POST || CONFIG_LOGBUFFER*/
 | 
					#endif	/* CONFIG_POST || CONFIG_LOGBUFFER*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef CONFIG_PS2MULT
 | 
					 | 
				
			||||||
#ifdef CONFIG_BOARD_EARLY_INIT_R
 | 
					#ifdef CONFIG_BOARD_EARLY_INIT_R
 | 
				
			||||||
int board_early_init_r (void)
 | 
					int board_early_init_r (void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					#ifdef CONFIG_PS2MULT
 | 
				
			||||||
	ps2mult_early_init();
 | 
						ps2mult_early_init();
 | 
				
			||||||
 | 
					#endif /* CONFIG_PS2MULT */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 | 
				
			||||||
 | 
						/* Low level USB init, required for proper kernel operation */
 | 
				
			||||||
 | 
						usb_cpu_init();
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#endif /* CONFIG_PS2MULT */
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef CONFIG_FO300
 | 
					#ifdef CONFIG_FO300
 | 
				
			||||||
int silent_boot (void)
 | 
					int silent_boot (void)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -257,7 +257,7 @@ static int usb_kbd_translate(unsigned char scancode,unsigned char modifier,int p
 | 
				
			||||||
		repeat_delay=REPEAT_DELAY;
 | 
							repeat_delay=REPEAT_DELAY;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	keycode=0;
 | 
						keycode=0;
 | 
				
			||||||
	if((scancode>3) && (scancode<0x1d)) { /* alpha numeric values */
 | 
						if((scancode>3) && (scancode<=0x1d)) { /* alpha numeric values */
 | 
				
			||||||
		keycode=scancode-4 + 0x61;
 | 
							keycode=scancode-4 + 0x61;
 | 
				
			||||||
		if(caps_lock)
 | 
							if(caps_lock)
 | 
				
			||||||
			keycode&=~CAPITAL_MASK; /* switch to capital Letters */
 | 
								keycode&=~CAPITAL_MASK; /* switch to capital Letters */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -69,10 +69,6 @@ PLATFORM_CPPFLAGS+= -D__ARM__
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(ARCH),blackfin)
 | 
					 | 
				
			||||||
PLATFORM_CPPFLAGS+= -D__BLACKFIN__
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ifdef	ARCH
 | 
					ifdef	ARCH
 | 
				
			||||||
sinclude $(TOPDIR)/$(ARCH)_config.mk	# include architecture dependend rules
 | 
					sinclude $(TOPDIR)/$(ARCH)_config.mk	# include architecture dependend rules
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -86,7 +86,7 @@ void irq_free_handler (int vec)
 | 
				
			||||||
 vga?
 | 
					 vga?
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void timer_interrupt_cpu (struct pt_regs *regs, ulong timestamp)
 | 
					void timer_interrupt_cpu (struct pt_regs *regs)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	/* nothing to do here */
 | 
						/* nothing to do here */
 | 
				
			||||||
	return;
 | 
						return;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,6 +47,11 @@
 | 
				
			||||||
#include <asm/processor.h>
 | 
					#include <asm/processor.h>
 | 
				
			||||||
#include <asm/cpm_8260.h>
 | 
					#include <asm/cpm_8260.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined(CONFIG_OF_LIBFDT)
 | 
				
			||||||
 | 
					#include <libfdt.h>
 | 
				
			||||||
 | 
					#include <libfdt_env.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DECLARE_GLOBAL_DATA_PTR;
 | 
					DECLARE_GLOBAL_DATA_PTR;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined(CONFIG_GET_CPU_STR_F)
 | 
					#if defined(CONFIG_GET_CPU_STR_F)
 | 
				
			||||||
| 
						 | 
					@ -294,3 +299,36 @@ void watchdog_reset (void)
 | 
				
			||||||
#endif /* CONFIG_WATCHDOG */
 | 
					#endif /* CONFIG_WATCHDOG */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ------------------------------------------------------------------------- */
 | 
					/* ------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					#if defined(CONFIG_OF_LIBFDT)
 | 
				
			||||||
 | 
					static void do_fixup(void *fdt, const char *node, const char *prop,
 | 
				
			||||||
 | 
								const void *val, int len, int create)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					#if defined(DEBUG)
 | 
				
			||||||
 | 
						int i;
 | 
				
			||||||
 | 
						debug("Updating property '%s/%s' = ", node, prop);
 | 
				
			||||||
 | 
						for (i = 0; i < len; i++)
 | 
				
			||||||
 | 
							debug(" %.2x", *(u8*)(val+i));
 | 
				
			||||||
 | 
						debug("\n");
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
						int rc = fdt_find_and_setprop(fdt, node, prop, val, len, create);
 | 
				
			||||||
 | 
						if (rc)
 | 
				
			||||||
 | 
							printf("Unable to update property %s:%s, err=%s\n",
 | 
				
			||||||
 | 
								node, prop, fdt_strerror(rc));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void do_fixup_u32(void *fdt, const char *node, const char *prop,
 | 
				
			||||||
 | 
								 u32 val, int create)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						val = cpu_to_fdt32(val);
 | 
				
			||||||
 | 
						do_fixup(fdt, node, prop, &val, sizeof(val), create);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ft_cpu_setup (void *blob, bd_t *bd)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						char * cpu_path = "/cpus/" OF_CPU;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						do_fixup_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
 | 
				
			||||||
 | 
						do_fixup_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
 | 
				
			||||||
 | 
						do_fixup_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif /* CONFIG_OF_LIBFDT */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -723,7 +723,8 @@ static hw_info_t hw_info[] = {
 | 
				
			||||||
	{ /* SuperSocket RE450T */ 0x0110, 0x00, 0xe0, 0x98, 0 },
 | 
						{ /* SuperSocket RE450T */ 0x0110, 0x00, 0xe0, 0x98, 0 },
 | 
				
			||||||
	{ /* Volktek NPL-402CT */ 0x0060, 0x00, 0x40, 0x05, 0 },
 | 
						{ /* Volktek NPL-402CT */ 0x0060, 0x00, 0x40, 0x05, 0 },
 | 
				
			||||||
	{ /* NEC PC-9801N-J12 */ 0x0ff0, 0x00, 0x00, 0x4c, 0 },
 | 
						{ /* NEC PC-9801N-J12 */ 0x0ff0, 0x00, 0x00, 0x4c, 0 },
 | 
				
			||||||
	{ /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 }
 | 
						{ /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 },
 | 
				
			||||||
 | 
						{ /* Qemu */ 0x0, 0x52, 0x54, 0x00, 0 }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define NR_INFO		(sizeof(hw_info)/sizeof(hw_info_t))
 | 
					#define NR_INFO		(sizeof(hw_info)/sizeof(hw_info_t))
 | 
				
			||||||
| 
						 | 
					@ -824,30 +825,22 @@ static hw_info_t * get_prom(void ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* U-boot specific routines */
 | 
					/* U-boot specific routines */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define NB 5
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
static unsigned char *pbuf = NULL;
 | 
					static unsigned char *pbuf = NULL;
 | 
				
			||||||
static int plen[NB];
 | 
					 | 
				
			||||||
static int nrx = 0;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int pkey = -1;
 | 
					static int pkey = -1;
 | 
				
			||||||
static int initialized=0;
 | 
					static int initialized=0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void uboot_push_packet_len(int len) {
 | 
					void uboot_push_packet_len(int len) {
 | 
				
			||||||
	PRINTK("pushed len = %d, nrx = %d\n", len, nrx);
 | 
						PRINTK("pushed len = %d\n", len);
 | 
				
			||||||
	if (len>=2000) {
 | 
						if (len>=2000) {
 | 
				
			||||||
		printf("NE2000: packet too big\n");
 | 
							printf("NE2000: packet too big\n");
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if (nrx >= NB) {
 | 
						dp83902a_recv(&pbuf[0], len);
 | 
				
			||||||
		printf("losing packets in rx\n");
 | 
					 | 
				
			||||||
		return;
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	plen[nrx] = len;
 | 
					 | 
				
			||||||
	dp83902a_recv(&pbuf[nrx*2000], len);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*Just pass it to the upper layer*/
 | 
						/*Just pass it to the upper layer*/
 | 
				
			||||||
	NetReceive(&pbuf[nrx*2000], plen[nrx]);
 | 
						NetReceive(&pbuf[0], len);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void uboot_push_tx_done(int key, int val) {
 | 
					void uboot_push_tx_done(int key, int val) {
 | 
				
			||||||
| 
						 | 
					@ -862,9 +855,9 @@ int eth_init(bd_t *bd) {
 | 
				
			||||||
	PRINTK("### eth_init\n");
 | 
						PRINTK("### eth_init\n");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (!pbuf) {
 | 
						if (!pbuf) {
 | 
				
			||||||
		pbuf = malloc(NB*2000);
 | 
							pbuf = malloc(2000);
 | 
				
			||||||
		if (!pbuf) {
 | 
							if (!pbuf) {
 | 
				
			||||||
			printf("Cannot allocate rx buffers\n");
 | 
								printf("Cannot allocate rx buffer\n");
 | 
				
			||||||
			return -1;
 | 
								return -1;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -574,38 +574,30 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_BSP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DISPLAY
 | 
				
			||||||
 | 
					#define CONFIG_CMD_EXT2
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REISER
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_ASKENV
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BEDBUG
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BMP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_CACHE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DOC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DTT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EEPROM
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_ELF
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FAT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IDE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_I2C
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_KGDB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NFS
 | 
					#undef CONFIG_CMD_NFS
 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MII
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if (CFG_NIOS_CPU_SPI_NUMS != 1)
 | 
					#if (CFG_NIOS_CPU_SPI_NUMS == 1)
 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
#undef CONFIG_CMD_DATE
 | 
					#define CONFIG_CMD_SPI
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*------------------------------------------------------------------------
 | 
					/*------------------------------------------------------------------------
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -459,38 +459,27 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DISPLAY
 | 
				
			||||||
 | 
					#define CONFIG_CMD_EXT2
 | 
				
			||||||
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IDE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_ASKENV
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BEDBUG
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BMP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BSP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_CACHE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DATE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DOC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DTT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EEPROM
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_ELF
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_I2C
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_KGDB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NFS
 | 
					#undef CONFIG_CMD_NFS
 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MII
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_REISER
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
/*------------------------------------------------------------------------
 | 
					/*------------------------------------------------------------------------
 | 
				
			||||||
 * COMPACT FLASH
 | 
					 * COMPACT FLASH
 | 
				
			||||||
 *----------------------------------------------------------------------*/
 | 
					 *----------------------------------------------------------------------*/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -466,38 +466,25 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_ASKENV
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
#undef COND_CMD_BEDBUG
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
#undef COND_CMD_BMP
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
#undef COND_CMD_BSP
 | 
					#define CONFIG_CMD_DISPLAY
 | 
				
			||||||
#undef COND_CMD_CACHE
 | 
					#define CONFIG_CMD_EXT2
 | 
				
			||||||
#undef COND_CMD_DATE
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
#undef COND_CMD_DOC
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
#undef COND_CMD_DTT
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#undef COND_CMD_EEPROM
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
#undef COND_CMD_ELF
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
#undef COND_CMD_FAT
 | 
					#define CONFIG_CMD_REISER
 | 
				
			||||||
#undef COND_CMD_FDC
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
#undef COND_CMD_FDOS
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#undef COND_CMD_HWFLOW
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
#undef COND_CMD_IDE
 | 
					 | 
				
			||||||
#undef COND_CMD_I2C
 | 
					 | 
				
			||||||
#undef COND_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef COND_CMD_KGDB
 | 
					 | 
				
			||||||
#undef COND_CMD_NAND
 | 
					 | 
				
			||||||
#undef COND_CMD_NFS
 | 
					 | 
				
			||||||
#undef COND_CMD_MMC
 | 
					 | 
				
			||||||
#undef COND_CMD_MII
 | 
					 | 
				
			||||||
#undef COND_CMD_PCI
 | 
					 | 
				
			||||||
#undef COND_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef COND_CMD_SCSI
 | 
					 | 
				
			||||||
#undef COND_CMD_SPI
 | 
					 | 
				
			||||||
#undef COND_CMD_VFD
 | 
					 | 
				
			||||||
#undef COND_CMD_USB
 | 
					 | 
				
			||||||
#undef COND_CMD_XIMG
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#undef CONFIG_CMD_NFS
 | 
				
			||||||
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*------------------------------------------------------------------------
 | 
					/*------------------------------------------------------------------------
 | 
				
			||||||
 * KGDB
 | 
					 * KGDB
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -120,6 +120,17 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CFG_NS16550_COM1        (CFG_UART_BASE + 0x8000)
 | 
					#define CFG_NS16550_COM1        (CFG_UART_BASE + 0x8000)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* pass open firmware flat tree */
 | 
				
			||||||
 | 
					#define CONFIG_OF_LIBFDT	1
 | 
				
			||||||
 | 
					#define CONFIG_OF_BOARD_SETUP	1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define OF_CPU	"PowerPC,8247@0"
 | 
				
			||||||
 | 
					#define OF_SOC	"soc@f0000000"
 | 
				
			||||||
 | 
					#define OF_TBCLK	(bd->bi_busfreq / 4)
 | 
				
			||||||
 | 
					#define OF_STDOUT_PATH	"/soc@f0000000/serial8250@e0008000"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * select ethernet configuration
 | 
					 * select ethernet configuration
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
| 
						 | 
					@ -133,16 +144,18 @@
 | 
				
			||||||
#undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC       */
 | 
					#undef	CONFIG_ETHER_ON_SCC		/* define if ether on SCC       */
 | 
				
			||||||
#define	CONFIG_ETHER_ON_FCC		/* define if ether on FCC       */
 | 
					#define	CONFIG_ETHER_ON_FCC		/* define if ether on FCC       */
 | 
				
			||||||
#undef	CONFIG_ETHER_NONE		/* define if ether on something else */
 | 
					#undef	CONFIG_ETHER_NONE		/* define if ether on something else */
 | 
				
			||||||
#define	CONFIG_ETHER_INDEX    2		/* which SCC/FCC channel for ethernet */
 | 
					#define	CONFIG_ETHER_INDEX	1	/* which SCC/FCC channel for ethernet */
 | 
				
			||||||
 | 
					#define CONFIG_ETHER_ON_FCC1
 | 
				
			||||||
 | 
					#define FCC_ENET
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * - Rx-CLK is CLK13
 | 
					 * - Rx-CLK is CLK10
 | 
				
			||||||
 * - Tx-CLK is CLK14
 | 
					 * - Tx-CLK is CLK9
 | 
				
			||||||
 * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 | 
					 * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 | 
				
			||||||
 * - Enable Full Duplex in FSMR
 | 
					 * - Enable Full Duplex in FSMR
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
# define CFG_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 | 
					# define CFG_CMXFCR_MASK	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 | 
				
			||||||
# define CFG_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 | 
					# define CFG_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK10|CMXFCR_TF1CS_CLK9)
 | 
				
			||||||
# define CFG_CPMFCR_RAMTYPE	0
 | 
					# define CFG_CPMFCR_RAMTYPE	0
 | 
				
			||||||
# define CFG_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 | 
					# define CFG_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -166,6 +179,8 @@
 | 
				
			||||||
#define CONFIG_BOOTP_BOOTPATH
 | 
					#define CONFIG_BOOTP_BOOTPATH
 | 
				
			||||||
#define CONFIG_BOOTP_BOOTFILESIZE
 | 
					#define CONFIG_BOOTP_BOOTFILESIZE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_RTC_PCF8563
 | 
				
			||||||
 | 
					#define CFG_I2C_RTC_ADDR		0x51
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
| 
						 | 
					@ -211,7 +226,10 @@
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#define CFG_BOOTMAPSZ        (8 << 20)       /* Initial Memory map for Linux */
 | 
					#define CFG_BOOTMAPSZ        (8 << 20)       /* Initial Memory map for Linux */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CFG_FLASH_CFI				/* The flash is CFI compatible  */
 | 
				
			||||||
 | 
					#define CFG_FLASH_CFI_DRIVER			/* Use common CFI driver        */
 | 
				
			||||||
 | 
					#define CFG_FLASH_BANKS_LIST	{ 0xFF800000 }
 | 
				
			||||||
 | 
					#define CFG_MAX_FLASH_BANKS_DETECT	1
 | 
				
			||||||
/* What should the base address of the main FLASH be and how big is
 | 
					/* What should the base address of the main FLASH be and how big is
 | 
				
			||||||
 * it (in MBytes)? This must contain TEXT_BASE from board/ids8247/config.mk
 | 
					 * it (in MBytes)? This must contain TEXT_BASE from board/ids8247/config.mk
 | 
				
			||||||
 * The main FLASH is whichever is connected to *CS0.
 | 
					 * The main FLASH is whichever is connected to *CS0.
 | 
				
			||||||
| 
						 | 
					@ -227,7 +245,7 @@
 | 
				
			||||||
 * FLASH organization
 | 
					 * FLASH organization
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#define CFG_MAX_FLASH_BANKS	1	/* max num of memory banks      */
 | 
					#define CFG_MAX_FLASH_BANKS	1	/* max num of memory banks      */
 | 
				
			||||||
#define CFG_MAX_FLASH_SECT	64	/* max num of sects on one chip */
 | 
					#define CFG_MAX_FLASH_SECT	128	/* max num of sects on one chip */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CFG_FLASH_ERASE_TOUT	240000	/* Flash Erase Timeout (in ms)  */
 | 
					#define CFG_FLASH_ERASE_TOUT	240000	/* Flash Erase Timeout (in ms)  */
 | 
				
			||||||
#define CFG_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (in ms)  */
 | 
					#define CFG_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (in ms)  */
 | 
				
			||||||
| 
						 | 
					@ -511,12 +529,12 @@
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
#define CFG_OR2    ((~(CFG_GLOBAL_SDRAM_LIMIT-1) & ORxS_SDAM_MSK) |\
 | 
					#define CFG_OR2    ((~(CFG_GLOBAL_SDRAM_LIMIT-1) & ORxS_SDAM_MSK) |\
 | 
				
			||||||
			 ORxS_BPD_4                     |\
 | 
								 ORxS_BPD_4                     |\
 | 
				
			||||||
			 ORxS_ROWST_PBI0_A10             |\
 | 
								 ORxS_ROWST_PBI0_A9		|\
 | 
				
			||||||
			 ORxS_NUMR_12)
 | 
								 ORxS_NUMR_12)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CFG_PSDMR  (PSDMR_SDAM_A13_IS_A5 |\
 | 
					#define CFG_PSDMR  (PSDMR_SDAM_A14_IS_A5 |\
 | 
				
			||||||
			 PSDMR_BSMA_A15_A17           |\
 | 
								 PSDMR_BSMA_A15_A17           |\
 | 
				
			||||||
			 PSDMR_SDA10_PBI0_A11         |\
 | 
								 PSDMR_SDA10_PBI0_A10		|\
 | 
				
			||||||
			 PSDMR_RFRC_5_CLK               |\
 | 
								 PSDMR_RFRC_5_CLK               |\
 | 
				
			||||||
			 PSDMR_PRETOACT_2W              |\
 | 
								 PSDMR_PRETOACT_2W              |\
 | 
				
			||||||
			 PSDMR_ACTTORW_2W               |\
 | 
								 PSDMR_ACTTORW_2W               |\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -87,37 +87,23 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ASKENV
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_BEDBUG
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BMP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BSP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DISPLAY
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DOC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DTT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EEPROM
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_ELF
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EXT2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_I2C
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IDE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IRQ
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_KGDB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MFSL
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MII
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_REISER
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_UNIVERSE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if !(CONFIG_LANTEC >= 2)
 | 
					#if !(CONFIG_LANTEC >= 2)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -209,35 +209,25 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ASKENV
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
 | 
					#define CONFIG_CMD_JFFS2
 | 
				
			||||||
 | 
					#define CONFIG_CMD_MII
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PCI
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_BEDBUG
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BMP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BSP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DATE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DISPLAY
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DOC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DTT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EEPROM
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_ELF
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EXT2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FAT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IDE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_KGDB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MFSL
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_REISER
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SNTP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_UNIVERSE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if CONFIG_ADSTYPE == CFG_8272ADS
 | 
					#if CONFIG_ADSTYPE == CFG_8272ADS
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -346,6 +346,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 | 
				
			||||||
#define CFG_USB_EVENT_POLL	1
 | 
					#define CFG_USB_EVENT_POLL	1
 | 
				
			||||||
#define CFG_USB_OHCI_SLOT_NAME 	"ohci_pci"
 | 
					#define CFG_USB_OHCI_SLOT_NAME 	"ohci_pci"
 | 
				
			||||||
#define CFG_USB_OHCI_MAX_ROOT_PORTS 15
 | 
					#define CFG_USB_OHCI_MAX_ROOT_PORTS 15
 | 
				
			||||||
 | 
					#define CFG_OHCI_SWAP_REG_ACCESS	1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if !defined(CONFIG_PCI_PNP)
 | 
					#if !defined(CONFIG_PCI_PNP)
 | 
				
			||||||
    #define PCI_ENET0_IOADDR	0xe0000000
 | 
					    #define PCI_ENET0_IOADDR	0xe0000000
 | 
				
			||||||
| 
						 | 
					@ -544,6 +545,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 | 
				
			||||||
    #define CONFIG_CMD_PCI
 | 
					    #define CONFIG_CMD_PCI
 | 
				
			||||||
    #define CONFIG_CMD_SCSI
 | 
					    #define CONFIG_CMD_SCSI
 | 
				
			||||||
    #define CONFIG_CMD_EXT2
 | 
					    #define CONFIG_CMD_EXT2
 | 
				
			||||||
 | 
					    #define CONFIG_CMD_USB
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -105,36 +105,31 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ASKENV
 | 
				
			||||||
 | 
					#define CONFIG_CMD_BEDBUG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_BMP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DOC
 | 
				
			||||||
 | 
					#define CONFIG_CMD_EEPROM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ELF
 | 
				
			||||||
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_KGDB
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_BSP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DATE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DISPLAY
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DTT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EXT2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IDE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IRQ
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MII
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MFSL
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_REISER
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SETGETDCR
 | 
					#undef CONFIG_CMD_SETGETDCR
 | 
				
			||||||
#undef CONFIG_CMD_SNTP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_UNIVERSE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Miscellaneous configurable options
 | 
					 * Miscellaneous configurable options
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -303,38 +303,29 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ASKENV
 | 
				
			||||||
 | 
					#define CONFIG_CMD_BEDBUG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ELF
 | 
				
			||||||
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_BMP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BSP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DCR
 | 
					#undef CONFIG_CMD_DCR
 | 
				
			||||||
#undef CONFIG_CMD_DHCP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DISPLAY
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DOC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DTT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EEPROM
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EXT2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IDE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_KGDB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MII
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MFSL
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_REISER
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_UNIVERSE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Where do the internal registers live? */
 | 
					/* Where do the internal registers live? */
 | 
				
			||||||
#define CFG_IMMR               0xF0000000
 | 
					#define CFG_IMMR               0xF0000000
 | 
				
			||||||
#define CFG_DEFAULT_IMMR       0x00010000
 | 
					#define CFG_DEFAULT_IMMR       0x00010000
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -185,33 +185,34 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_all.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ASKENV
 | 
				
			||||||
 | 
					#define CONFIG_CMD_BSP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_CDP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DIAG
 | 
				
			||||||
 | 
					#define CONFIG_CMD_DTT
 | 
				
			||||||
 | 
					#define CONFIG_CMD_EEPROM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_ELF
 | 
				
			||||||
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IMMAP
 | 
				
			||||||
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
 | 
					#define CONFIG_CMD_KGDB
 | 
				
			||||||
 | 
					#define CONFIG_CMD_MII
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
					#define CONFIG_CMD_PORTIO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_REGINFO
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_BEDBUG
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_BMP
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DISPLAY
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_DOC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_EXT2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FDOS
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FPGA
 | 
					#undef CONFIG_CMD_FPGA
 | 
				
			||||||
#undef CONFIG_CMD_HWFLOW
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_IDE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_JFFS2
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_NAND
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MFSL
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MMC
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCMCIA
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_PCI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_USB
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_REISER
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SCSI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_SPI
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_UNIVERSE
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_VFD
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifdef DEBUG
 | 
					#ifdef DEBUG
 | 
				
			||||||
#define CONFIG_BOOTDELAY	-1	/* autoboot disabled		*/
 | 
					#define CONFIG_BOOTDELAY	-1	/* autoboot disabled		*/
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -979,7 +979,6 @@ void DhcpRequest(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	BootpRequest();
 | 
						BootpRequest();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
#endif
 | 
					#endif	/* CONFIG_CMD_DHCP */
 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif	/* CONFIG_CMD_NET */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -405,7 +405,6 @@ rpc_lookup_reply (int prog, uchar *pkt, unsigned len)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (rpc_pkt.u.reply.rstatus  ||
 | 
						if (rpc_pkt.u.reply.rstatus  ||
 | 
				
			||||||
	    rpc_pkt.u.reply.verifier ||
 | 
						    rpc_pkt.u.reply.verifier ||
 | 
				
			||||||
	    rpc_pkt.u.reply.astatus  ||
 | 
					 | 
				
			||||||
	    rpc_pkt.u.reply.astatus) {
 | 
						    rpc_pkt.u.reply.astatus) {
 | 
				
			||||||
		return -1;
 | 
							return -1;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue