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>

diff --git a/board/cds/mpc8548cds/mpc8548cds.c b/board/cds/mpc8548cds/mpc8548cds.c
index 48753d7e241cdc4f31fddb5d975865719ea9ae11..796ae22a6915a95d97e3de374d0d47a7f0ea1722 100644 (file)
--- a/board/cds/mpc8548cds/mpc8548cds.c
+++ b/board/cds/mpc8548cds/mpc8548cds.c
@@ -362,20 +362,28 @@ pci_init_board(void)
                        );
 
 
-               /* outbound memory */
+               /* inbound */
                pci_set_region(hose->regions + 0,
+                              CFG_PCI_MEMORY_BUS,
+                              CFG_PCI_MEMORY_PHYS,
+                              CFG_PCI_MEMORY_SIZE,
+                              PCI_REGION_MEM | PCI_REGION_MEMORY);
+
+
+               /* outbound memory */
+               pci_set_region(hose->regions + 1,
                               CFG_PCI1_MEM_BASE,
                               CFG_PCI1_MEM_PHYS,
                               CFG_PCI1_MEM_SIZE,
                               PCI_REGION_MEM);
 
                /* outbound io */
-               pci_set_region(hose->regions + 1,
+               pci_set_region(hose->regions + 2,
                               CFG_PCI1_IO_BASE,
                               CFG_PCI1_IO_PHYS,
                               CFG_PCI1_IO_SIZE,
                               PCI_REGION_IO);
-               hose->region_count = 2;
+               hose->region_count = 3;
 
                /* relocate config table pointers */
                hose->config_table = \

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 682f0c057516de1aa75e2a7634b53ba3d92aee93..608371518939a81876da9e4696183cf51f468604 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -633,7 +633,6 @@ extern unsigned long get_clock_freq(void);
 #define ENET_ENV ""
 #endif
 
-#if 0
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
@@ -646,8 +645,8 @@ extern unsigned long get_clock_freq(void);
  "consoledev=ttyS1\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=ramdisk.uboot\0"                 \
- "dtbaddr=c00000\0"                            \
- "dtbfile=mpc8548cds.dtb\0"                    \
+ "fdtaddr=c00000\0"                            \
+ "fdtfile=mpc8548cds.dtb\0"                    \
  "eoi=mw e00400b0 0\0"                         \
  "iack=md e00400a0 1\0"                                \
  "ddrreg=md ${a}000 8; md ${a}080 8;md ${a}100 d; md ${a}140 4; md ${a}bf0 4;" \
@@ -669,8 +668,6 @@ extern unsigned long get_clock_freq(void);
  PCI_ENV1 \
  PCI_ENV2 \
  ENET_ENV
-#endif
-
 
 #define CONFIG_NFSBOOTCOMMAND                                          \
    "setenv bootargs root=/dev/nfs rw "                                 \
@@ -678,8 +675,8 @@ extern unsigned long get_clock_freq(void);
       "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
       "console=$consoledev,$baudrate $othbootargs;"                    \
    "tftp $loadaddr $bootfile;"                                         \
-   "tftp $dtbaddr $dtbfile;"                                           \
-   "bootm $loadaddr - $dtbaddr"
+   "tftp $fdtaddr $fdtfile;"                                           \
+   "bootm $loadaddr - $fdtaddr"
 
 
 #define CONFIG_RAMBOOTCOMMAND \
@@ -687,8 +684,8 @@ extern unsigned long get_clock_freq(void);
       "console=$consoledev,$baudrate $othbootargs;"                    \
    "tftp $ramdiskaddr $ramdiskfile;"                                   \
    "tftp $loadaddr $bootfile;"                                         \
-   "tftp $dtbaddr $dtbfile;"                                           \
-   "bootm $loadaddr $ramdiskaddr $dtbaddr"
+   "tftp $fdtaddr $fdtfile;"                                           \
+   "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
 #define CONFIG_BOOTCOMMAND     CONFIG_NFSBOOTCOMMAND