Commit 4bf4abb8a4e9955556b120a1aafa30c03e74032a
Committed by
Andrew Fleming-AFLEMING
Andrew Fleming-AFLEMING
1 parent
7a1ac419fa
Exists in
master
and in
55 other branches
8548cds fixes
Restore CONFIG_EXTRA_ENV_SETTINGS definition which contains the
correct consoledev needed for linux boot.
Standardize on fdt{file,addr} var to hold dtb file name.
Set PCI inbound memory region from CFG_MEMORY_{BUS,PHYS}.
Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Showing 2 changed files with 17 additions and 12 deletions Side-by-side Diff
board/cds/mpc8548cds/mpc8548cds.c
| ... | ... | @@ -362,20 +362,28 @@ |
| 362 | 362 | ); |
| 363 | 363 | |
| 364 | 364 | |
| 365 | - /* outbound memory */ | |
| 365 | + /* inbound */ | |
| 366 | 366 | pci_set_region(hose->regions + 0, |
| 367 | + CFG_PCI_MEMORY_BUS, | |
| 368 | + CFG_PCI_MEMORY_PHYS, | |
| 369 | + CFG_PCI_MEMORY_SIZE, | |
| 370 | + PCI_REGION_MEM | PCI_REGION_MEMORY); | |
| 371 | + | |
| 372 | + | |
| 373 | + /* outbound memory */ | |
| 374 | + pci_set_region(hose->regions + 1, | |
| 367 | 375 | CFG_PCI1_MEM_BASE, |
| 368 | 376 | CFG_PCI1_MEM_PHYS, |
| 369 | 377 | CFG_PCI1_MEM_SIZE, |
| 370 | 378 | PCI_REGION_MEM); |
| 371 | 379 | |
| 372 | 380 | /* outbound io */ |
| 373 | - pci_set_region(hose->regions + 1, | |
| 381 | + pci_set_region(hose->regions + 2, | |
| 374 | 382 | CFG_PCI1_IO_BASE, |
| 375 | 383 | CFG_PCI1_IO_PHYS, |
| 376 | 384 | CFG_PCI1_IO_SIZE, |
| 377 | 385 | PCI_REGION_IO); |
| 378 | - hose->region_count = 2; | |
| 386 | + hose->region_count = 3; | |
| 379 | 387 | |
| 380 | 388 | /* relocate config table pointers */ |
| 381 | 389 | hose->config_table = \ |
include/configs/MPC8548CDS.h
| ... | ... | @@ -633,7 +633,6 @@ |
| 633 | 633 | #define ENET_ENV "" |
| 634 | 634 | #endif |
| 635 | 635 | |
| 636 | -#if 0 | |
| 637 | 636 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 638 | 637 | "netdev=eth0\0" \ |
| 639 | 638 | "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ |
| ... | ... | @@ -646,8 +645,8 @@ |
| 646 | 645 | "consoledev=ttyS1\0" \ |
| 647 | 646 | "ramdiskaddr=2000000\0" \ |
| 648 | 647 | "ramdiskfile=ramdisk.uboot\0" \ |
| 649 | - "dtbaddr=c00000\0" \ | |
| 650 | - "dtbfile=mpc8548cds.dtb\0" \ | |
| 648 | + "fdtaddr=c00000\0" \ | |
| 649 | + "fdtfile=mpc8548cds.dtb\0" \ | |
| 651 | 650 | "eoi=mw e00400b0 0\0" \ |
| 652 | 651 | "iack=md e00400a0 1\0" \ |
| 653 | 652 | "ddrreg=md ${a}000 8; md ${a}080 8;md ${a}100 d; md ${a}140 4; md ${a}bf0 4;" \ |
| 654 | 653 | |
| 655 | 654 | |
| ... | ... | @@ -669,17 +668,15 @@ |
| 669 | 668 | PCI_ENV1 \ |
| 670 | 669 | PCI_ENV2 \ |
| 671 | 670 | ENET_ENV |
| 672 | -#endif | |
| 673 | 671 | |
| 674 | - | |
| 675 | 672 | #define CONFIG_NFSBOOTCOMMAND \ |
| 676 | 673 | "setenv bootargs root=/dev/nfs rw " \ |
| 677 | 674 | "nfsroot=$serverip:$rootpath " \ |
| 678 | 675 | "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \ |
| 679 | 676 | "console=$consoledev,$baudrate $othbootargs;" \ |
| 680 | 677 | "tftp $loadaddr $bootfile;" \ |
| 681 | - "tftp $dtbaddr $dtbfile;" \ | |
| 682 | - "bootm $loadaddr - $dtbaddr" | |
| 678 | + "tftp $fdtaddr $fdtfile;" \ | |
| 679 | + "bootm $loadaddr - $fdtaddr" | |
| 683 | 680 | |
| 684 | 681 | |
| 685 | 682 | #define CONFIG_RAMBOOTCOMMAND \ |
| ... | ... | @@ -687,8 +684,8 @@ |
| 687 | 684 | "console=$consoledev,$baudrate $othbootargs;" \ |
| 688 | 685 | "tftp $ramdiskaddr $ramdiskfile;" \ |
| 689 | 686 | "tftp $loadaddr $bootfile;" \ |
| 690 | - "tftp $dtbaddr $dtbfile;" \ | |
| 691 | - "bootm $loadaddr $ramdiskaddr $dtbaddr" | |
| 687 | + "tftp $fdtaddr $fdtfile;" \ | |
| 688 | + "bootm $loadaddr $ramdiskaddr $fdtaddr" | |
| 692 | 689 | |
| 693 | 690 | #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND |
| 694 | 691 |