diff options
Diffstat (limited to 'sys-boot/yaboot/files')
| -rw-r--r-- | sys-boot/yaboot/files/sysfs-ofpath.patch | 105 | ||||
| -rw-r--r-- | sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch | 41 |
2 files changed, 0 insertions, 146 deletions
diff --git a/sys-boot/yaboot/files/sysfs-ofpath.patch b/sys-boot/yaboot/files/sysfs-ofpath.patch deleted file mode 100644 index 7ebc0bfac86f..000000000000 --- a/sys-boot/yaboot/files/sysfs-ofpath.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- ybin/ofpath 2008-08-03 04:00:35.000000000 -0400 -+++ ybin/ofpath 2009-01-09 13:46:12.000000000 -0500 -@@ -337,15 +337,18 @@ - - ide_ofpath() - { -- if [ ! -L "/proc/ide/$DEVNODE" ] ; then -+ if [ ! -L "/proc/ide/$DEVNODE" ] && [ ! -e "/sys/block/$DEVNODE" ] ; then - echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured" - return 1 - fi - -- local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )" -- if [ -z "$IDEBUS" ] ; then -- echo 1>&2 "$PRG: BUG: IDEBUS == NULL" -- return 1 -+ if [ -L "/proc/ide/$DEVNODE" ] ; then -+ local USE_OLD_PROC=1 -+ local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )" -+ if [ -z "$IDEBUS" ] ; then -+ echo 1>&2 "$PRG: BUG: IDEBUS == NULL" -+ return 1 -+ fi - fi - - case "$(uname -r)" in -@@ -363,7 +366,8 @@ - echo 1>&2 "$PRG: Unable to determine sysfs mountpoint" - return 1 - fi -- local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec" -+ local OF1275IDE=$(cd -P "${SYS}/block/${DEVNODE}/device" && pwd) -+ OF1275IDE="${OF1275IDE}/../../devspec" - ;; - *) - local OF1275IDE="/proc/ide/$IDEBUS/devspec" -@@ -402,34 +406,41 @@ - return 1 - fi - -- if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then -- echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist" -- return 1 -- fi -- -- case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in -- ide|ata) -- local MASTER="/disk@0" -- local SLAVE="/disk@1" -- ;; -- pci-ide|pci-ata) -- local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0" -- local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1" -- ;; -- scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal. -- local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))" -- local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))" -- ;; -- spi) -- local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0" -- local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1" -- ;; -- *) -- echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\"" -- return 1 -- ;; -- esac -+ -+ if [ "${USE_OLD_PROC}" = "1" ] ; then -+ if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then -+ echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist" -+ return 1 -+ fi - -+ case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in -+ ide|ata) -+ local MASTER="/disk@0" -+ local SLAVE="/disk@1" -+ ;; -+ pci-ide|pci-ata) -+ local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0" -+ local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1" -+ ;; -+ scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal. -+ local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))" -+ local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))" -+ ;; -+ spi) -+ local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0" -+ local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1" -+ ;; -+ *) -+ echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\"" -+ return 1 -+ ;; -+ esac -+ else -+ ### I don't know what other disks would look like... FIXME -+ local MASTER="/disk@0" -+ local SLAVE="/disk@1" -+ fi -+ - case "$DEVNODE" in - hda|hdc|hde|hdg|hdi|hdk|hdm|hdo) - echo "${DEVSPEC}${MASTER}:$PARTITION" diff --git a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch b/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch deleted file mode 100644 index 0fe4e250f292..000000000000 --- a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -uNr yaboot/lib/malloc.c yaboot-1.3.16//lib/malloc.c ---- yaboot/lib/malloc.c 2010-07-09 03:18:17.000000000 +0100 -+++ yaboot-1.3.16//lib/malloc.c 2011-01-23 16:57:13.000000000 +0000 -@@ -42,6 +42,37 @@ - last_alloc = 0; - } - -+static char *align_ptr_to(char *ptr, unsigned long align) -+{ -+ return (char *)((((unsigned long)ptr) + (align - 1UL)) & -+ ~(align - 1UL)); -+} -+ -+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size) -+{ -+ char *caddr; -+ -+ if (alignment & (alignment - 1UL)) -+ return -1; -+ -+ if (alignment & (sizeof(void *) - 1UL)) -+ return -1; -+ -+ if (size == 0) -+ { -+ *memptr = (void *)0; -+ return 0; -+ } -+ -+ caddr = align_ptr_to(malloc_ptr, alignment); -+ malloc_ptr = (caddr + size); -+ last_alloc = caddr; -+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL); -+ -+ *memptr = caddr; -+ return 0; -+} -+ - void *malloc (unsigned int size) - { - char *caddr; |