mirror of
https://github.com/frank-w/u-boot.git
synced 2026-01-11 12:49:06 +08:00
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
This commit is contained in:
@@ -553,6 +553,7 @@ extern unsigned long get_sdram_size(void);
|
||||
|
||||
/* SATA */
|
||||
#define CONFIG_FSL_SATA
|
||||
#define CONFIG_FSL_SATA_V2
|
||||
#define CONFIG_LIBATA
|
||||
|
||||
#ifdef CONFIG_FSL_SATA
|
||||
|
||||
@@ -360,6 +360,7 @@
|
||||
/* SATA */
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_FSL_SATA
|
||||
#define CONFIG_FSL_SATA_V2
|
||||
|
||||
#define CONFIG_SYS_SATA_MAX_DEVICE 2
|
||||
#define CONFIG_SATA1
|
||||
|
||||
@@ -524,7 +524,7 @@ extern unsigned long get_clock_freq(void);
|
||||
/* Default address of microcode for the Linux Fman driver */
|
||||
/* QE microcode/firmware address */
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEF000000
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEFF40000
|
||||
#else
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NAND
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0x1f00000
|
||||
|
||||
@@ -202,15 +202,21 @@ unsigned long get_board_sys_clk(unsigned long dummy);
|
||||
/* Set the local bus clock 1/8 of platform clock */
|
||||
#define CONFIG_SYS_LBC_LCRR LCRR_CLKDIV_8
|
||||
|
||||
#define CONFIG_SYS_FLASH_BASE 0xe8000000 /* Start of PromJet */
|
||||
/*
|
||||
* This board doesn't have a promjet connector.
|
||||
* However, it uses commone corenet board LAW and TLB.
|
||||
* It is necessary to use the same start address with proper offset.
|
||||
*/
|
||||
#define CONFIG_SYS_FLASH_BASE 0xe0000000
|
||||
#ifdef CONFIG_PHYS_64BIT
|
||||
#define CONFIG_SYS_FLASH_BASE_PHYS 0xfe8000000ull
|
||||
#define CONFIG_SYS_FLASH_BASE_PHYS 0xfe0000000ull
|
||||
#else
|
||||
#define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_FLASH_BR_PRELIM \
|
||||
(BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | BR_PS_16 | BR_V)
|
||||
(BR_PHYS_ADDR((CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000)) | \
|
||||
BR_PS_16 | BR_V)
|
||||
#define CONFIG_SYS_FLASH_OR_PRELIM \
|
||||
((0xf8000ff7 & ~OR_GPCM_SCY & ~OR_GPCM_EHTR) \
|
||||
| OR_GPCM_SCY_8 | OR_GPCM_EHTR_CLEAR)
|
||||
@@ -294,7 +300,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
|
||||
|
||||
#define CONFIG_SYS_FLASH_EMPTY_INFO
|
||||
#define CONFIG_SYS_FLASH_AMD_CHECK_DQ7
|
||||
#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS}
|
||||
#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
|
||||
|
||||
#define CONFIG_BOARD_EARLY_INIT_F
|
||||
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
|
||||
@@ -539,7 +545,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xFFE00000
|
||||
#else
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEF000000
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEFF40000
|
||||
#endif
|
||||
#define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000
|
||||
#define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
|
||||
@@ -560,8 +566,10 @@ unsigned long get_board_sys_clk(unsigned long dummy);
|
||||
#endif /* CONFIG_PCI */
|
||||
|
||||
/* SATA */
|
||||
#define CONFIG_FSL_SATA_V2
|
||||
|
||||
#ifdef CONFIG_FSL_SATA_V2
|
||||
#define CONFIG_FSL_SATA
|
||||
#ifdef CONFIG_FSL_SATA
|
||||
#define CONFIG_LIBATA
|
||||
|
||||
#define CONFIG_SYS_SATA_MAX_DEVICE 2
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#define CONFIG_MMC
|
||||
#define CONFIG_NAND_FSL_ELBC
|
||||
#define CONFIG_FSL_SATA_V2
|
||||
#define CONFIG_PCIE3
|
||||
#define CONFIG_PCIE4
|
||||
#define CONFIG_SYS_DPAA_RMAN
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#define CONFIG_MMC
|
||||
#define CONFIG_NAND_FSL_ELBC
|
||||
#define CONFIG_FSL_SATA_V2
|
||||
#define CONFIG_PCIE3
|
||||
#define CONFIG_PCIE4
|
||||
#define CONFIG_SYS_FSL_RAID_ENGINE
|
||||
|
||||
40
include/configs/P5040DS.h
Normal file
40
include/configs/P5040DS.h
Normal file
@@ -0,0 +1,40 @@
|
||||
/*
|
||||
* Copyright 2009-2011 Freescale Semiconductor, Inc.
|
||||
*
|
||||
* See file CREDITS for list of people who contributed to this
|
||||
* project.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/*
|
||||
* P5040 DS board configuration file
|
||||
*
|
||||
*/
|
||||
#define CONFIG_P5040DS
|
||||
#define CONFIG_PHYS_64BIT
|
||||
#define CONFIG_PPC_P5040
|
||||
|
||||
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
|
||||
|
||||
#define CONFIG_MMC
|
||||
#define CONFIG_NAND_FSL_ELBC
|
||||
#define CONFIG_PCIE3
|
||||
#define CONFIG_SYS_FSL_RAID_ENGINE
|
||||
|
||||
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
|
||||
|
||||
#include "corenet_ds.h"
|
||||
@@ -549,7 +549,7 @@
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xFFE00000
|
||||
#else
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEF000000
|
||||
#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEFF40000
|
||||
#endif
|
||||
#define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000
|
||||
#define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
|
||||
|
||||
Reference in New Issue
Block a user