X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fbmw%2Fbmw.c;h=4039145e438db45be7c6951c4155f990fdd80de2;hb=3f390e15a719900b5e51f13b262ddb2e67349bc2;hp=25a710f436f6c972f85f38e1a1e7554de7f13315;hpb=f8cac651b33efa270e4dfa1292d01a3b5d7a62cf;p=u-boot diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c index 25a710f436..4039145e43 100644 --- a/board/bmw/bmw.c +++ b/board/bmw/bmw.c @@ -26,10 +26,9 @@ #include #include #include -#include -#include +#include #include -#include +#include #include #include #include @@ -46,13 +45,13 @@ int checkboard(void) char buf[32]; puts ("Board: BMW MPC8245/KAHLUA2 - CHRP (MAP B)\n"); - printf("Built: %s at %s\n", __DATE__ , __TIME__ ); + printf("Built: %s at %s\n", U_BOOT_DATE, U_BOOT_TIME); /* printf("MPLD: Revision %d\n", SYS_REVID_GET()); */ printf("Local Bus at %s MHz\n", strmhz(buf, busfreq)); return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 64*1024*1024; } @@ -94,15 +93,12 @@ int misc_init_f (void) } - - - /* * Initialize PCI Devices, report devices found. */ struct pci_controller hose; -void pci_init (void) +void pci_init_board (void) { pci_mpc824x_init(&hose); /* pci_dev_init(0); */ @@ -121,6 +117,7 @@ sys_led_msg(char* msg) LED_REG(3) = msg[0]; } +#ifdef CONFIG_CMD_DOC /* * Map onboard TSOP-16MB DOC FLASH chip. */ @@ -128,8 +125,9 @@ void doc_init (void) { doc_probe(DOC_BASE_ADDR); } +#endif -#define NV_ADDR ((volatile unsigned char *) CFG_ENV_ADDR) +#define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR) /* Read from NVRAM */ void*