summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEd Swarthout <Ed.Swarthout@freescale.com>2007-08-21 09:38:59 -0500
committerAndrew Fleming-AFLEMING <afleming@freescale.com>2007-08-29 00:11:59 -0500
commit4bf4abb8a4e9955556b120a1aafa30c03e74032a (patch)
treeec0b1c3d05500e7c3592b2adcee63d70469a217a /include
parent7a1ac419fa0d2d23ddd08bd61d16896a9f33c933 (diff)
downloadu-boot-imx-4bf4abb8a4e9955556b120a1aafa30c03e74032a.zip
u-boot-imx-4bf4abb8a4e9955556b120a1aafa30c03e74032a.tar.gz
u-boot-imx-4bf4abb8a4e9955556b120a1aafa30c03e74032a.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/MPC8548CDS.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 682f0c0..6083715 100644
--- 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