From c646fb0c7577504257a062ba31ee0c219818d85b Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 2 Jun 2010 18:02:27 -0500 Subject: [PATCH] update to newer 2.6.34 kernel with basic xm support --- mk_mmc.sh | 18 +++++++++--------- scripts/dvi-normal-lucid.cmd | 2 +- scripts/dvi-normal-squeeze.cmd | 2 +- scripts/dvi.cmd | 2 +- scripts/lucid-tweaks.diff | 2 +- scripts/serial-normal-lucid.cmd | 2 +- scripts/serial-normal-squeeze.cmd | 2 +- scripts/serial.cmd | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 503fbcb..c1e4450 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -4,8 +4,8 @@ MIRROR="http://rcn-ee.net/deb/" DIST=squeeze -KERNEL_REL=2.6.32.11 -KERNEL_PATCH=13 +KERNEL_REL=2.6.34 +KERNEL_PATCH=1 unset MMC unset FIRMWARE @@ -54,21 +54,21 @@ function dl_xload_uboot { if [ "${IS_BETA}" ] ; then -KERNEL_REL=2.6.34-rc7 -KERNEL_PATCH=0 +KERNEL_REL=2.6.34 +KERNEL_PATCH=1 if test "-$DIST-" = "-lucid-" then - KERNEL=${KERNEL_REL}-dl${KERNEL_PATCH} + KERNEL=${KERNEL_REL}-l${KERNEL_PATCH} else - KERNEL=${KERNEL_REL}-d${KERNEL_PATCH} + KERNEL=${KERNEL_REL}-x${KERNEL_PATCH} fi wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb else - wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}kernel/beagle/${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb + wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb fi @@ -193,7 +193,7 @@ fi if test "-$DIST-" = "-lucid-" then - sudo cp -v ${DIR}/scripts/e2fsck.conf ${DIR}/initrd-tree/etc/e2fsck.conf + #sudo cp -v ${DIR}/scripts/e2fsck.conf ${DIR}/initrd-tree/etc/e2fsck.conf sudo cp -v ${DIR}/scripts/flash-kernel.conf ${DIR}/initrd-tree/etc/flash-kernel.conf sudo cp -v ${DIR}/scripts/ttyS2.conf ${DIR}/initrd-tree/etc/ttyS2.conf sudo dpkg -x ${DIR}/dl/mtd-utils_20090606-1_armel.deb ${DIR}/initrd-tree @@ -316,7 +316,7 @@ function check_distro { if test "-$DISTRO_TYPE-" = "-squeeze-" then - read -p "Squeeze is in BETA and is not currently released, are you 100% sure you want to try to install it... (y/n)? " + read -p "Squeeze is still in ALPHA/BETA and is not currently released, are you 100% sure you want to try to install it... (y/n)? " [ "$REPLY" == "y" ] || exit DIST=squeeze unset IN_VALID_DISTRO diff --git a/scripts/dvi-normal-lucid.cmd b/scripts/dvi-normal-lucid.cmd index d2351e6..2f3cb46 100644 --- a/scripts/dvi-normal-lucid.cmd +++ b/scripts/dvi-normal-lucid.cmd @@ -1,4 +1,4 @@ setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=tty0 console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro omapfb.mode=dvi:1280x720MR-16@60 fixrtc buddy=${buddy} +setenv bootargs console=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro omapfb.mode=dvi:1280x720MR-16@60 fixrtc buddy=${buddy} mpurate=${mpurate} boot diff --git a/scripts/dvi-normal-squeeze.cmd b/scripts/dvi-normal-squeeze.cmd index c46b5f8..af289d5 100644 --- a/scripts/dvi-normal-squeeze.cmd +++ b/scripts/dvi-normal-squeeze.cmd @@ -1,4 +1,4 @@ setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=tty0 console=ttyS2,115200n8 root=/dev/mmcblk0p2 ro omapfb.mode=dvi:1280x720MR-16@60 buddy=${buddy} +setenv bootargs console=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p2 ro omapfb.mode=dvi:1280x720MR-16@60 buddy=${buddy} mpurate=${mpurate} boot diff --git a/scripts/dvi.cmd b/scripts/dvi.cmd index 5ce65ae..6eb30cd 100644 --- a/scripts/dvi.cmd +++ b/scripts/dvi.cmd @@ -1,4 +1,4 @@ setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=tty0 root=/dev/ram0 rw omapfb.mode=dvi:1280x720MR-16@60 buddy=${buddy} +setenv bootargs console=tty0 root=/dev/ram0 rw omapfb.mode=dvi:1280x720MR-16@60 buddy=${buddy} mpurate=${mpurate} boot diff --git a/scripts/lucid-tweaks.diff b/scripts/lucid-tweaks.diff index bc81030..ec10ff9 100644 --- a/scripts/lucid-tweaks.diff +++ b/scripts/lucid-tweaks.diff @@ -7,7 +7,7 @@ index 61bc6ae..fea0a1b 100644 export APT_LISTCHANGES_FRONTEND + cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf -+ cp /etc/e2fsck.conf /target/etc/e2fsck.conf ++ #cp /etc/e2fsck.conf /target/etc/e2fsck.conf + mkdir -p /target/etc/init/ + cp /etc/ttyS2.conf /target/etc/init/ttyS2.conf + diff --git a/scripts/serial-normal-lucid.cmd b/scripts/serial-normal-lucid.cmd index 723fd8a..f98ca74 100644 --- a/scripts/serial-normal-lucid.cmd +++ b/scripts/serial-normal-lucid.cmd @@ -1,4 +1,4 @@ setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} +setenv bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate} boot diff --git a/scripts/serial-normal-squeeze.cmd b/scripts/serial-normal-squeeze.cmd index 0c573ed..ff21bba 100644 --- a/scripts/serial-normal-squeeze.cmd +++ b/scripts/serial-normal-squeeze.cmd @@ -1,4 +1,4 @@ setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p2 ro buddy=${buddy} +setenv bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p2 ro buddy=${buddy} mpurate=${mpurate} boot diff --git a/scripts/serial.cmd b/scripts/serial.cmd index 44868a8..f153381 100644 --- a/scripts/serial.cmd +++ b/scripts/serial.cmd @@ -1,4 +1,4 @@ setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=ttyS2,115200n8 root=/dev/ram0 rw buddy=${buddy} +setenv bootargs console=ttyS2,115200n8 root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate} boot