From: Kim Phillips Date: Fri, 21 Aug 2009 21:31:20 +0000 (-0500) Subject: mpc83xx: tqm8349 - remove pci & flash window conflict X-Git-Tag: v2009.08-rc3~1^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=27c5248dd4c9ba4a36899689595956c5e59e349a;p=oweals%2Fu-boot.git 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. Signed-off-by: Kim Phillips Tested-by: Wolfgang Denk --- diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 492bdccb5a..da08b7c213 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -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)