Added VIA configuration table, Added support for PCI2 on CDS
PATCH 9/11 Added VIA configuration table, Added support for PCI2 on CDS
* Added VIA configuration table
* Added support for PCI2 on CDS
Patch by Andy Fleming 17-Mar-2006
Signed-off-by Andy Fleming <[email protected]>
Signed-off-by Matthew McClintock <[email protected]>
--- board/cds/common/ft_board.c | 3 + board/cds/common/via.c | 99 +++++++++++++++++++++++++++++++++++++ board/cds/common/via.h | 18 +++++++ board/cds/mpc8541cds/Makefile | 3 + board/cds/mpc8541cds/init.S | 12 ++-- board/cds/mpc8541cds/mpc8541cds.c | 32 ++++++------ board/cds/mpc8548cds/Makefile | 3 + board/cds/mpc8548cds/init.S | 12 ++-- board/cds/mpc8548cds/mpc8548cds.c | 32 ++++++------ board/cds/mpc8555cds/Makefile | 3 + board/cds/mpc8555cds/init.S | 12 ++-- board/cds/mpc8555cds/mpc8555cds.c | 39 ++++++++------- include/configs/MPC8541CDS.h | 21 +++----- include/configs/MPC8548CDS.h | 23 +++------ include/configs/MPC8555CDS.h | 23 +++------ 15 files changed, 223 insertions(+), 112 deletions(-)
board/cds/common/ft_board.c +3 -0
@@ -35,6 +35,9 @@ ft_board_setup(void *blob, bd_t *bd)u32 *p;int len; +#ifdef CONFIG_PCI +ft_pci_setup (blob, bd); +#endif ft_cpu_setup (blob, bd); p =ft_get_prop (blob,"/memory/reg" , &len);
board/cds/common/via.c new file +99 -0
99 lines not on this page · raw message
board/cds/common/via.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef _MPC85xx_VIA_H +void mpc85xx_config_via (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab); + +/* Function 1, IDE */ +void mpc85xx_config_via_usbide (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab); + +/* Function 2, USB ports 0-1 */ +void mpc85xx_config_via_usb (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab); + +/* Function 3, USB ports 2-3 */ +void mpc85xx_config_via_usb2 (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab); + +/* Function 5, Power Management */ +void mpc85xx_config_via_power (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab); + +/* Function 6, AC97 Interface */ +void mpc85xx_config_via_ac97 (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab); +#endif /* _MPC85xx_VIA_H */
board/cds/mpc8541cds/Makefile +2 -1
@@ -29,7 +29,8 @@ LIB = lib$(BOARD).a OBJS := $(BOARD).o \ ../common/cadmus.o \ ../common/eeprom.o \ - ../common/ft_board.o + ../common/ft_board.o \ + ../common/via.o SOBJS := init.o
board/cds/mpc8541cds/init.S +6 -6
@@ -210,8 +210,8 @@ #endif * 0x8000_0000 0x9fff_ffff PCI1 MEM 512M * 0xa000_0000 0xbfff_ffff PCI2 MEM 512M * 0xe000_0000 0xe000_ffff CCSR 1M - * 0xe200_0000 0xe2ff_ffff PCI1 IO 16M - * 0xe300_0000 0xe3ff_ffff PCI2 IO 16M + * 0xe200_0000 0xe20f_ffff PCI1 IO 1M + * 0xe210_0000 0xe21f_ffff PCI2 IO 1M * 0xf000_0000 0xf7ff_ffff SDRAM 128M * 0xf800_0000 0xf80f_ffff NVRAM/CADMUS (*) 1M * 0xff00_0000 0xff7f_ffff FLASH (2nd bank) 8M
@@ -234,11 +234,11 @@ #define LAWAR1 (LAWAR_EN | LAWAR_TRGT_I #define LAWBAR2 ((CFG_PCI2_MEM_BASE>>12) & 0xfffff) #define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_512M)) -#define LAWBAR3 ((CFG_PCI1_IO_BASE>>12) & 0xfffff) -#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_16M)) +#define LAWBAR3 ((CFG_PCI1_IO_PHYS>>12) & 0xfffff) +#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_1M)) -#define LAWBAR4 ((CFG_PCI2_IO_BASE>>12) & 0xfffff) -#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_16M)) +#define LAWBAR4 ((CFG_PCI2_IO_PHYS>>12) & 0xfffff) +#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_1M)) /* LBC window - maps 256M 0xf0000000 -> 0xffffffff */ #define LAWBAR5 ((CFG_LBC_SDRAM_BASE>>12) & 0xfffff)
board/cds/mpc8541cds/mpc8541cds.c +16 -16
@@ -31,6 +31,7 @@ #include <spd.h>#include "../common/cadmus.h" #include "../common/eeprom.h" +#include "../common/via.h" #if defined(CONFIG_DDR_ECC ) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER )extern void ddr_enable_ecc (unsigned int dram_size);
@@ -468,26 +469,25 @@ testdram(void)#endif #if defined(CONFIG_PCI ) - -/* -* Initialize PCI Devices, report devices found. +/* For some reason the Tundra PCI bridge shows up on itself as a +* different device. Work around that by refusing to configure it. */ +void dummy_func (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab) { } -#ifndef CONFIG_PCI_PNP static struct pci_config_table pci_mpc85xxcds_config_table[] = { - {PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID , -PCI_IDSEL_NUMBER ,PCI_ANY_ID , - pci_cfgfunc_config_device, {PCI_ENET0_IOADDR , -PCI_ENET0_MEMADDR , -PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER - } }, - { } + {0x10e3 ,0x0513 ,PCI_ANY_ID ,1 ,3 ,PCI_ANY_ID , dummy_func, {0 ,0 ,0 }}, + {0x1106 ,0x0686 ,PCI_ANY_ID ,1 ,2 ,0 , mpc85xx_config_via, {0 ,0 ,0 }}, + {0x1106 ,0x0571 ,PCI_ANY_ID ,1 ,2 ,1 , mpc85xx_config_via_usbide, {0 ,0 ,0 }}, + {0x1105 ,0x3038 ,PCI_ANY_ID ,1 ,2 ,2 , mpc85xx_config_via_usb, {0 ,0 ,0 }}, + {0x1106 ,0x3038 ,PCI_ANY_ID ,1 ,2 ,3 , mpc85xx_config_via_usb2, {0 ,0 ,0 }}, + {0x1106 ,0x3058 ,PCI_ANY_ID ,1 ,2 ,5 , mpc85xx_config_via_power, {0 ,0 ,0 }}, + {0x1106 ,0x3068 ,PCI_ANY_ID ,1 ,2 ,6 , mpc85xx_config_via_ac97, {0 ,0 ,0 }} }; -#endif -static struct pci_controller hose = { -#ifndef CONFIG_PCI_PNP - config_table: pci_mpc85xxcds_config_table, +static struct pci_controller hose[] = { + { config_table: pci_mpc85xxcds_config_table,}, +#ifdef CONFIG_MPC85XX_PCI2 + {}, #endif };
@@ -497,7 +497,7 @@ voidpci_init_board (void) {#ifdef CONFIG_PCI -extern void pci_mpc85xx_init (struct pci_controller *hose); +extern void pci_mpc85xx_init (struct pci_controller **hose);pci_mpc85xx_init (&hose);#endif
board/cds/mpc8548cds/Makefile +2 -1
@@ -29,7 +29,8 @@ LIB = lib$(BOARD).a OBJS := $(BOARD).o \ ../common/cadmus.o \ ../common/eeprom.o \ - ../common/ft_board.o + ../common/ft_board.o \ + ../common/via.o SOBJS := init.o
board/cds/mpc8548cds/init.S +6 -6
@@ -210,8 +210,8 @@ #endif * 0x8000_0000 0x9fff_ffff PCI1 MEM 512M * 0xa000_0000 0xbfff_ffff PCI2 MEM 512M * 0xe000_0000 0xe000_ffff CCSR 1M - * 0xe200_0000 0xe2ff_ffff PCI1 IO 16M - * 0xe300_0000 0xe3ff_ffff PCI2 IO 16M + * 0xe200_0000 0xe20f_ffff PCI1 IO 1M + * 0xe210_0000 0xe21f_ffff PCI2 IO 1M * 0xf000_0000 0xf7ff_ffff SDRAM 128M * 0xf800_0000 0xf80f_ffff NVRAM/CADMUS (*) 1M * 0xff00_0000 0xff7f_ffff FLASH (2nd bank) 8M
@@ -234,11 +234,11 @@ #define LAWAR1 (LAWAR_EN | LAWAR_TRGT_I #define LAWBAR2 ((CFG_PCI2_MEM_BASE>>12) & 0xfffff) #define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_512M)) -#define LAWBAR3 ((CFG_PCI1_IO_BASE>>12) & 0xfffff) -#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_16M)) +#define LAWBAR3 ((CFG_PCI1_IO_PHYS>>12) & 0xfffff) +#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_1M)) -#define LAWBAR4 ((CFG_PCI2_IO_BASE>>12) & 0xfffff) -#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_16M)) +#define LAWBAR4 ((CFG_PCI2_IO_PHYS>>12) & 0xfffff) +#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_1M)) /* LBC window - maps 256M 0xf0000000 -> 0xffffffff */ #define LAWBAR5 ((CFG_LBC_SDRAM_BASE>>12) & 0xfffff)
board/cds/mpc8548cds/mpc8548cds.c +16 -16
@@ -30,6 +30,7 @@ #include <spd.h>#include "../common/cadmus.h" #include "../common/eeprom.h" +#include "../common/via.h" #if defined(CONFIG_DDR_ECC ) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER )extern void ddr_enable_ecc (unsigned int dram_size);
@@ -293,26 +294,25 @@ testdram(void)#endif #if defined(CONFIG_PCI ) - -/* -* Initialize PCI Devices, report devices found. +/* For some reason the Tundra PCI bridge shows up on itself as a +* different device. Work around that by refusing to configure it. */ +void dummy_func (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab) { } -#ifndef CONFIG_PCI_PNP static struct pci_config_table pci_mpc85xxcds_config_table[] = { - {PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID , -PCI_IDSEL_NUMBER ,PCI_ANY_ID , - pci_cfgfunc_config_device, {PCI_ENET0_IOADDR , -PCI_ENET0_MEMADDR , -PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER - } }, - { } + {0x10e3 ,0x0513 ,PCI_ANY_ID ,1 ,3 ,PCI_ANY_ID , dummy_func, {0 ,0 ,0 }}, + {0x1106 ,0x0686 ,PCI_ANY_ID ,1 ,2 ,0 , mpc85xx_config_via, {0 ,0 ,0 }}, + {0x1106 ,0x0571 ,PCI_ANY_ID ,1 ,2 ,1 , mpc85xx_config_via_usbide, {0 ,0 ,0 }}, + {0x1105 ,0x3038 ,PCI_ANY_ID ,1 ,2 ,2 , mpc85xx_config_via_usb, {0 ,0 ,0 }}, + {0x1106 ,0x3038 ,PCI_ANY_ID ,1 ,2 ,3 , mpc85xx_config_via_usb2, {0 ,0 ,0 }}, + {0x1106 ,0x3058 ,PCI_ANY_ID ,1 ,2 ,5 , mpc85xx_config_via_power, {0 ,0 ,0 }}, + {0x1106 ,0x3068 ,PCI_ANY_ID ,1 ,2 ,6 , mpc85xx_config_via_ac97, {0 ,0 ,0 }} }; -#endif -static struct pci_controller hose = { -#ifndef CONFIG_PCI_PNP - config_table: pci_mpc85xxcds_config_table, +static struct pci_controller hose[] = { + { config_table: pci_mpc85xxcds_config_table,}, +#ifdef CONFIG_MPC85XX_PCI2 + {}, #endif };
@@ -322,7 +322,7 @@ voidpci_init_board (void) {#ifdef CONFIG_PCI -extern void pci_mpc85xx_init (struct pci_controller *hose); +extern void pci_mpc85xx_init (struct pci_controller **hose);pci_mpc85xx_init (&hose);#endif
board/cds/mpc8555cds/Makefile +2 -1
@@ -29,7 +29,8 @@ LIB = lib$(BOARD).a OBJS := $(BOARD).o \ ../common/cadmus.o \ ../common/eeprom.o \ - ../common/ft_board.o + ../common/ft_board.o \ + ../common/via.o SOBJS := init.o
board/cds/mpc8555cds/init.S +6 -6
@@ -210,8 +210,8 @@ #endif * 0x8000_0000 0x9fff_ffff PCI1 MEM 512M * 0xa000_0000 0xbfff_ffff PCI2 MEM 512M * 0xe000_0000 0xe000_ffff CCSR 1M - * 0xe200_0000 0xe2ff_ffff PCI1 IO 16M - * 0xe300_0000 0xe3ff_ffff PCI2 IO 16M + * 0xe200_0000 0xe20f_ffff PCI1 IO 1M + * 0xe210_0000 0xe21f_ffff PCI2 IO 1M * 0xf000_0000 0xf7ff_ffff SDRAM 128M * 0xf800_0000 0xf80f_ffff NVRAM/CADMUS (*) 1M * 0xff00_0000 0xff7f_ffff FLASH (2nd bank) 8M
@@ -234,11 +234,11 @@ #define LAWAR1 (LAWAR_EN | LAWAR_TRGT_I #define LAWBAR2 ((CFG_PCI2_MEM_BASE>>12) & 0xfffff) #define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_512M)) -#define LAWBAR3 ((CFG_PCI1_IO_BASE>>12) & 0xfffff) -#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_16M)) +#define LAWBAR3 ((CFG_PCI1_IO_PHYS>>12) & 0xfffff) +#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_1M)) -#define LAWBAR4 ((CFG_PCI2_IO_BASE>>12) & 0xfffff) -#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_16M)) +#define LAWBAR4 ((CFG_PCI2_IO_PHYS>>12) & 0xfffff) +#define LAWAR4 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_1M)) /* LBC window - maps 256M 0xf0000000 -> 0xffffffff */ #define LAWBAR5 ((CFG_LBC_SDRAM_BASE>>12) & 0xfffff)
board/cds/mpc8555cds/mpc8555cds.c +21 -18
@@ -29,6 +29,7 @@ #include <spd.h>#include "../common/cadmus.h" #include "../common/eeprom.h" +#include "../common/via.h" #if defined(CONFIG_DDR_ECC ) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER )extern void ddr_enable_ecc (unsigned int dram_size);
@@ -464,38 +465,40 @@ testdram(void) }#endif -#if defined(CONFIG_PCI ) - -/* -* Initialize PCI Devices, report devices found. +#ifdef CONFIG_PCI +/* For some reason the Tundra PCI bridge shows up on itself as a +* different device. Work around that by refusing to configure it */ +void dummy_func (struct pci_controller * hose,pci_dev_t dev,struct pci_config_table *tab) { } -#ifndef CONFIG_PCI_PNP static struct pci_config_table pci_mpc85xxcds_config_table[] = { - {PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_ANY_ID , -PCI_IDSEL_NUMBER ,PCI_ANY_ID , - pci_cfgfunc_config_device, {PCI_ENET0_IOADDR , -PCI_ENET0_MEMADDR , -PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER - } }, - { } + {0x10e3 ,0x0513 ,PCI_ANY_ID ,1 ,3 ,PCI_ANY_ID , dummy_func, {0 ,0 ,0 }}, + {0x1106 ,0x0686 ,PCI_ANY_ID ,1 ,2 ,0 , mpc85xx_config_via, {0 ,0 ,0 }}, + {0x1106 ,0x0571 ,PCI_ANY_ID ,1 ,2 ,1 , mpc85xx_config_via_usbide, {0 ,0 ,0 }}, + {0x1105 ,0x3038 ,PCI_ANY_ID ,1 ,2 ,2 , mpc85xx_config_via_usb, {0 ,0 ,0 }}, + {0x1106 ,0x3038 ,PCI_ANY_ID ,1 ,2 ,3 , mpc85xx_config_via_usb2, {0 ,0 ,0 }}, + {0x1106 ,0x3058 ,PCI_ANY_ID ,1 ,2 ,5 , mpc85xx_config_via_power, {0 ,0 ,0 }}, + {0x1106 ,0x3068 ,PCI_ANY_ID ,1 ,2 ,6 , mpc85xx_config_via_ac97, {0 ,0 ,0 }} }; -#endif -static struct pci_controller hose = { -#ifndef CONFIG_PCI_PNP + +static struct pci_controller hose[] = { + { config_table: pci_mpc85xxcds_config_table, + }, +#ifdef CONFIG_MPC85XX_PCI2 + { } #endif }; -#endif /* CONFIG_PCI */ +#endif void pci_init_board (void ) {#ifdef CONFIG_PCI -extern void pci_mpc85xx_init (struct pci_controller *hose); +extern void pci_mpc85xx_init (struct pci_controller **hose); -pci_mpc85xx_init (&hose); +pci_mpc85xx_init (*pci_hose);#endif }
include/configs/MPC8541CDS.h +8 -13
@@ -318,7 +318,7 @@ #define OF_FLAT_TREE_MAX_SIZE 8192#define OF_CPU "PowerPC,8541 at 0"#define OF_SOC "soc8541 at e0000000"#define OF_TBCLK (bd->bi_busfreq / 8) -#define OF_STDOUT_PATH "/soc8541 at e0000000/serial at 4500" +#define OF_STDOUT_PATH "/soc8541 at e0000000/serial at 4600"/* I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */
@@ -335,32 +335,27 @@ #define CFG_I2C_NOPROBES {0x69} /#define CFG_PCI1_MEM_BASE 0x80000000#define CFG_PCI1_MEM_PHYS CFG_PCI1_MEM_BASE#define CFG_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI1_IO_BASE 0xe2000000 -#define CFG_PCI1_IO_PHYS CFG_PCI1_IO_BASE -#define CFG_PCI1_IO_SIZE 0x1000000/* 16M */ +#define CFG_PCI1_IO_BASE 0x00000000 +#define CFG_PCI1_IO_PHYS 0xe2000000 +#define CFG_PCI1_IO_SIZE 0x100000/* 1M */ #define CFG_PCI2_MEM_BASE 0xa0000000#define CFG_PCI2_MEM_PHYS CFG_PCI2_MEM_BASE#define CFG_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI2_IO_BASE 0xe3000000 -#define CFG_PCI2_IO_PHYS CFG_PCI2_IO_BASE -#define CFG_PCI2_IO_SIZE 0x1000000/* 16M */ +#define CFG_PCI2_IO_BASE 0x00000000 +#define CFG_PCI2_IO_PHYS 0xe2100000 +#define CFG_PCI2_IO_SIZE 0x100000/* 1M */ #if defined(CONFIG_PCI ) +#define CONFIG_MPC85XX_PCI2 #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ #undef CONFIG_EEPRO100#undef CONFIG_TULIP -#if !defined(CONFIG_PCI_PNP ) -#define PCI_ENET0_IOADDR 0xe0000000 -#define PCI_ENET0_MEMADDR 0xe0000000 -#define PCI_IDSEL_NUMBER 0x0c/*slot0->3(IDSEL)=12->15*/ -#endif -#undef CONFIG_PCI_SCAN_SHOW/* show pci devices on startup */ #define CFG_PCI_SUBSYS_VENDORID 0x1057/* Motorola */
include/configs/MPC8548CDS.h +9 -14
@@ -324,7 +324,7 @@ #define OF_FLAT_TREE_MAX_SIZE 8192#define OF_CPU "PowerPC,8548 at 0"#define OF_SOC "soc8548 at e0000000"#define OF_TBCLK (bd->bi_busfreq / 8) -#define OF_STDOUT_PATH "/soc8548 at e0000000/serial at 4500" +#define OF_STDOUT_PATH "/soc8548 at e0000000/serial at 4600"/* I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */
@@ -341,32 +341,27 @@ #define CFG_I2C_NOPROBES {0x69} /#define CFG_PCI1_MEM_BASE 0x80000000#define CFG_PCI1_MEM_PHYS CFG_PCI1_MEM_BASE#define CFG_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI1_IO_BASE 0xe2000000 -#define CFG_PCI1_IO_PHYS CFG_PCI1_IO_BASE -#define CFG_PCI1_IO_SIZE 0x1000000/* 16M */ +#define CFG_PCI1_IO_BASE 0x00000000 +#define CFG_PCI1_IO_PHYS 0xe2000000 +#define CFG_PCI1_IO_SIZE 0x00100000/* 1M */ #define CFG_PCI2_MEM_BASE 0xa0000000#define CFG_PCI2_MEM_PHYS CFG_PCI2_MEM_BASE#define CFG_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI2_IO_BASE 0xe3000000 -#define CFG_PCI2_IO_PHYS CFG_PCI2_IO_BASE -#define CFG_PCI2_IO_SIZE 0x1000000/* 16M */ +#define CFG_PCI2_IO_BASE 0x00000000 +#define CFG_PCI2_IO_PHYS 0xe2100000 +#define CFG_PCI2_IO_SIZE 0x00100000/* 1M */ #if defined(CONFIG_PCI )#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ +#define CONFIG_85XX_PCI2 #undef CONFIG_EEPRO100#undef CONFIG_TULIP -#if !defined(CONFIG_PCI_PNP ) -#define PCI_ENET0_IOADDR 0xe0000000 -#define PCI_ENET0_MEMADDR 0xe0000000 -#define PCI_IDSEL_NUMBER 0x0c/*slot0->3(IDSEL)=12->15*/ -#endif -#undef CONFIG_PCI_SCAN_SHOW/* show pci devices on startup */ #define CFG_PCI_SUBSYS_VENDORID 0x1057/* Motorola */
@@ -386,7 +381,7 @@ #define CONFIG_MPC85XX_TSEC2 1#define CONFIG_MPC85XX_TSEC2_NAME "eTSEC1"#define CONFIG_MPC85XX_TSEC3 1#define CONFIG_MPC85XX_TSEC3_NAME "eTSEC2" -#define CONFIG_MPC85XX_TSEC4 1 +#undef CONFIG_MPC85XX_TSEC4#define CONFIG_MPC85XX_TSEC4_NAME "eTSEC3"#undef CONFIG_MPC85XX_FEC
include/configs/MPC8555CDS.h +9 -14
@@ -318,7 +318,7 @@ #define OF_FLAT_TREE_MAX_SIZE 8192#define OF_CPU "PowerPC,8555 at 0"#define OF_SOC "soc8555 at e0000000"#define OF_TBCLK (bd->bi_busfreq / 8) -#define OF_STDOUT_PATH "/soc8555 at e0000000/serial at 4500" +#define OF_STDOUT_PATH "/soc8555 at e0000000/serial at 4600"/* I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */
@@ -335,33 +335,28 @@ #define CFG_I2C_NOPROBES {0x69} /#define CFG_PCI1_MEM_BASE 0x80000000#define CFG_PCI1_MEM_PHYS CFG_PCI1_MEM_BASE#define CFG_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI1_IO_BASE 0xe2000000 -#define CFG_PCI1_IO_PHYS CFG_PCI1_IO_BASE -#define CFG_PCI1_IO_SIZE 0x1000000/* 16M */ +#define CFG_PCI1_IO_BASE 0x00000000 +#define CFG_PCI1_IO_PHYS 0xe2000000 +#define CFG_PCI1_IO_SIZE 0x00100000/* 1M */ #define CFG_PCI2_MEM_BASE 0xa0000000#define CFG_PCI2_MEM_PHYS CFG_PCI2_MEM_BASE#define CFG_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CFG_PCI2_IO_BASE 0xe3000000 -#define CFG_PCI2_IO_PHYS CFG_PCI2_IO_BASE -#define CFG_PCI2_IO_SIZE 0x1000000/* 16M */ +#define CFG_PCI2_IO_BASE 0x00000000 +#define CFG_PCI2_IO_PHYS 0xe2100000 +#define CFG_PCI2_IO_SIZE 0x00100000/* 1M */ #if defined(CONFIG_PCI )#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ +#define CONFIG_MPC85XX_PCI2 #undef CONFIG_EEPRO100#undef CONFIG_TULIP -#if !defined(CONFIG_PCI_PNP ) -#define PCI_ENET0_IOADDR 0xe0000000 -#define PCI_ENET0_MEMADDR 0xe0000000 -#define PCI_IDSEL_NUMBER 0x0c/*slot0->3(IDSEL)=12->15*/ -#endif - -#undef CONFIG_PCI_SCAN_SHOW/* show pci devices on startup */ +#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CFG_PCI_SUBSYS_VENDORID 0x1057/* Motorola */ #endif /* CONFIG_PCI */
Signature · 1 line
2006_06_07.01.gittree_pull-dirty