mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-16 06:46:59 +00:00
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
This commit is contained in:
commit
dd768162c2
10 changed files with 22 additions and 14 deletions
12
Makefile
12
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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;" \
|
||||
|
|
|
@ -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};" \
|
||||
|
|
Loading…
Add table
Reference in a new issue