From: Kim Phillips Date: Wed, 22 Sep 2010 16:21:46 -0500 Subject: [U-Boot] [PATCH 1/5] 83xx: Remove warmboot parameter from PCI init functions In-Reply-To: <1284509634-11899-1-git-send-email-ptyser@xes-inc.com> References: <1284509634-11899-1-git-send-email-ptyser@xes-inc.com> Message-ID: <20100922162146.118cd0a3.kim.phillips@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tue, 14 Sep 2010 19:13:50 -0500 Peter Tyser wrote: > This change lays the groundwork for the BOOTFLAG_* flags being removed. > > This change has the small affect of delaying 100ms on PCI initialization > after a warm boot as opposed to the optimal 1ms on some boards. > > Signed-off-by: Peter Tyser > CC: kim.phillips at freescale.com > --- > arch/powerpc/cpu/mpc83xx/pci.c | 6 +++--- > arch/powerpc/cpu/mpc83xx/pcie.c | 6 +++--- > board/esd/vme8349/pci.c | 2 +- > board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +- > board/freescale/mpc8313erdb/mpc8313erdb.c | 8 +------- > board/freescale/mpc8315erdb/mpc8315erdb.c | 8 ++------ > board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +- > board/freescale/mpc832xemds/pci.c | 6 +++--- > board/freescale/mpc8349emds/pci.c | 6 +++--- > board/freescale/mpc8349itx/pci.c | 4 ++-- > board/freescale/mpc8360emds/pci.c | 6 +++--- > board/freescale/mpc8360erdk/mpc8360erdk.c | 2 +- > board/freescale/mpc837xemds/pci.c | 2 +- > board/freescale/mpc837xerdb/pci.c | 4 ++-- > board/matrix_vision/mvblm7/pci.c | 5 +---- > board/sbc8349/pci.c | 2 +- > board/sheldon/simpc8313/simpc8313.c | 5 +---- > board/tqc/tqm834x/pci.c | 2 +- > board/ve8313/ve8313.c | 5 +---- > include/mpc83xx.h | 4 ++-- > 20 files changed, 34 insertions(+), 53 deletions(-) applied to u-boot-mpc83xx/next, with the following added due to account for the new board: diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index 0c70b15..d92833b 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -74,7 +74,7 @@ void pci_init_board(void) out_be32(&pcie_law[0].bar, CONFIG_SYS_PCIE1_BASE & LAWBAR_BAR); out_be32(&pcie_law[0].ar, LBLAWAR_EN | LBLAWAR_512MB); - mpc83xx_pcie_init(1, pcie_reg, 0); + mpc83xx_pcie_init(1, pcie_reg); } #if defined(CONFIG_OF_BOARD_SETUP) Thanks, Kim n.b., if this was part of a series that was to be applied in whole by one maintainer, please state that up front. I decided to apply this since (a) it needed rebasing for the new board, and (b) it's the 1st in the series, and git will automatically merge it for that single maintainer come apply time.