diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 16 | ||||
| -rw-r--r-- | include/configs/bamboo.h | 1 | ||||
| -rw-r--r-- | include/configs/bubinga.h | 1 | ||||
| -rw-r--r-- | include/configs/ebony.h | 1 | ||||
| -rw-r--r-- | include/configs/luan.h | 1 | ||||
| -rw-r--r-- | include/configs/ocotea.h | 1 | ||||
| -rw-r--r-- | include/configs/taishan.h | 1 | ||||
| -rw-r--r-- | include/configs/walnut.h | 1 | ||||
| -rw-r--r-- | include/configs/yucca.h | 1 |
10 files changed, 22 insertions, 14 deletions
@@ -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 diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 7c96ad8..b02f6f4 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 diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 4961011..bcc736c 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 a66cdc3..10c4814 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 d8882ea..6c4d7cc 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 0350e91..5c9d208 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 89e9164..0e3660b 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 7ace397..2b28f93 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 28abd6e..b34dc71 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 a6532b5..6417ed8 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};" \ |