From 2aa54f651a42d198673318f07a20c89a43e4d197 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Fri, 2 Feb 2007 12:42:08 +0100 Subject: [PATCH 1/3] [PATCH] Change configuration output of Sycamore, Yellowstone & Rainier Signed-off-by: Stefan Roese --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b51c599909..f39ff652f5 100644 --- a/Makefile +++ b/Makefile @@ -1172,18 +1172,16 @@ PPChameleonEVB_HI_33_config: unconfig rainier_config: unconfig @mkdir -p $(obj)include @echo "#define CONFIG_RAINIER" > $(obj)include/config.h - @echo "Configuring for rainier board as subset of sequoia..." - @$(MKCONFIG) -a sequoia ppc ppc4xx sequoia amcc + @$(MKCONFIG) -n $@ -a sequoia ppc ppc4xx sequoia amcc rainier_nand_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)nand_spl @mkdir -p $(obj)board/amcc/sequoia @echo "#define CONFIG_RAINIER" > $(obj)include/config.h - @echo "Configuring for rainier board as subset of sequoia..." @echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h @echo "Compile NAND boot image for sequoia" - @$(MKCONFIG) -a sequoia ppc ppc4xx sequoia amcc + @$(MKCONFIG) -n $@ -a sequoia ppc ppc4xx sequoia amcc @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @@ -1207,8 +1205,7 @@ sc3_config:unconfig @./mkconfig $(@:_config=) ppc ppc4xx sc3 sycamore_config: unconfig - @echo "Configuring for sycamore board as subset of walnut..." - @$(MKCONFIG) -a walnut ppc ppc4xx walnut amcc + @$(MKCONFIG) -n $@ -a walnut ppc ppc4xx walnut amcc taishan_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc @@ -1241,8 +1238,7 @@ yosemite_config: unconfig yellowstone_config: unconfig @mkdir -p $(obj)include @echo "#define CONFIG_YELLOWSTONE" > $(obj)include/config.h - @echo "Configuring for yellowstone board as subset of yosemite..." - @$(MKCONFIG) -a yosemite ppc ppc4xx yosemite amcc + @$(MKCONFIG) -n $@ -a yosemite ppc ppc4xx yosemite amcc yucca_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx yucca amcc From 7372ca68227930d03cffa548310524cad5b96733 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Fri, 2 Feb 2007 12:44:22 +0100 Subject: [PATCH 2/3] [PATCH] Correctly display PCI arbiter en-/disabled on some 4xx boards Previously the strapping DCR/SDR was read to determine if the internal PCI arbiter is enabled or not. This strapping bit can be overridden, so now the current status is read from the correct DCR/SDR register. Signed-off-by: Stefan Roese --- cpu/ppc4xx/cpu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 7c96ad8ab9..b02f6f4eef 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -88,14 +88,18 @@ int pci_arbiter_enabled(void) return (mfdcr(cpc0_strp1) & CPC0_STRP1_PAE_MASK); #endif -#if defined(CONFIG_440GX) || \ - defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ - defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SP) || defined(CONFIG_440SPE) +#if defined(CONFIG_440GX) || defined(CONFIG_440SP) || defined(CONFIG_440SPE) unsigned long val; - mfsdr(sdr_sdstp1, val); - return (val & SDR0_SDSTP1_PAE_MASK); + mfsdr(sdr_xcr, val); + return (val & 0x80000000); +#endif +#if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ + defined(CONFIG_440EPX) || defined(CONFIG_440GRX) + unsigned long val; + + mfsdr(sdr_pci0, val); + return (val & 0x80000000); #endif } #endif From 5a753f98c6a01bd1c61a9a3f95e8329a35f62994 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 7 Feb 2007 16:51:08 +0100 Subject: [PATCH 3/3] [PATCH] Update some AMCC 4xx board config files (set initrd_high) Some boards that can have more than 768MBytes of SDRAM need to set "initrd_high", so that the initrd can be accessed by the Linux kernel. Signed-off-by: Stefan Roese --- include/configs/bamboo.h | 1 + include/configs/bubinga.h | 1 + include/configs/ebony.h | 1 + include/configs/luan.h | 1 + include/configs/ocotea.h | 1 + include/configs/taishan.h | 1 + include/configs/walnut.h | 1 + include/configs/yucca.h | 1 + 8 files changed, 8 insertions(+) diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 4961011b5c..bcc736ceb5 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -257,6 +257,7 @@ "bootfile=/tftpboot/bamboo/uImage\0" \ "kernel_addr=fff00000\0" \ "ramdisk_addr=fff10000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/bamboo/u-boot.bin\0" \ "update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \ "cp.b 100000 fffa0000 60000;" \ diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index a66cdc3956..10c4814311 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -106,6 +106,7 @@ "bootfile=/tftpboot/bubinga/uImage\0" \ "kernel_addr=fff80000\0" \ "ramdisk_addr=fff90000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/bubinga/u-boot.bin\0" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "cp.b 100000 fffc0000 40000;" \ diff --git a/include/configs/ebony.h b/include/configs/ebony.h index d8882ea31c..6c4d7cc4fe 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -177,6 +177,7 @@ "bootfile=/tftpboot/ebony/uImage\0" \ "kernel_addr=ff800000\0" \ "ramdisk_addr=ff810000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/ebony/u-boot.bin\0" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "cp.b 100000 fffc0000 40000;" \ diff --git a/include/configs/luan.h b/include/configs/luan.h index 0350e91f0f..5c9d208feb 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -178,6 +178,7 @@ "bootfile=/tftpboot/luan/uImage\0" \ "kernel_addr=fc000000\0" \ "ramdisk_addr=fc100000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/luan/u-boot.bin\0" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "cp.b 100000 fffc0000 40000;" \ diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index 89e9164e03..0e3660ba2d 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -192,6 +192,7 @@ "bootfile=/tftpboot/ocotea/uImage\0" \ "kernel_addr=fff00000\0" \ "ramdisk_addr=fff10000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/ocotea/u-boot.bin\0" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "cp.b 100000 fffc0000 40000;" \ diff --git a/include/configs/taishan.h b/include/configs/taishan.h index 7ace3971d7..2b28f93a07 100644 --- a/include/configs/taishan.h +++ b/include/configs/taishan.h @@ -188,6 +188,7 @@ "bootfile=/tftpboot/taishan/uImage\0" \ "kernel_addr=fc000000\0" \ "ramdisk_addr=fc180000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/taishan/u-boot.bin\0" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "cp.b 100000 fffc0000 40000;" \ diff --git a/include/configs/walnut.h b/include/configs/walnut.h index 28abd6e153..b34dc71d23 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -68,6 +68,7 @@ "bootfile=/tftpboot/walnut/uImage\0" \ "kernel_addr=fff80000\0" \ "ramdisk_addr=fff80000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 /tftpboot/walnut/u-boot.bin\0" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "cp.b 100000 fffc0000 40000;" \ diff --git a/include/configs/yucca.h b/include/configs/yucca.h index a6532b5e85..6417ed891d 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -178,6 +178,7 @@ "bootfile=yucca/uImage\0" \ "kernel_addr=E7F10000\0" \ "ramdisk_addr=E7F20000\0" \ + "initrd_high=30000000\0" \ "load=tftp 100000 yuca/u-boot.bin\0" \ "update=protect off 2:4-7;era 2:4-7;" \ "cp.b ${fileaddr} FFFB0000 ${filesize};" \