Magellan Linux

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

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

revision 1847 by niro, Mon Jul 2 13:04:02 2012 UTC revision 1848 by niro, Mon Jul 2 13:07:56 2012 UTC
# Line 112  then Line 112  then
112   lilo=/sbin/zipl   lilo=/sbin/zipl
113   runLilo="yes"   runLilo="yes"
114   isx86=""   isx86=""
115  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]  elif [[ ${ARCH} =~ armv[5|7].*l ]]
116  then  then
117   liloConfig=""   liloConfig=""
118   bootPrefix=/boot   bootPrefix=/boot
# Line 127  then Line 127  then
127   isx86=""   isx86=""
128   if [[ -z ${UBOOT_IMGADDR} ]]   if [[ -z ${UBOOT_IMGADDR} ]]
129   then   then
130   machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')   machine=${MACHINE:-$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')}
131   if [ "${machine}" == "OMAP3 Beagle Board" ] || [ "${machine}" == "OMAP4 Panda board" ]   # A few machines use an alternate kernel load address
132     if [[ "${machine}" =~ ^OMAP[3|4].* ]]
133   then   then
134   ubootAddress=0x80008000   ubootAddress=0x80008000
135     elif [[ "${machine}" =~ ^Efika\ MX.* ]]
136     then
137     ubootAddress=0x90008000
138   else   else
139   ubootAddress=0x00008000   ubootAddress=0x00008000
140   fi   fi

Legend:
Removed from v.1847  
changed lines
  Added in v.1848