mpc83xx: tqm8349 - remove pci & flash window conflict

commit 9993e196da707a0a1cd4584f1fcef12382c1c144 "mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCI" remapped pci windows on tqm834x to make it more consistent with the other 83xx boards. During that time however, the author failed to realize that FLASH_BASE was occupying the same range as what PCI1_MEM_BASE was being assigned.

---
WD, if you have time, please test - I don't have a tqm834x board. TIA.

 include/configs/TQM834x.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 492bdcc..da08b7c 100644
@@ -250,7 +250,7 @@ extern int tqm834x_num_flash_banks;
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */
 
 /* PCI1 host bridge */
-#define CONFIG_SYS_PCI1_MEM_BASE       0x80000000
+#define CONFIG_SYS_PCI1_MEM_BASE       0x90000000
 #define CONFIG_SYS_PCI1_MEM_PHYS       CONFIG_SYS_PCI1_MEM_BASE
 #define CONFIG_SYS_PCI1_MEM_SIZE       0x10000000      /* 256M */
 #define CONFIG_SYS_PCI1_MMIO_BASE      (CONFIG_SYS_PCI1_MEM_BASE + CONFIG_SYS_PCI1_MEM_SIZE)

1.6.3.3

Dear Kim Phillips,

I can verify that the original problem (non working flash support) gets fixed by this patch:

without the patch:

	U-Boot 2009.06-00513-g982adfc (Jul 24 2009 - 15:42:41) MPC83XX

	Reset Status: External/Internal Soft, External/Internal Hard

	CPU:   e300c1, MPC8349E, Rev: 1.1 at 533.328 MHz, CSB: 266.664 MHz
	Board: TQM834x
	PCI1:  32 bit, 33 MHz
	I2C:   ready
	DRAM:  256 MB
	FLASH: ## Unknown FLASH on Bank 1 - Size = 0x02000000 = 0 MB
	32 MB
	PCI:   Bus Dev VenId DevId Class Int
		00  0b  104c  ac55  0607  ff
		00  0b  104c  ac55  0607  ff
	DTT:   1 is 27 C
	Net:   TSEC0, TSEC1
	...

with the patch:

	U-Boot 2009.08-rc2-00026-g5c023da (Aug 20 2009 - 10:41:53) MPC83XX

	Reset Status: External/Internal Soft, External/Internal Hard

	CPU:   e300c1, MPC8349E, Rev: 1.1 at 533.328 MHz, CSB: 266.664 MHz
	Board: TQM834x
	PCI1:  32 bit, 33 MHz
	I2C:   ready
	DRAM:  256 MB
	FLASH: 32 MB
	PCI:   Bus Dev VenId DevId Class Int
		00  0b  104c  ac55  0607  ff
		00  0b  104c  ac55  0607  ff
	DTT:   1 is 34 C
	Net:   TSEC0, TSEC1
	...

But I have a question (unrelated to this patch):

With recent versions of U-Boot I see unstable network behaviour:

=> run load
TSEC0: No link.
TSEC1: No link.
=> run load
Speed: 1000, full duplex
Using TSEC0 device
TFTP from server 192.168.1.1; our IP address is 192.168.205.1 Filename 'tqm834x/u-boot.bin'.
Load address: 0x200000
Loading: ##############Got error 4
####
done
Bytes transferred = 253376 (3ddc0 hex)

=> run load
Speed: 1000, full duplex
Using TSEC0 device
TFTP from server 192.168.1.1; our IP address is 192.168.205.1 Filename 'tqm834x/u-boot.bin'.
Load address: 0x200000
Loading: #Got error 4
#Got error 4
Got error 4
T T ################
done
Bytes transferred = 253376 (3ddc0 hex)

=> run load
Speed: 1000, full duplex
Using TSEC0 device
TFTP from server 192.168.1.1; our IP address is 192.168.205.1 Filename 'tqm834x/u-boot.bin'.
Load address: 0x200000
Loading: #######Got error 4
#Got error 4
####Got error 4
Got error 4
#Got error 4
#####
done
Bytes transferred = 253376 (3ddc0 hex)

Do you have any idea what might go wrong here?

[Sorry, I didn't find time yet to try bisecting this, but maybe this rings a bell to you?]

Best regards,

Wolfgang Denk

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
				 EARTH
			     smog  |   bricks
			 AIR  --  mud  --  FIRE
			soda water |   tequila
				 WATER

Great, thank you!

sorry, networking works as fast as lightning here. memory config? mac address collision perhaps?

Kim

Dear Kim Phillips,

MAC address is definitely OK. Memory initialization should be OK, too. and the board works like a charm under Linux.

Best regards,

Wolfgang Denk

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Don't you know anything? I should have thought anyone knows that  who
knows anything about anything...      - Terry Pratchett, _Soul Music_

sounds like git-bisection is in order then.

Kim