minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-15 06:55:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

8548cds fixes

Browse Source 
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>
This commit is contained in:
Ed Swarthout 2007-08-21 09:38:59 -05:00 committed by Andrew Fleming-AFLEMING
parent 7a1ac419fa
commit 4bf4abb8a4
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
board/cds/mpc8548cds/mpc8548cds.c
View File

@ -362,20 +362,28 @@ pci_init_board(void)
); );
/* outbound memory */ /* inbound */
pci_set_region(hose->regions + 0, 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_BASE,
CFG_PCI1_MEM_PHYS, CFG_PCI1_MEM_PHYS,
CFG_PCI1_MEM_SIZE, CFG_PCI1_MEM_SIZE,
PCI_REGION_MEM); PCI_REGION_MEM);
/* outbound io */ /* outbound io */
pci_set_region(hose->regions + 1, pci_set_region(hose->regions + 2,
CFG_PCI1_IO_BASE, CFG_PCI1_IO_BASE,
CFG_PCI1_IO_PHYS, CFG_PCI1_IO_PHYS,
CFG_PCI1_IO_SIZE, CFG_PCI1_IO_SIZE,
PCI_REGION_IO); PCI_REGION_IO);
hose->region_count = 2; hose->region_count = 3;
/* relocate config table pointers */ /* relocate config table pointers */
hose->config_table = \ hose->config_table = \

15
include/configs/MPC8548CDS.h
View File

@ -633,7 +633,6 @@ extern unsigned long get_clock_freq(void);
#define ENET_ENV "" #define ENET_ENV ""
#endif #endif
#if 0
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
@ -646,8 +645,8 @@ extern unsigned long get_clock_freq(void);
"consoledev=ttyS1\0" \ "consoledev=ttyS1\0" \
"ramdiskaddr=2000000\0" \ "ramdiskaddr=2000000\0" \
"ramdiskfile=ramdisk.uboot\0" \ "ramdiskfile=ramdisk.uboot\0" \
"dtbaddr=c00000\0" \ "fdtaddr=c00000\0" \
"dtbfile=mpc8548cds.dtb\0" \ "fdtfile=mpc8548cds.dtb\0" \
"eoi=mw e00400b0 0\0" \ "eoi=mw e00400b0 0\0" \
"iack=md e00400a0 1\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;" \ "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_ENV1 \
PCI_ENV2 \ PCI_ENV2 \
ENET_ENV ENET_ENV
#endif
#define CONFIG_NFSBOOTCOMMAND \ #define CONFIG_NFSBOOTCOMMAND \
"setenv bootargs root=/dev/nfs rw " \ "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 " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
"console=$consoledev,$baudrate $othbootargs;" \ "console=$consoledev,$baudrate $othbootargs;" \
"tftp $loadaddr $bootfile;" \ "tftp $loadaddr $bootfile;" \
"tftp $dtbaddr $dtbfile;" \ "tftp $fdtaddr $fdtfile;" \
"bootm $loadaddr - $dtbaddr" "bootm $loadaddr - $fdtaddr"
#define CONFIG_RAMBOOTCOMMAND \ #define CONFIG_RAMBOOTCOMMAND \
@ -687,8 +684,8 @@ extern unsigned long get_clock_freq(void);
"console=$consoledev,$baudrate $othbootargs;" \ "console=$consoledev,$baudrate $othbootargs;" \
"tftp $ramdiskaddr $ramdiskfile;" \ "tftp $ramdiskaddr $ramdiskfile;" \
"tftp $loadaddr $bootfile;" \ "tftp $loadaddr $bootfile;" \
"tftp $dtbaddr $dtbfile;" \ "tftp $fdtaddr $fdtfile;" \
"bootm $loadaddr $ramdiskaddr $dtbaddr" "bootm $loadaddr $ramdiskaddr $fdtaddr"
#define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND