8548cds fixes
PATCH 1/1 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}.
---
This is against denx head of tree for the next release.
board/cds/mpc8548cds/mpc8548cds.c | 14 +++++++++++--- include/configs/MPC8548CDS.h | 15 ++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-)
board/cds/mpc8548cds/mpc8548cds.c +11 -3
@@ -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 = \
include/configs/MPC8548CDS.h +6 -9
@@ -636,7 +636,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" \
@@ -649,8 +648,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;" \
@@ -672,8 +671,6 @@ extern unsigned long get_clock_freq(void); PCI_ENV1 \ PCI_ENV2 \ ENET_ENV -#endif -#define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \
@@ -681,8 +678,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 \
@@ -690,8 +687,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
Signature · 1 line
1.5.3.rc5.28.g6fb88
PATCH 1/1 8548cds fixes
Quoted 9 lines · In message <[email protected]> you wrote:
Restore
CONFIG_EXTRA_ENV_SETTINGSdefinition 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 <[email protected]>---
This is against denx head of tree for the next release.
What do you mean by *next* release? The one we're just prepareing for (2.3.0) or the one after that?
Also, who should take care of this - Andy or me?
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de In the beginning there was nothing. And the Lord said "Let There Be Light!" And still there was nothing, but at least now you could see it.