diff --git a/CHANGELOG b/CHANGELOG index 51c09eec2c53a4abb3a30477283bc623160bc26f..2d249623ccb6a32ef625d6b95a4684cec4822efa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Enable PCI on hmi1001 board + * Fix return values of the jffs2 commands ls/fsload/fsinfo, so we can use them to, e.g., check the existence of a file with "if ls foo; then this; else that; fi" in the hush shell diff --git a/board/hmi1001/hmi1001.c b/board/hmi1001/hmi1001.c index 898020908647eca661964dc64c6affd6f443b2d1..fca11d0e7cd6cb64ae50b99e0047addaff423fc0 100644 --- a/board/hmi1001/hmi1001.c +++ b/board/hmi1001/hmi1001.c @@ -170,3 +170,13 @@ int board_early_init_r (void) *(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(CFG_FLASH_BASE, CFG_FLASH_SIZE); return 0; } +#ifdef CONFIG_PCI +static struct pci_controller hose; + +extern void pci_mpc5xxx_init(struct pci_controller *); + +void pci_init_board(void) +{ + pci_mpc5xxx_init(&hose); +} +#endif diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 7f9fea513bb639a8c5a5bc823b30b0f20a9b8d6c..9da15ed982f8aa0a37f62a8157add8d06eb5de57 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -65,6 +65,7 @@ CFG_CMD_I2C | \ CFG_CMD_IDE | \ CFG_CMD_NFS | \ + CFG_CMD_PCI | \ CFG_CMD_SNTP) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ @@ -307,4 +308,21 @@ #define CONFIG_ATAPI 1 +/* + * PCI Mapping: + * 0x40000000 - 0x4fffffff - PCI Memory + * 0x50000000 - 0x50ffffff - PCI IO Space + */ +#define CONFIG_PCI 1 +#define CONFIG_PCI_PNP 1 +#define CONFIG_PCI_SCAN_SHOW 1 + +#define CONFIG_PCI_MEM_BUS 0x40000000 +#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS +#define CONFIG_PCI_MEM_SIZE 0x10000000 + +#define CONFIG_PCI_IO_BUS 0x50000000 +#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS +#define CONFIG_PCI_IO_SIZE 0x01000000 + #endif /* __CONFIG_H */