Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/new-kernel-pkg

    Diff of /trunk/grubby/new-kernel-pkg

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1842 by niro, Mon Apr 16 17:51:27 2012 UTC revision 1843 by niro, Mon Jul 2 12:58:29 2012 UTC
    # Line 114  then Line 114  then
    114   isx86=""   isx86=""
    115  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
    116  then  then
      machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')  
    117   liloConfig=""   liloConfig=""
    118   bootPrefix=/boot   bootPrefix=/boot
    119   ubootDir=${UBOOT_DIR:-"/boot/uboot"}   ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    # Line 126  then Line 125  then
    125   mounted=""   mounted=""
    126   liloFlag=""   liloFlag=""
    127   isx86=""   isx86=""
    128   if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]   if [[ -z ${UBOOT_IMGADDR} ]]
    129   then   then
    130   ubootAddress=0x80008000   machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
    131     if [ "${machine}" == "OMAP3 Beagle Board" ] || [ "${machine}" == "OMAP4 Panda board" ]
    132     then
    133     ubootAddress=0x80008000
    134     else
    135     ubootAddress=0x00008000
    136     fi
    137   else   else
    138   ubootAddress=0x00008000   ubootAddress="${UBOOT_IMGADDR}"
    139   fi   fi
    140  else  else
    141   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    Legend:
    Removed from v.1842  
    changed lines
      Added in v.1843