Add support for pci-ide to ofpath

* ofpath: Support multi-channel pci-ide devices, found in the Xserve.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-38

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index 4ebedb85c029b73f5f85236ee787fa8ff7279756..346b833f0a9b10902e8cae6e67b0d64159e92c08 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,256 +1,256 @@
-./include/xfs/.arch-ids/=id    1035973924      1017069090
-./include/xfs/.arch-ids/xfs.h.id       1035973924      1017069096
-./include/xfs/.arch-ids        1036288552      1017069096
-./include/xfs/xfs.h    1035973924      1002101334
-./include/xfs  1036288552      1007269244
-./include/.arch-ids/errors.h.id        1035973922      1017069108
-./include/.arch-ids/=id        1035973922      1017027153
-./include/.arch-ids/bootinfo.h.id      1035973922      1017027154
-./include/.arch-ids/byteorder.h.id     1035973922      1017027154
-./include/.arch-ids/cfg.h.id   1035973922      1017027154
-./include/.arch-ids/cmdline.h.id       1035973922      1017027154
-./include/.arch-ids/ctype.h.id 1035973922      1017027155
-./include/.arch-ids/fdisk-part.h.id    1035973922      1017027157
-./include/.arch-ids/file.h.id  1035973922      1017027157
-./include/.arch-ids/fs.h.id    1035973922      1017027157
-./include/.arch-ids/mac-part.h.id      1035973922      1017027159
-./include/.arch-ids/md5.h.id   1035973922      1017027159
-./include/.arch-ids/partition.h.id     1035973922      1017027159
-./include/.arch-ids/prom.h.id  1035973923      1017027159
-./include/.arch-ids/setjm2.h.id        1035973923      1017027160
-./include/.arch-ids/setjmp.h.id        1035973923      1017027160
-./include/.arch-ids/stdlib.h.id        1035973923      1017027161
-./include/.arch-ids/string.h.id        1035973923      1017027161
-./include/.arch-ids/swab.h.id  1035973923      1017027161
-./include/.arch-ids/types.h.id 1035973923      1017027162
-./include/.arch-ids/yaboot.h.id        1035973923      1017027162
-./include/.arch-ids/debug.h.id 1035973922      1017154770
-./include/.arch-ids    1036288552      1017154770
-./include/asm/.arch-ids/=id    1035973923      1017027153
-./include/asm/.arch-ids/elf.h.id       1035973923      1017027153
-./include/asm/.arch-ids/ppc_asm.tmpl.id        1035973923      1017027153
-./include/asm/.arch-ids/processor.h.id 1035973923      1017027154
-./include/asm/.arch-ids        1036288552      1017027154
-./include/asm/elf.h    1035973923      1000991730
-./include/asm/ppc_asm.tmpl     1035973923      1000991730
-./include/asm/processor.h      1035973923      1000991730
-./include/asm  1036288552      1007269243
-./include/et/.arch-ids/=id     1035973923      1017027155
-./include/et/.arch-ids/com_err.h.id    1035973923      1017027155
-./include/et/.arch-ids 1036288552      1017155400
-./include/et/com_err.h 1035973923      1000991731
-./include/et   1036288552      1007269243
-./include/ext2fs/.arch-ids/=id 1035973923      1017027156
-./include/ext2fs/.arch-ids/bitops.h.id 1035973923      1017027156
-./include/ext2fs/.arch-ids/ext2_err.h.id       1035973923      1017027156
-./include/ext2fs/.arch-ids/ext2_io.h.id        1035973923      1017027156
-./include/ext2fs/.arch-ids/ext2fs.h.id 1035973923      1017027156
-./include/ext2fs/.arch-ids     1036288552      1017027156
-./include/ext2fs/bitops.h      1035973923      1003927524
-./include/ext2fs/ext2_err.h    1035973923      1003927524
-./include/ext2fs/ext2_io.h     1035973924      1003927524
-./include/ext2fs/ext2fs.h      1035973924      1003927524
-./include/ext2fs       1036288552      1007269243
-./include/linux/.arch-ids/=id  1035973924      1017027157
-./include/linux/.arch-ids/elf.h.id     1035973924      1017027158
-./include/linux/.arch-ids/ext2_fs.h.id 1035973924      1017027158
-./include/linux/.arch-ids/iso_fs.h.id  1035973924      1017027158
-./include/linux/.arch-ids/stat.h.id    1035973924      1017027158
-./include/linux/.arch-ids/types.h.id   1035973924      1017027159
-./include/linux/.arch-ids      1036288552      1017027159
-./include/linux/elf.h  1035973924      1000991731
-./include/linux/ext2_fs.h      1035973924      1000991731
-./include/linux/iso_fs.h       1035973924      1000991731
-./include/linux/stat.h 1035973924      1000991731
-./include/linux/types.h        1035973924      1000991731
-./include/linux        1036288552      1007269243
-./include/reiserfs/.arch-ids/=id       1035973924      1017027160
-./include/reiserfs/.arch-ids/reiserfs.h.id     1035973924      1017027160
-./include/reiserfs/.arch-ids   1036288552      1017027160
-./include/reiserfs/reiserfs.h  1035973924      1025684115
-./include/reiserfs     1036288552      1025684115
-./include/errors.h     1035973923      1007200690
-./include/bootinfo.h   1035973923      1007200690
-./include/byteorder.h  1035973923      1000991730
-./include/cfg.h        1035973923      1007200690
-./include/cmdline.h    1035973923      1007200690
-./include/ctype.h      1035973923      1003656411
-./include/fdisk-part.h 1035973924      1007200690
-./include/file.h       1035973924      1007200690
-./include/fs.h 1035973924      1007200690
-./include/mac-part.h   1035973924      1007200690
-./include/md5.h        1035973924      1000991730
-./include/partition.h  1035973924      1007200690
-./include/prom.h       1035973924      1007200690
-./include/setjm2.h     1035973924      1000991730
-./include/setjmp.h     1035973924      1000991730
-./include/stdlib.h     1035973924      1000991730
-./include/string.h     1035973924      1002620217
-./include/swab.h       1035973924      1000991730
-./include/types.h      1035973924      1000991730
-./include/yaboot.h     1035973925      1007200690
-./include/debug.h      1035973923      1007200690
-./include      1036288552      1007269244
-./second/.arch-ids/fs_xfs.c.id 1035973926      1017069120
-./second/.arch-ids/=id 1035973926      1017027166
-./second/.arch-ids/cache.S.id  1035973926      1017027167
-./second/.arch-ids/cfg.c.id    1035973926      1017027167
-./second/.arch-ids/cmdline.c.id        1035973926      1017027167
-./second/.arch-ids/crt0.S.id   1035973926      1017027167
-./second/.arch-ids/file.c.id   1035973926      1017027167
-./second/.arch-ids/fs.c.id     1035973926      1017027168
-./second/.arch-ids/fs_ext2.c.id        1035973926      1017027168
-./second/.arch-ids/fs_iso.c.id 1035973926      1017027168
-./second/.arch-ids/fs_of.c.id  1035973926      1017027168
-./second/.arch-ids/fs_reiserfs.c.id    1035973926      1017027169
-./second/.arch-ids/iso_util.c.id       1035973926      1017027170
-./second/.arch-ids/md5.c.id    1035973926      1017027170
-./second/.arch-ids/partition.c.id      1035973926      1017027170
-./second/.arch-ids/prom.c.id   1035973926      1017027170
-./second/.arch-ids/setjmp.S.id 1035973926      1017027171
-./second/.arch-ids/yaboot.c.id 1035973926      1017027171
-./second/.arch-ids     1036288552      1017069120
-./second/fs_xfs.c      1035973927      1032059541
-./second/cache.S       1035973926      1007200690
-./second/cfg.c 1035973926      1007200690
-./second/cmdline.c     1035973926      1032059589
-./second/crt0.S        1035973926      1000991731
-./second/file.c        1035973926      1032059581
-./second/fs.c  1035973926      1032059574
-./second/fs_ext2.c     1035973926      1032059564
-./second/fs_iso.c      1035973926      1007200690
-./second/fs_of.c       1035973926      1032059553
-./second/fs_reiserfs.c 1035973926      1007200690
-./second/iso_util.c    1035973927      1003656415
-./second/md5.c 1035973927      1032059532
-./second/partition.c   1035973927      1032059525
-./second/prom.c        1035973927      1032059515
-./second/setjmp.S      1035973927      1000991732
-./second/yaboot.c      1035973927      1032059504
-./second       1036288552      1032765950
-./.arch-ids/Config.id  1035973920      1017069133
-./.arch-ids/0arch-timestamps0.id       1035973920      1020516949
-./.arch-ids/ChangeLog.id       1035973920      1017026820
-./.arch-ids/BUGS.id    1035973920      1017027147
-./.arch-ids/COPYING.id 1035973920      1017027147
-./.arch-ids/INSTALL.id 1035973920      1017027147
-./.arch-ids/Makefile.id        1035973920      1017027148
-./.arch-ids/README.id  1035973920      1017027148
-./.arch-ids/README.man.patch.id        1035973920      1017027148
-./.arch-ids/THANKS.id  1035973920      1017027148
-./.arch-ids/TODO.id    1035973920      1017027149
-./.arch-ids/changelog.id       1035973920      1017027149
-./.arch-ids/man.patch.id       1035973920      1017027166
-./.arch-ids    1036288552      1020516949
-./doc/.arch-ids/=id    1035973921      1017027149
-./doc/.arch-ids/README.ofboot.id       1035973921      1017027149
-./doc/.arch-ids/README.ofpath.id       1035973921      1017027149
-./doc/.arch-ids/README.rs6000.id       1035973921      1017027150
-./doc/.arch-ids/Makefile.id    1035973921      1017235762
-./doc/.arch-ids/yaboot-howto.sgml.id   1035973921      1017235765
-./doc/.arch-ids/yaboot-howto.de.sgml.id        1035973921      1017238100
-./doc/.arch-ids        1036288552      1017238100
-./doc/examples/.arch-ids/=id   1035973921      1017027150
-./doc/examples/.arch-ids/README.dualboot.chrp.id       1035973921      1017027150
-./doc/examples/.arch-ids/README.mbicons.id     1035973921      1017027150
-./doc/examples/.arch-ids/README.simpleboot.chrp.id     1035973921      1017027150
-./doc/examples/.arch-ids/dualboot.chrp.id      1035973921      1017027151
-./doc/examples/.arch-ids/large-penguin.mbicon.id       1035973921      1017027151
-./doc/examples/.arch-ids/simpleboot.chrp.id    1035973921      1017027151
-./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1035973921      1017027151
-./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1035973921      1017027152
-./doc/examples/.arch-ids       1036288552      1017236175
-./doc/examples/README.dualboot.chrp    1035973922      1000991730
-./doc/examples/README.mbicons  1035973922      1000991730
-./doc/examples/README.simpleboot.chrp  1035973922      1000991730
-./doc/examples/dualboot.chrp   1035973922      1000991730
-./doc/examples/large-penguin.mbicon    1035973922      1000991730
-./doc/examples/simpleboot.chrp 1035973922      1006347336
-./doc/examples/yaboot.conf.multi-boot  1035973922      1006348765
-./doc/examples/yaboot.conf.rs6000      1035973922      1006348765
-./doc/examples 1036288552      1007269243
-./doc/README.ofboot    1035973921      1000991730
-./doc/README.ofpath    1035973921      1000991730
-./doc/README.rs6000    1035973921      1007200689
-./doc/Makefile 1035973921      1019310768
-./doc/yaboot-howto.sgml        1035973922      1032059987
-./doc/yaboot-howto.de.sgml     1035973922      1032059970
-./doc  1036288552      1032059987
-./etc/.arch-ids/=id    1035973922      1017027152
-./etc/.arch-ids/yaboot.conf.id 1035973922      1017027152
-./etc/.arch-ids        1036288552      1017027152
-./etc/yaboot.conf      1035973922      1006348765
-./etc  1036288552      1007269243
-./first/.arch-ids/=id  1035973922      1017027152
-./first/.arch-ids/ofboot.id    1035973922      1017027152
-./first/.arch-ids      1036288552      1017027152
-./first/ofboot 1035973922      1032060202
-./first        1036288552      1032060202
-./lib/.arch-ids/=id    1035973925      1017027162
-./lib/.arch-ids/ctype.c.id     1035973925      1017027163
-./lib/.arch-ids/libext2fs.a.id 1035973925      1017027163
-./lib/.arch-ids/malloc.c.id    1035973925      1017027163
-./lib/.arch-ids/nosys.c.id     1035973925      1017027163
-./lib/.arch-ids/string.S.id    1035973925      1017027163
-./lib/.arch-ids/strstr.c.id    1035973925      1017027164
-./lib/.arch-ids/strtol.c.id    1035973925      1017027164
-./lib/.arch-ids/vsprintf.c.id  1035973925      1017027164
-./lib/.arch-ids        1036288552      1017027164
-./lib/ctype.c  1035973925      1000991731
-./lib/libext2fs.a      1035973925      1003927524
-./lib/malloc.c 1035973925      1007200690
-./lib/nosys.c  1035973925      1000991731
-./lib/string.S 1035973925      1007200690
-./lib/strstr.c 1035973925      1000991731
-./lib/strtol.c 1035973925      1000991731
-./lib/vsprintf.c       1035973925      1000991731
-./lib  1036288552      1014816709
-./man/.arch-ids/=id    1035973925      1017027164
-./man/.arch-ids/bootstrap.8.id 1035973925      1017027165
-./man/.arch-ids/mkofboot.8.id  1035973925      1017027165
-./man/.arch-ids/ofpath.8.id    1035973925      1017027165
-./man/.arch-ids/yaboot.8.id    1035973925      1017027165
-./man/.arch-ids/yaboot.conf.5.id       1035973925      1017027166
-./man/.arch-ids/yabootconfig.8.id      1035973925      1017027166
-./man/.arch-ids/ybin.8.id      1035973925      1017027166
-./man/.arch-ids        1036288552      1017027166
-./man/bootstrap.8      1035973925      1000991731
-./man/mkofboot.8       1035973925      1006348765
-./man/ofpath.8 1035973925      1000991731
-./man/yaboot.8 1035973925      1006348765
-./man/yaboot.conf.5    1035973926      1004256691
-./man/yabootconfig.8   1035973926      1027929577
-./man/ybin.8   1035973926      1006348765
-./man  1036288552      1027929577
-./util/.arch-ids/=id   1035973927      1017027171
-./util/.arch-ids/addnote.c.id  1035973927      1017027171
-./util/.arch-ids/elfextract.c.id       1035973927      1017027172
-./util/.arch-ids       1036288552      1017027172
-./util/addnote.c       1035973927      1007200691
-./util/elfextract.c    1035973927      1007303237
-./util 1036288552      1014816709
-./ybin/.arch-ids/=id   1035973927      1017027172
-./ybin/.arch-ids/mkofboot.id   1035973927      1017027172
-./ybin/.arch-ids/ofpath.id     1035973927      1017027172
-./ybin/.arch-ids/yabootconfig.id       1035973927      1017027172
-./ybin/.arch-ids/ybin.id       1035973927      1017027173
-./ybin/.arch-ids       1036288552      1017027173
-./ybin/mkofboot        1035973927      1030918600
-./ybin/ofpath  1036288387      1036288537
-./ybin/yabootconfig    1035973927      1033252801
-./ybin/ybin    1035973927      1035678761
-./ybin 1036288552      1036288537
-./Config       1035973921      1002101497
-./0arch-timestamps0    1035973920      1036288552
-./ChangeLog    1035973937      1035973937
-./BUGS 1035973920      1000991730
-./COPYING      1035973921      1000991730
-./INSTALL      1035973921      1000991730
-./Makefile     1035973921      1035678742
-./README       1035973921      1033253141
-./README.man.patch     1035973921      1000991730
-./THANKS       1035973921      1006350263
-./TODO 1035973921      1006527567
-./changelog    1035973921      1033275819
-./man.patch    1035973925      1006348761
-.      1036288551      1035973963
+./include/xfs/.arch-ids/=id    1036385859      1017069090
+./include/xfs/.arch-ids/xfs.h.id       1036385859      1017069096
+./include/xfs/.arch-ids        1037498311      1017069096
+./include/xfs/xfs.h    1036385859      1002101334
+./include/xfs  1037498311      1007269244
+./include/.arch-ids/errors.h.id        1036385857      1017069108
+./include/.arch-ids/=id        1036385857      1017027153
+./include/.arch-ids/bootinfo.h.id      1036385857      1017027154
+./include/.arch-ids/byteorder.h.id     1036385857      1017027154
+./include/.arch-ids/cfg.h.id   1036385857      1017027154
+./include/.arch-ids/cmdline.h.id       1036385857      1017027154
+./include/.arch-ids/ctype.h.id 1036385857      1017027155
+./include/.arch-ids/fdisk-part.h.id    1036385857      1017027157
+./include/.arch-ids/file.h.id  1036385857      1017027157
+./include/.arch-ids/fs.h.id    1036385857      1017027157
+./include/.arch-ids/mac-part.h.id      1036385857      1017027159
+./include/.arch-ids/md5.h.id   1036385857      1017027159
+./include/.arch-ids/partition.h.id     1036385857      1017027159
+./include/.arch-ids/prom.h.id  1036385857      1017027159
+./include/.arch-ids/setjm2.h.id        1036385857      1017027160
+./include/.arch-ids/setjmp.h.id        1036385857      1017027160
+./include/.arch-ids/stdlib.h.id        1036385857      1017027161
+./include/.arch-ids/string.h.id        1036385857      1017027161
+./include/.arch-ids/swab.h.id  1036385857      1017027161
+./include/.arch-ids/types.h.id 1036385857      1017027162
+./include/.arch-ids/yaboot.h.id        1036385857      1017027162
+./include/.arch-ids/debug.h.id 1036385857      1017154770
+./include/.arch-ids    1037498311      1017154770
+./include/asm/.arch-ids/=id    1036385857      1017027153
+./include/asm/.arch-ids/elf.h.id       1036385857      1017027153
+./include/asm/.arch-ids/ppc_asm.tmpl.id        1036385857      1017027153
+./include/asm/.arch-ids/processor.h.id 1036385857      1017027154
+./include/asm/.arch-ids        1037498311      1017027154
+./include/asm/elf.h    1036385857      1000991730
+./include/asm/ppc_asm.tmpl     1036385857      1000991730
+./include/asm/processor.h      1036385858      1000991730
+./include/asm  1037498311      1007269243
+./include/et/.arch-ids/=id     1036385858      1017027155
+./include/et/.arch-ids/com_err.h.id    1036385858      1017027155
+./include/et/.arch-ids 1037498311      1017155400
+./include/et/com_err.h 1036385858      1000991731
+./include/et   1037498311      1007269243
+./include/ext2fs/.arch-ids/=id 1036385858      1017027156
+./include/ext2fs/.arch-ids/bitops.h.id 1036385858      1017027156
+./include/ext2fs/.arch-ids/ext2_err.h.id       1036385858      1017027156
+./include/ext2fs/.arch-ids/ext2_io.h.id        1036385858      1017027156
+./include/ext2fs/.arch-ids/ext2fs.h.id 1036385858      1017027156
+./include/ext2fs/.arch-ids     1037498311      1017027156
+./include/ext2fs/bitops.h      1036385858      1003927524
+./include/ext2fs/ext2_err.h    1036385858      1003927524
+./include/ext2fs/ext2_io.h     1036385858      1003927524
+./include/ext2fs/ext2fs.h      1036385858      1003927524
+./include/ext2fs       1037498311      1007269243
+./include/linux/.arch-ids/=id  1036385858      1017027157
+./include/linux/.arch-ids/elf.h.id     1036385858      1017027158
+./include/linux/.arch-ids/ext2_fs.h.id 1036385858      1017027158
+./include/linux/.arch-ids/iso_fs.h.id  1036385858      1017027158
+./include/linux/.arch-ids/stat.h.id    1036385858      1017027158
+./include/linux/.arch-ids/types.h.id   1036385858      1017027159
+./include/linux/.arch-ids      1037498311      1017027159
+./include/linux/elf.h  1036385859      1000991731
+./include/linux/ext2_fs.h      1036385859      1000991731
+./include/linux/iso_fs.h       1036385859      1000991731
+./include/linux/stat.h 1036385859      1000991731
+./include/linux/types.h        1036385859      1000991731
+./include/linux        1037498311      1007269243
+./include/reiserfs/.arch-ids/=id       1036385859      1017027160
+./include/reiserfs/.arch-ids/reiserfs.h.id     1036385859      1017027160
+./include/reiserfs/.arch-ids   1037498311      1017027160
+./include/reiserfs/reiserfs.h  1036385859      1025684115
+./include/reiserfs     1037498311      1025684115
+./include/errors.h     1036385858      1007200690
+./include/bootinfo.h   1036385858      1007200690
+./include/byteorder.h  1036385858      1000991730
+./include/cfg.h        1036385858      1007200690
+./include/cmdline.h    1036385858      1007200690
+./include/ctype.h      1036385858      1003656411
+./include/fdisk-part.h 1036385858      1007200690
+./include/file.h       1036385858      1007200690
+./include/fs.h 1036385858      1007200690
+./include/mac-part.h   1036385859      1007200690
+./include/md5.h        1036385859      1000991730
+./include/partition.h  1036385859      1007200690
+./include/prom.h       1036385859      1007200690
+./include/setjm2.h     1036385859      1000991730
+./include/setjmp.h     1036385859      1000991730
+./include/stdlib.h     1036385859      1000991730
+./include/string.h     1036385859      1002620217
+./include/swab.h       1036385859      1000991730
+./include/types.h      1036385859      1000991730
+./include/yaboot.h     1036385859      1007200690
+./include/debug.h      1036385858      1007200690
+./include      1037498311      1007269244
+./second/.arch-ids/fs_xfs.c.id 1036385861      1017069120
+./second/.arch-ids/=id 1036385860      1017027166
+./second/.arch-ids/cache.S.id  1036385860      1017027167
+./second/.arch-ids/cfg.c.id    1036385860      1017027167
+./second/.arch-ids/cmdline.c.id        1036385860      1017027167
+./second/.arch-ids/crt0.S.id   1036385861      1017027167
+./second/.arch-ids/file.c.id   1036385861      1017027167
+./second/.arch-ids/fs.c.id     1036385861      1017027168
+./second/.arch-ids/fs_ext2.c.id        1036385861      1017027168
+./second/.arch-ids/fs_iso.c.id 1036385861      1017027168
+./second/.arch-ids/fs_of.c.id  1036385861      1017027168
+./second/.arch-ids/fs_reiserfs.c.id    1036385861      1017027169
+./second/.arch-ids/iso_util.c.id       1036385861      1017027170
+./second/.arch-ids/md5.c.id    1036385861      1017027170
+./second/.arch-ids/partition.c.id      1036385861      1017027170
+./second/.arch-ids/prom.c.id   1036385861      1017027170
+./second/.arch-ids/setjmp.S.id 1036385861      1017027171
+./second/.arch-ids/yaboot.c.id 1036385861      1017027171
+./second/.arch-ids     1037498311      1017069120
+./second/fs_xfs.c      1036385861      1032059541
+./second/cache.S       1036385861      1007200690
+./second/cfg.c 1036385861      1007200690
+./second/cmdline.c     1036385861      1032059589
+./second/crt0.S        1036385861      1000991731
+./second/file.c        1036385861      1032059581
+./second/fs.c  1036385861      1032059574
+./second/fs_ext2.c     1036385861      1032059564
+./second/fs_iso.c      1036385861      1007200690
+./second/fs_of.c       1036385861      1032059553
+./second/fs_reiserfs.c 1036385861      1007200690
+./second/iso_util.c    1036385861      1003656415
+./second/md5.c 1036385861      1032059532
+./second/partition.c   1036385861      1032059525
+./second/prom.c        1036385861      1032059515
+./second/setjmp.S      1036385861      1000991732
+./second/yaboot.c      1036385862      1032059504
+./second       1037498311      1032765950
+./.arch-ids/Config.id  1036385855      1017069133
+./.arch-ids/0arch-timestamps0.id       1036385854      1020516949
+./.arch-ids/ChangeLog.id       1036385855      1017026820
+./.arch-ids/BUGS.id    1036385855      1017027147
+./.arch-ids/COPYING.id 1036385855      1017027147
+./.arch-ids/INSTALL.id 1036385855      1017027147
+./.arch-ids/Makefile.id        1036385855      1017027148
+./.arch-ids/README.id  1036385855      1017027148
+./.arch-ids/README.man.patch.id        1036385855      1017027148
+./.arch-ids/THANKS.id  1036385855      1017027148
+./.arch-ids/TODO.id    1036385855      1017027149
+./.arch-ids/changelog.id       1036385855      1017027149
+./.arch-ids/man.patch.id       1036385855      1017027166
+./.arch-ids    1037498311      1020516949
+./doc/.arch-ids/=id    1036385855      1017027149
+./doc/.arch-ids/README.ofboot.id       1036385855      1017027149
+./doc/.arch-ids/README.ofpath.id       1036385856      1017027149
+./doc/.arch-ids/README.rs6000.id       1036385856      1017027150
+./doc/.arch-ids/Makefile.id    1036385855      1017235762
+./doc/.arch-ids/yaboot-howto.sgml.id   1036385856      1017235765
+./doc/.arch-ids/yaboot-howto.de.sgml.id        1036385856      1017238100
+./doc/.arch-ids        1037498311      1017238100
+./doc/examples/.arch-ids/=id   1036385856      1017027150
+./doc/examples/.arch-ids/README.dualboot.chrp.id       1036385856      1017027150
+./doc/examples/.arch-ids/README.mbicons.id     1036385856      1017027150
+./doc/examples/.arch-ids/README.simpleboot.chrp.id     1036385856      1017027150
+./doc/examples/.arch-ids/dualboot.chrp.id      1036385856      1017027151
+./doc/examples/.arch-ids/large-penguin.mbicon.id       1036385856      1017027151
+./doc/examples/.arch-ids/simpleboot.chrp.id    1036385856      1017027151
+./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1036385856      1017027151
+./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1036385856      1017027152
+./doc/examples/.arch-ids       1037498311      1017236175
+./doc/examples/README.dualboot.chrp    1036385856      1000991730
+./doc/examples/README.mbicons  1036385856      1000991730
+./doc/examples/README.simpleboot.chrp  1036385856      1000991730
+./doc/examples/dualboot.chrp   1036385856      1000991730
+./doc/examples/large-penguin.mbicon    1036385856      1000991730
+./doc/examples/simpleboot.chrp 1036385856      1006347336
+./doc/examples/yaboot.conf.multi-boot  1036385856      1006348765
+./doc/examples/yaboot.conf.rs6000      1036385856      1006348765
+./doc/examples 1037498311      1007269243
+./doc/README.ofboot    1036385856      1000991730
+./doc/README.ofpath    1036385856      1000991730
+./doc/README.rs6000    1036385856      1007200689
+./doc/Makefile 1036385856      1019310768
+./doc/yaboot-howto.sgml        1036385856      1032059987
+./doc/yaboot-howto.de.sgml     1036385856      1032059970
+./doc  1037498311      1032059987
+./etc/.arch-ids/=id    1036385856      1017027152
+./etc/.arch-ids/yaboot.conf.id 1036385856      1017027152
+./etc/.arch-ids        1037498311      1017027152
+./etc/yaboot.conf      1036385857      1006348765
+./etc  1037498311      1007269243
+./first/.arch-ids/=id  1036385857      1017027152
+./first/.arch-ids/ofboot.id    1036385857      1017027152
+./first/.arch-ids      1037498311      1017027152
+./first/ofboot 1036385857      1032060202
+./first        1037498311      1032060202
+./lib/.arch-ids/=id    1036385859      1017027162
+./lib/.arch-ids/ctype.c.id     1036385859      1017027163
+./lib/.arch-ids/libext2fs.a.id 1036385859      1017027163
+./lib/.arch-ids/malloc.c.id    1036385859      1017027163
+./lib/.arch-ids/nosys.c.id     1036385859      1017027163
+./lib/.arch-ids/string.S.id    1036385859      1017027163
+./lib/.arch-ids/strstr.c.id    1036385859      1017027164
+./lib/.arch-ids/strtol.c.id    1036385859      1017027164
+./lib/.arch-ids/vsprintf.c.id  1036385859      1017027164
+./lib/.arch-ids        1037498311      1017027164
+./lib/ctype.c  1036385859      1000991731
+./lib/libext2fs.a      1036385860      1003927524
+./lib/malloc.c 1036385860      1007200690
+./lib/nosys.c  1036385860      1000991731
+./lib/string.S 1036385860      1007200690
+./lib/strstr.c 1036385860      1000991731
+./lib/strtol.c 1036385860      1000991731
+./lib/vsprintf.c       1036385860      1000991731
+./lib  1037498311      1014816709
+./man/.arch-ids/=id    1036385860      1017027164
+./man/.arch-ids/bootstrap.8.id 1036385860      1017027165
+./man/.arch-ids/mkofboot.8.id  1036385860      1017027165
+./man/.arch-ids/ofpath.8.id    1036385860      1017027165
+./man/.arch-ids/yaboot.8.id    1036385860      1017027165
+./man/.arch-ids/yaboot.conf.5.id       1036385860      1017027166
+./man/.arch-ids/yabootconfig.8.id      1036385860      1017027166
+./man/.arch-ids/ybin.8.id      1036385860      1017027166
+./man/.arch-ids        1037498311      1017027166
+./man/bootstrap.8      1036385860      1000991731
+./man/mkofboot.8       1036385860      1006348765
+./man/ofpath.8 1036385860      1000991731
+./man/yaboot.8 1036385860      1006348765
+./man/yaboot.conf.5    1036385860      1004256691
+./man/yabootconfig.8   1036385860      1027929577
+./man/ybin.8   1036385860      1006348765
+./man  1037498311      1027929577
+./util/.arch-ids/=id   1036385862      1017027171
+./util/.arch-ids/addnote.c.id  1036385862      1017027171
+./util/.arch-ids/elfextract.c.id       1036385862      1017027172
+./util/.arch-ids       1037498311      1017027172
+./util/addnote.c       1036385862      1007200691
+./util/elfextract.c    1036385862      1007303237
+./util 1037498311      1014816709
+./ybin/.arch-ids/=id   1036385862      1017027172
+./ybin/.arch-ids/mkofboot.id   1036385862      1017027172
+./ybin/.arch-ids/ofpath.id     1036385862      1017027172
+./ybin/.arch-ids/yabootconfig.id       1036385862      1017027172
+./ybin/.arch-ids/ybin.id       1036385862      1017027173
+./ybin/.arch-ids       1037498311      1017027173
+./ybin/mkofboot        1037497863      1030918600
+./ybin/ofpath  1037498135      1037498263
+./ybin/yabootconfig    1036385862      1033252801
+./ybin/ybin    1036385862      1035678761
+./ybin 1037498311      1037498263
+./Config       1036385884      1002101497
+./0arch-timestamps0    1036385855      1037498311
+./ChangeLog    1036385855      1036288830
+./BUGS 1036385855      1000991730
+./COPYING      1036385855      1000991730
+./INSTALL      1036385855      1000991730
+./README       1036385855      1033253141
+./README.man.patch     1036385855      1000991730
+./THANKS       1036385855      1006350263
+./TODO 1036385855      1006527567
+./changelog    1036385855      1033275819
+./man.patch    1036385860      1006348761
+./Makefile     1036385884      1035678742
+.      1037498311      1036385885

