* Patch by Jon Loeliger, Kumar Gala 2005-02-08
- Convert the CPM2 based functionality to use new CONFIG_CPM2 option rather than a myriad of CONFIG_MPC8560-like variants. Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560. Eliminates the CONFIG_MPC8560 option entirely. Distributes the new CONFIG_CPM2 option to each 8260 board.
This commit is contained in:
parent
2d5df63e4f
commit
9c4c5ae3e1
@ -1,6 +1,12 @@
|
||||
======================================================================
|
||||
Changes for U-Boot 1.1.3:
|
||||
======================================================================
|
||||
* Patch by Jon Loeliger, Kumar Gala 2005-02-08
|
||||
- Convert the CPM2 based functionality to use new CONFIG_CPM2
|
||||
option rather than a myriad of CONFIG_MPC8560-like variants.
|
||||
Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560.
|
||||
Eliminates the CONFIG_MPC8560 option entirely. Distributes the
|
||||
new CONFIG_CPM2 option to each 8260 board.
|
||||
|
||||
* Patch by Jon Loeliger, 20 Jul 2005:
|
||||
Add missing PCI IO port definitions.
|
||||
|
@ -29,5 +29,4 @@
|
||||
TEXT_BASE = 0xfff80000
|
||||
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_E500=1
|
||||
|
@ -30,5 +30,4 @@
|
||||
TEXT_BASE = 0xfffc0000
|
||||
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_E500=1
|
||||
|
@ -29,5 +29,4 @@
|
||||
TEXT_BASE = 0xfff80000
|
||||
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_E500=1
|
||||
|
@ -68,13 +68,13 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
print_str ("pci_busfreq", strmhz(buf, bd->bi_pci_busfreq));
|
||||
#endif
|
||||
#else /* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_ML300 */
|
||||
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
print_str ("vco", strmhz(buf, bd->bi_vco));
|
||||
print_str ("sccfreq", strmhz(buf, bd->bi_sccfreq));
|
||||
print_str ("brgfreq", strmhz(buf, bd->bi_brgfreq));
|
||||
#endif
|
||||
print_str ("intfreq", strmhz(buf, bd->bi_intfreq));
|
||||
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
print_str ("cpmfreq", strmhz(buf, bd->bi_cpmfreq));
|
||||
#endif
|
||||
print_str ("busfreq", strmhz(buf, bd->bi_busfreq));
|
||||
|
@ -580,12 +580,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
||||
kbd->bi_flbfreq /= 1000000L;
|
||||
kbd->bi_vcofreq /= 1000000L;
|
||||
#endif
|
||||
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
kbd->bi_cpmfreq /= 1000000L;
|
||||
kbd->bi_brgfreq /= 1000000L;
|
||||
kbd->bi_sccfreq /= 1000000L;
|
||||
kbd->bi_vco /= 1000000L;
|
||||
#endif /* CONFIG_8260 */
|
||||
#endif
|
||||
#if defined(CONFIG_MPC5xxx)
|
||||
kbd->bi_ipbfreq /= 1000000L;
|
||||
kbd->bi_pcifreq /= 1000000L;
|
||||
|
@ -23,5 +23,5 @@
|
||||
|
||||
PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
|
||||
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_8260 -ffixed-r2 -ffixed-r29 \
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
|
||||
-mstring -mcpu=603e -mmultiple
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <common.h>
|
||||
#include <asm/cpm_85xx.h>
|
||||
|
||||
#if defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
/*
|
||||
* because we have stack and init data in dual port ram
|
||||
* we must reduce the size
|
||||
@ -211,4 +211,4 @@ ulong post_word_load (void)
|
||||
|
||||
#endif /* CONFIG_POST */
|
||||
|
||||
#endif /* CONFIG_MPC8560 */
|
||||
#endif /* CONFIG_CPM2 */
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include <ioports.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifdef CONFIG_MPC8560
|
||||
#ifdef CONFIG_CPM2
|
||||
static void config_8560_ioports (volatile immap_t * immr)
|
||||
{
|
||||
int portnum;
|
||||
@ -115,7 +115,7 @@ void cpu_init_f (void)
|
||||
memset ((void *) gd, 0, sizeof (gd_t));
|
||||
|
||||
|
||||
#ifdef CONFIG_MPC8560
|
||||
#ifdef CONFIG_CPM2
|
||||
config_8560_ioports(immap);
|
||||
#endif
|
||||
|
||||
@ -173,7 +173,7 @@ void cpu_init_f (void)
|
||||
memctl->br7 = CFG_BR7_PRELIM;
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
m8560_cpm_reset();
|
||||
#endif
|
||||
}
|
||||
|
@ -48,7 +48,7 @@
|
||||
#include <config.h>
|
||||
#include <net.h>
|
||||
|
||||
#if defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
|
||||
#if defined(CONFIG_ETHER_ON_FCC) && (CONFIG_COMMANDS & CFG_CMD_NET) && \
|
||||
defined(CONFIG_NET_MULTI)
|
||||
@ -458,4 +458,4 @@ int fec_initialize(bd_t *bis)
|
||||
|
||||
#endif /* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
|
||||
|
||||
#endif /* CONFIG_MPC8560 */
|
||||
#endif /* CONFIG_CPM2 */
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <common.h>
|
||||
#include <asm/cpm_85xx.h>
|
||||
|
||||
#if defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
#if defined(CONFIG_CONS_ON_SCC)
|
||||
|
||||
#if CONFIG_CONS_INDEX == 1 /* Console on SCC1 */
|
||||
@ -271,4 +271,4 @@ serial_tstc()
|
||||
|
||||
#endif /* CONFIG_CONS_ON_SCC */
|
||||
|
||||
#endif /* CONFIG_MPC8560 */
|
||||
#endif /* CONFIG_CPM2 */
|
||||
|
@ -82,7 +82,7 @@ int get_clocks (void)
|
||||
{
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
sys_info_t sys_info;
|
||||
#if defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||
uint sccr, dfbrg;
|
||||
|
||||
@ -94,7 +94,7 @@ int get_clocks (void)
|
||||
get_sys_info (&sys_info);
|
||||
gd->cpu_clk = sys_info.freqProcessor;
|
||||
gd->bus_clk = sys_info.freqSystemBus;
|
||||
#if defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
gd->vco_out = 2*sys_info.freqSystemBus;
|
||||
gd->cpm_clk = gd->vco_out / 2;
|
||||
gd->scc_clk = gd->vco_out / 4;
|
||||
|
@ -134,7 +134,6 @@ Updated 13-July-2004 Jon Loeliger
|
||||
CONFIG_E500 BOOKE e500 family(Motorola)
|
||||
CONFIG_MPC85xx MPC8540,MPC8560 and their derivatives
|
||||
CONFIG_MPC8540 MPC8540 specific
|
||||
CONFIG_MPC8560 MPC8560 specific
|
||||
CONFIG_MPC8540ADS MPC8540ADS board specific
|
||||
CONFIG_MPC8560ADS MPC8560ADS board specific
|
||||
CONFIG_TSEC_ENET Use on-chip 10/100/1000 ethernet for networking
|
||||
|
@ -39,7 +39,7 @@ typedef struct global_data {
|
||||
unsigned long baudrate;
|
||||
unsigned long cpu_clk; /* CPU clock in Hz! */
|
||||
unsigned long bus_clk;
|
||||
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
/* There are many clocks on the MPC8260 - see page 9-5 */
|
||||
unsigned long vco_out;
|
||||
unsigned long cpm_clk;
|
||||
@ -64,7 +64,7 @@ typedef struct global_data {
|
||||
unsigned long env_addr; /* Address of Environment struct */
|
||||
unsigned long env_valid; /* Checksum of Environment valid? */
|
||||
unsigned long have_console; /* serial_init() was called */
|
||||
#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_CPM2)
|
||||
unsigned int dp_alloc_base;
|
||||
unsigned int dp_alloc_top;
|
||||
#endif
|
||||
|
@ -1025,9 +1025,7 @@ typedef struct ccsr_pic {
|
||||
} ccsr_pic_t;
|
||||
|
||||
/* CPM Block(0x8_0000-0xc_0000) */
|
||||
#if defined(CONFIG_MPC8540) \
|
||||
|| defined(CONFIG_MPC8541) \
|
||||
|| defined(CONFIG_MPC8555)
|
||||
#ifndef CONFIG_CPM2
|
||||
typedef struct ccsr_cpm {
|
||||
char res[262144];
|
||||
} ccsr_cpm_t;
|
||||
|
@ -59,7 +59,7 @@ typedef struct bd_info {
|
||||
unsigned short bi_ethspeed; /* Ethernet speed in Mbps */
|
||||
unsigned long bi_intfreq; /* Internal Freq, in MHz */
|
||||
unsigned long bi_busfreq; /* Bus Freq, in MHz */
|
||||
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
unsigned long bi_cpmfreq; /* CPM_CLK Freq, in MHz */
|
||||
unsigned long bi_brgfreq; /* BRG_CLK Freq, in MHz */
|
||||
unsigned long bi_sccfreq; /* SCC_CLK Freq, in MHz */
|
||||
|
@ -35,6 +35,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_CPU86 1 /* ...on a CPU86 board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
@ -36,6 +36,7 @@
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_CPU87 1 /* ...on a CPU87 board */
|
||||
#define CONFIG_PCI
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
@ -37,6 +37,7 @@
|
||||
#define CONFIG_MPC8272_FAMILY 1
|
||||
#define CONFIG_IDS8247 1
|
||||
#define CPU_ID_STR "MPC8247"
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||
|
||||
|
@ -40,6 +40,8 @@
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_IPHASE4539 1 /* ...on a Interphase 4539 PMC */
|
||||
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* select serial console configuration
|
||||
*
|
||||
|
@ -31,6 +31,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_ISPAN /* ...on one of Interphase iSPAN boards */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Select serial console configuration
|
||||
|
@ -42,6 +42,8 @@
|
||||
|
||||
#define CONFIG_MPC8260ADS 1 /* Motorola PQ2 ADS family board */
|
||||
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/*
|
||||
* Figure out if we are booting low via flash HRCW or high via the BCSR.
|
||||
*/
|
||||
|
@ -51,6 +51,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_MPC8266ADS 1 /* ...on motorola ADS board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
|
||||
|
||||
|
@ -33,6 +33,7 @@
|
||||
#define CONFIG_BOOKE 1 /* BOOKE */
|
||||
#define CONFIG_E500 1 /* BOOKE e500 family */
|
||||
#define CONFIG_MPC85xx 1 /* MPC8540/60/55/41 */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
#define CONFIG_MPC8541 1 /* MPC8541 specific */
|
||||
#define CONFIG_MPC8541CDS 1 /* MPC8541CDS board specific */
|
||||
|
||||
|
@ -33,6 +33,7 @@
|
||||
#define CONFIG_BOOKE 1 /* BOOKE */
|
||||
#define CONFIG_E500 1 /* BOOKE e500 family */
|
||||
#define CONFIG_MPC85xx 1 /* MPC8540/60/55/41 */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
#define CONFIG_MPC8555 1 /* MPC8555 specific */
|
||||
#define CONFIG_MPC8555CDS 1 /* MPC8555CDS board specific */
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
#define CONFIG_BOOKE 1 /* BOOKE */
|
||||
#define CONFIG_E500 1 /* BOOKE e500 family */
|
||||
#define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */
|
||||
#define CONFIG_MPC8560 1 /* MPC8560 specific */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
#define CONFIG_MPC8560ADS 1 /* MPC8560ADS board specific */
|
||||
|
||||
#define CONFIG_PCI
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is a MPC8260 CPU */
|
||||
#define CONFIG_PM826 1 /* ...on a PM8260 module */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */
|
||||
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is a MPC8260 CPU */
|
||||
#define CONFIG_PM828 1 /* ...on a PM828 module */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */
|
||||
|
||||
|
@ -173,6 +173,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_RPXSUPER 1 /* on an Embedded Planet RPX Super Board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
|
||||
|
||||
|
@ -33,6 +33,8 @@
|
||||
#define CPU_ID_STR "MPC8250"
|
||||
#endif /* CONFIG_MPC8248 */
|
||||
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_RATTLER /* Analogue&Micro Rattler board */
|
||||
|
||||
#undef DEBUG
|
||||
|
@ -46,7 +46,7 @@
|
||||
#define CONFIG_MPC85xx_REV1 1 /* MPC85xx Rev 1.0 chip */
|
||||
|
||||
|
||||
#define CONFIG_MPC8560 1 /* MPC8560 (CPU) specific */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
|
||||
#define CONFIG_SBC8540 1 /* configuration for SBC8560 board */
|
||||
|
||||
|
@ -46,7 +46,7 @@
|
||||
#define CONFIG_MPC85xx_REV1 1 /* MPC85xx Rev 1.0 chip */
|
||||
|
||||
|
||||
#define CONFIG_MPC8560 1 /* MPC8560 (CPU) specific */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
#define CONFIG_SBC8560 1 /* configuration for SBC8560 board */
|
||||
|
||||
#define CONFIG_MPC8560ADS 1 /* MPC8560ADS board specific (supplement) */
|
||||
|
@ -36,6 +36,7 @@
|
||||
#define CONFIG_MPC8260 1 /* This is a MPC8260 CPU */
|
||||
#define CONFIG_TQM8260 200 /* ...on a TQM8260 module Rev.200 */
|
||||
#define CONFIG_SCM 1 /* ...on a System Controller Module */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#if (CONFIG_TQM8260 <= 100)
|
||||
# error "TQM8260 module revison not supported"
|
||||
|
@ -52,6 +52,8 @@
|
||||
#define CONFIG_TQM8260 200 /* ...on a TQM8260 module Rev.200 */
|
||||
#endif
|
||||
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_82xx_CONS_SMC1 1 /* console on SMC1 */
|
||||
|
||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||
|
@ -30,6 +30,7 @@
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_ZPC1900 1 /* ...on Zephyr ZPC.1900 board */
|
||||
#define CPU_ID_STR "MPC8265"
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
|
@ -35,6 +35,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_ATC 1 /* ...on a ATC board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
@ -35,6 +35,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_COGENT 1 /* using Cogent Modular Architecture */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
|
||||
|
||||
|
@ -48,6 +48,8 @@
|
||||
#define CFG_EP8260_H2 1
|
||||
/* #undef CFG_EP8260_H2 */
|
||||
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/* What is the oscillator's (UX2) frequency in Hz? */
|
||||
#define CONFIG_8260_CLKIN (66 * 1000 * 1000)
|
||||
|
||||
|
@ -330,6 +330,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_GW8260 1 /* on an GW8260 Board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
@ -35,6 +35,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_HYMOD 1 /* ...on a Hymod board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
|
||||
|
||||
|
@ -297,6 +297,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_PPMC8260 1 /* on an Wind River PPMC8260 Board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_RSD_PROTO 1 /* on a R&S Protocol Board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
|
||||
|
||||
|
@ -544,6 +544,7 @@
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_SBC8260 1 /* on an EST SBC8260 Board */
|
||||
#define CONFIG_SACSng 1 /* munged for the SACSng */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
@ -481,6 +481,7 @@
|
||||
|
||||
#define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */
|
||||
#define CONFIG_SBC8260 1 /* on an EST SBC8260 Board */
|
||||
#define CONFIG_CPM2 1 /* Has a CPM2 */
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
@ -40,7 +40,7 @@
|
||||
#define CONFIG_MPC85xx_REV1 1 /* MPC85xx Rev 1.0 chip */
|
||||
|
||||
|
||||
#define CONFIG_MPC8560 1 /* MPC8560 specific */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
#define CONFIG_SBC8560 1 /* configuration for SBC8560 board */
|
||||
|
||||
/* XXX flagging this as something I might want to delete */
|
||||
|
@ -39,7 +39,7 @@
|
||||
#define CONFIG_BOOKE 1 /* BOOKE */
|
||||
#define CONFIG_E500 1 /* BOOKE e500 family */
|
||||
#define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */
|
||||
#define CONFIG_MPC8560 1 /* MPC8560 specific */
|
||||
#define CONFIG_CPM2 1 /* has CPM2 */
|
||||
#define CONFIG_STXGP3 1 /* Silicon Tx GPPP board specific*/
|
||||
|
||||
#undef CONFIG_PCI /* pci ethernet support */
|
||||
|
@ -25,7 +25,7 @@ typedef struct {
|
||||
* the internal memory map aligns the above structure on
|
||||
* a 0x20 byte boundary
|
||||
*/
|
||||
#ifdef CONFIG_MPC8560
|
||||
#ifdef CONFIG_MPC85xx
|
||||
#define ioport_addr(im, idx) (ioport_t *)((uint)&((im)->im_cpm.im_cpm_iop) + ((idx)*0x20))
|
||||
#else
|
||||
#define ioport_addr(im, idx) (ioport_t *)((uint)&(im)->im_ioport + ((idx)*0x20))
|
||||
|
@ -29,7 +29,7 @@
|
||||
# endif
|
||||
#endif /* CONFIG_MPC5xxx */
|
||||
|
||||
#if !defined(CONFIG_NET_MULTI) && (defined(CONFIG_8260) || defined(CONFIG_MPC8560))
|
||||
#if !defined(CONFIG_NET_MULTI) && defined(CONFIG_CPM2)
|
||||
#include <config.h>
|
||||
#if defined(CONFIG_ETHER_ON_FCC)
|
||||
#if defined(CONFIG_ETHER_ON_SCC)
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include <net.h>
|
||||
#include <serial.h>
|
||||
#ifdef CFG_ALLOC_DPRAM
|
||||
#if !(defined(CONFIG_8260)||defined(CONFIG_MPC8560))
|
||||
#if !defined(CONFIG_CPM2)
|
||||
#include <commproc.h>
|
||||
#endif
|
||||
#endif
|
||||
@ -272,7 +272,7 @@ init_fnc_t *init_sequence[] = {
|
||||
init_timebase,
|
||||
#endif
|
||||
#ifdef CFG_ALLOC_DPRAM
|
||||
#if !(defined(CONFIG_8260) || defined(CONFIG_MPC8560))
|
||||
#if !defined(CONFIG_CPM2)
|
||||
dpram_init,
|
||||
#endif
|
||||
#endif
|
||||
@ -360,7 +360,7 @@ void board_init_f (ulong bootflag)
|
||||
/* compiler optimization barrier needed for GCC >= 3.4 */
|
||||
__asm__ __volatile__("": : :"memory");
|
||||
|
||||
#if !(defined(CONFIG_8260) || defined(CONFIG_MPC8560))
|
||||
#if !defined(CONFIG_CPM2)
|
||||
/* Clear initial global data */
|
||||
memset ((void *) gd, 0, sizeof (gd_t));
|
||||
#endif
|
||||
@ -521,12 +521,12 @@ void board_init_f (ulong bootflag)
|
||||
WATCHDOG_RESET ();
|
||||
bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */
|
||||
bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */
|
||||
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
|
||||
#if defined(CONFIG_CPM2)
|
||||
bd->bi_cpmfreq = gd->cpm_clk;
|
||||
bd->bi_brgfreq = gd->brg_clk;
|
||||
bd->bi_sccfreq = gd->scc_clk;
|
||||
bd->bi_vco = gd->vco_out;
|
||||
#endif /* CONFIG_8260 */
|
||||
#endif /* CONFIG_CPM2 */
|
||||
#if defined(CONFIG_MPC5xxx)
|
||||
bd->bi_ipbfreq = gd->ipb_clk;
|
||||
bd->bi_pcifreq = gd->pci_clk;
|
||||
|
Loading…
Reference in New Issue
Block a user