diff options
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/mpc8536ds/mpc8536ds.c | 22 | ||||
| -rw-r--r-- | board/freescale/mpc8544ds/mpc8544ds.c | 15 | ||||
| -rw-r--r-- | board/freescale/mpc8548cds/mpc8548cds.c | 9 | ||||
| -rw-r--r-- | board/freescale/mpc8568mds/mpc8568mds.c | 9 | ||||
| -rw-r--r-- | board/freescale/mpc8569mds/mpc8569mds.c | 7 | ||||
| -rw-r--r-- | board/freescale/mpc8572ds/mpc8572ds.c | 11 | ||||
| -rw-r--r-- | board/freescale/mpc8610hpcd/mpc8610hpcd.c | 12 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c | 7 | ||||
| -rw-r--r-- | board/freescale/p1022ds/p1022ds.c | 18 | ||||
| -rw-r--r-- | board/freescale/p1_p2_rdb/pci.c | 15 | ||||
| -rw-r--r-- | board/freescale/p2020ds/p2020ds.c | 13 | 
11 files changed, 22 insertions, 116 deletions
| diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 50ca3cae9..c8e08563b 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -396,26 +396,8 @@ void ft_board_setup(void *blob, bd_t *bd)  {  	ft_cpu_setup(blob, bd); -#ifdef CONFIG_PCI1 -	ft_fsl_pci_setup(blob, "pci0", &pci1_hose); -#else -	ft_fsl_pci_setup(blob, "pci0", NULL); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#else -	ft_fsl_pci_setup(blob, "pci1", NULL); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci2", &pcie1_hose); -#else -	ft_fsl_pci_setup(blob, "pci2", NULL); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci3", &pcie3_hose); -#else -	ft_fsl_pci_setup(blob, "pci3", NULL); -#endif +	FT_FSL_PCI_SETUP; +  #ifdef CONFIG_FSL_SGMII_RISER  	fsl_sgmii_riser_fdt_fixup(blob);  #endif diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 581d5f26e..da3a2b6ee 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -1,5 +1,5 @@  /* - * Copyright 2007,2009 Freescale Semiconductor, Inc. + * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -360,19 +360,8 @@ void ft_board_setup(void *blob, bd_t *bd)  {  	ft_cpu_setup(blob, bd); +	FT_FSL_PCI_SETUP; -#ifdef CONFIG_PCI1 -	ft_fsl_pci_setup(blob, "pci0", &pci1_hose); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci2", &pcie3_hose); -#endif -#ifdef CONFIG_PCIE3 -	ft_fsl_pci_setup(blob, "pci3", &pcie2_hose); -#endif  #ifdef CONFIG_FSL_SGMII_RISER  	fsl_sgmii_riser_fdt_fixup(blob);  #endif diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index f0169959a..23e552bde 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -1,5 +1,5 @@  /* - * Copyright 2004, 2007, 200 Freescale Semiconductor, Inc. + * Copyright 2004, 2007, 2009-2010 Freescale Semiconductor, Inc.   *   * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>   * @@ -388,11 +388,6 @@ int last_stage_init(void)  #if defined(CONFIG_OF_BOARD_SETUP)  void ft_pci_setup(void *blob, bd_t *bd)  { -#ifdef CONFIG_PCI1 -	ft_fsl_pci_setup(blob, "pci0", &pci1_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); -#endif +	FT_FSL_PCI_SETUP;  }  #endif diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 036bf9528..bd859e4ee 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -1,5 +1,5 @@  /* - * Copyright 2007,2009 Freescale Semiconductor, Inc. + * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.   *   * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>   * @@ -426,11 +426,6 @@ void ft_board_setup(void *blob, bd_t *bd)  {  	ft_cpu_setup(blob, bd); -#ifdef CONFIG_PCI1 -	ft_fsl_pci_setup(blob, "pci0", &pci1_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); -#endif +	FT_FSL_PCI_SETUP;  }  #endif diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 81e8ff51e..01b7dcb70 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -1,5 +1,5 @@  /* - * Copyright 2009 Freescale Semiconductor. + * Copyright 2009-2010 Freescale Semiconductor.   *   * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>   * @@ -635,9 +635,8 @@ void ft_board_setup(void *blob, bd_t *bd)  #endif  	ft_cpu_setup(blob, bd); -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); -#endif +	FT_FSL_PCI_SETUP; +  	fdt_board_fixup_esdhc(blob, bd);  	fdt_board_fixup_qe_uart(blob, bd);  	fdt_board_fixup_qe_usb(blob, bd); diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 81d481a17..6b96dfc16 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -345,15 +345,8 @@ void ft_board_setup(void *blob, bd_t *bd)  	fdt_fixup_memory(blob, (u64)base, (u64)size); -#ifdef CONFIG_PCIE3 -	ft_fsl_pci_setup(blob, "pci0", &pcie3_hose); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci2", &pcie1_hose); -#endif +	FT_FSL_PCI_SETUP; +  #ifdef CONFIG_FSL_SGMII_RISER  	fsl_sgmii_riser_fdt_fixup(blob);  #endif diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 2ef7b2323..6578f58db 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -1,5 +1,5 @@  /* - * Copyright 2007,2009 Freescale Semiconductor, Inc. + * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -309,15 +309,7 @@ ft_board_setup(void *blob, bd_t *bd)  {  	ft_cpu_setup(blob, bd); -#ifdef CONFIG_PCI1 -	ft_fsl_pci_setup(blob, "pci0", &pci1_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci2", &pcie2_hose); -#endif +	FT_FSL_PCI_SETUP;  }  #endif diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index a88be5a0d..d86ca12aa 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -253,12 +253,7 @@ ft_board_setup(void *blob, bd_t *bd)  	ft_cpu_setup(blob, bd); -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci0", &pcie1_hose); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#endif +	FT_FSL_PCI_SETUP;  	/*  	 * Warn if it looks like the device tree doesn't match u-boot. diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index be692cb45..5cdee9ff7 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -322,23 +322,7 @@ void ft_board_setup(void *blob, bd_t *bd)  	fdt_fixup_memory(blob, (u64)base, (u64)size); -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci0", &pcie1_hose); -#else -	ft_fsl_pci_setup(blob, "pci0", NULL); -#endif - -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#else -	ft_fsl_pci_setup(blob, "pci1", NULL); -#endif - -#ifdef CONFIG_PCIE3 -	ft_fsl_pci_setup(blob, "pci2", &pcie3_hose); -#else -	ft_fsl_pci_setup(blob, "pci2", NULL); -#endif +	FT_FSL_PCI_SETUP;  #ifdef CONFIG_FSL_SGMII_RISER  	fsl_sgmii_riser_fdt_fixup(blob); diff --git a/board/freescale/p1_p2_rdb/pci.c b/board/freescale/p1_p2_rdb/pci.c index aa2f64ca9..97d4f834b 100644 --- a/board/freescale/p1_p2_rdb/pci.c +++ b/board/freescale/p1_p2_rdb/pci.c @@ -1,5 +1,5 @@  /* - * Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2009-2010 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -100,16 +100,5 @@ void pci_init_board(void)  void ft_pci_board_setup(void *blob)  { -/* According to h/w manual, PCIE2 is at lower address(0x9000) - * than PCIE1(0xa000). - * Hence PCIE2 is made to occupy the pci1 position in dts to - * keep the addresses sorted there. - * Generally the case with all FSL SOCs. - */ -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci2", &pcie1_hose); -#endif +	FT_FSL_PCI_SETUP;  } diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c index be4b2eb47..3fd1b347a 100644 --- a/board/freescale/p2020ds/p2020ds.c +++ b/board/freescale/p2020ds/p2020ds.c @@ -1,5 +1,5 @@  /* - * Copyright 2007-2009 Freescale Semiconductor, Inc. + * Copyright 2007-2010 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -366,15 +366,8 @@ void ft_board_setup(void *blob, bd_t *bd)  	fdt_fixup_memory(blob, (u64)base, (u64)size); -#ifdef CONFIG_PCIE3 -	ft_fsl_pci_setup(blob, "pci0", &pcie3_hose); -#endif -#ifdef CONFIG_PCIE2 -	ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#endif -#ifdef CONFIG_PCIE1 -	ft_fsl_pci_setup(blob, "pci2", &pcie1_hose); -#endif +	FT_FSL_PCI_SETUP; +  #ifdef CONFIG_FSL_SGMII_RISER  	fsl_sgmii_riser_fdt_fixup(blob);  #endif |