diff --git a/ChangeLog b/ChangeLog
index 84aec12af802f2e5dd149f30faa697f022b34824..b4f62a5d2748bc7b127a5ead0ca9956bc2686ffa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2002-11-17 02:02:17 GMT        Ethan Benson <erbenson@alaska.net>      patch-38
+
+    Summary:
+      Add support for pci-ide to ofpath
+    Revision:
+      yaboot--devel--1.3--patch-38
+
+    * ofpath: Support multi-channel pci-ide devices, found in the Xserve.
+
+    modified files:
+     0arch-timestamps0 ChangeLog ybin/ofpath
+
+
 2002-11-03 02:00:27 GMT        Ethan Benson <erbenson@alaska.net>      patch-37
 
     Summary:

diff --git a/ybin/ofpath b/ybin/ofpath
index 19e9f565ec97d2607350e51fb030513586b845e8..981da9d22b4cdaf0ea28e45f43cb106e6668e0e8 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-patch-37
+VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-patch-38
 DEBUG=0
 export LC_COLLATE=C
 
@@ -332,19 +332,37 @@ ide_ofpath()
                ;;
        esac
     else
-       local DEVSPEC="$OF1275IDE"
+       local DEVSPEC="$(cat $OF1275IDE)"
        [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"
        if [ -z "$DEVSPEC" ] ; then
            echo 1>&2 "$PRG: KERNEL BUG: $OF1275IDE exists, but is empty"
            return 1
        fi
+
+       case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
+           ata)
+               local CHANNEL=""
+               ;;
+           pci-ata)
+               if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
+                   echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
+                   return 1
+               fi
+               local CHANNEL="/@$(cat /proc/ide/${IDEBUS}/channel)"
+               ;;
+           *)
+               echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+               return 1
+               ;;
+       esac
+
        case "$DEVNODE" in
            hda|hdc|hde|hdg|hdi)
-               echo "${DEVSPEC}/disk@0:$PARTITION"
+               echo "${DEVSPEC}${CHANNEL}/disk@0:$PARTITION"
                return 0
                ;;
            hdb|hdd|hdf|hdh|hdj)
-               echo "${DEVSPEC}/disk@1:$PARTITION"
+               echo "${DEVSPEC}${CHANNEL}/disk@1:$PARTITION"
                return 0
                ;;
            *)