From ef234ca7d5764bc1e93b936e8d61d61d8a0a49cd Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 23 Feb 2011 12:53:59 -0600 Subject: [PATCH] drop lucid, it had bitroted into non working and it only worked on old Bx and Cx boards with nand Signed-off-by: Robert Nelson --- mk_mmc.sh | 40 -------------------------- scripts/dvi-normal-lucid.cmd | 15 ---------- scripts/lucid-tweaks.diff | 51 --------------------------------- scripts/serial-normal-lucid.cmd | 13 --------- 4 files changed, 119 deletions(-) delete mode 100644 scripts/dvi-normal-lucid.cmd delete mode 100644 scripts/lucid-tweaks.diff delete mode 100644 scripts/serial-normal-lucid.cmd diff --git a/mk_mmc.sh b/mk_mmc.sh index 7fd47c3..ebb7832 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -36,7 +36,6 @@ DIST=squeeze BOOT_LABEL=boot PARTITION_PREFIX="" -LUCID_MD5SUM="3ff3802cb191e7745eff595df9be7be6" MAVERICK_MD5SUM="12c0f04da6b8fb118939489f237e4c86" #SQUEEZE_NETIMAGE="current" @@ -119,11 +118,9 @@ function set_defaults { fi if [ "$USB_ROOTFS" ];then - sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/dvi-normal-lucid.cmd sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/dvi-normal-maverick.cmd sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/dvi-normal-squeeze.cmd - sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/serial-normal-lucid.cmd sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/serial-normal-maverick.cmd sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/serial-normal-squeeze.cmd fi @@ -181,11 +178,6 @@ esac KERNEL=${KERNEL_REL}-x${KERNEL_PATCH} case "$DIST" in - lucid) - TEST_MD5SUM=$LUCID_MD5SUM - HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" - wget -c --directory-prefix=${DIR}/dl/${DIST} http://ports.ubuntu.com/pool/universe/m/mtd-utils/mtd-utils_20090606-1_armel.deb - ;; maverick) TEST_MD5SUM=$MAVERICK_MD5SUM HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" @@ -218,19 +210,6 @@ if [ "${FIRMWARE}" ] ; then echo "" case "$DIST" in - lucid) - rm -f ${TEMPDIR}/dl/index.html || true - wget --directory-prefix=${TEMPDIR}/dl/ http://ports.ubuntu.com/pool/main/l/linux-firmware/ - LUCID_FW=$(cat ${TEMPDIR}/dl/index.html | grep 1.34 | grep linux-firmware | grep _all.deb | head -1 | awk -F"\"" '{print $8}') - wget -c --directory-prefix=${DIR}/dl/${DIST} http://ports.ubuntu.com/pool/main/l/linux-firmware/${LUCID_FW} - LUCID_FW=${LUCID_FW##*/} - - rm -f ${TEMPDIR}/dl/index.html || true - wget --directory-prefix=${TEMPDIR}/dl/ http://ports.ubuntu.com/pool/multiverse/l/linux-firmware-nonfree/ - LUCID_NONF_FW=$(cat ${TEMPDIR}/dl/index.html | grep 1.8 | grep linux-firmware-nonfree | grep _all.deb | head -1 | awk -F"\"" '{print $8}') - wget -c --directory-prefix=${DIR}/dl/${DIST} http://ports.ubuntu.com/pool/multiverse/l/linux-firmware-nonfree/${LUCID_NONF_FW} - LUCID_NONF_FW=${LUCID_NONF_FW##*/} - ;; maverick) rm -f ${TEMPDIR}/dl/index.html || true wget --directory-prefix=${TEMPDIR}/dl/ http://ports.ubuntu.com/pool/main/l/linux-firmware/ @@ -304,10 +283,6 @@ function prepare_initrd { if [ "${FIRMWARE}" ] ; then case "$DIST" in - lucid) - sudo dpkg -x ${DIR}/dl/${DIST}/${LUCID_FW} ${TEMPDIR}/initrd-tree - sudo dpkg -x ${DIR}/dl/${DIST}/${LUCID_NONF_FW} ${TEMPDIR}/initrd-tree - ;; maverick) sudo dpkg -x ${DIR}/dl/${DIST}/${MAVERICK_FW} ${TEMPDIR}/initrd-tree sudo dpkg -x ${DIR}/dl/${DIST}/${MAVERICK_NONF_FW} ${TEMPDIR}/initrd-tree @@ -393,12 +368,6 @@ fi cd ${DIR}/ case "$DIST" in - lucid) - #sudo cp -v ${DIR}/scripts/e2fsck.conf ${TEMPDIR}/initrd-tree/etc/e2fsck.conf - sudo cp -v ${DIR}/scripts/flash-kernel.conf ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf - sudo cp -v ${DIR}/scripts/ttyO2.conf ${TEMPDIR}/initrd-tree/etc/ttyO2.conf - sudo dpkg -x ${DIR}/dl/${DIST}/mtd-utils_20090606-1_armel.deb ${TEMPDIR}/initrd-tree - ;; maverick) sudo cp -v ${DIR}/scripts/flash-kernel.conf ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf sudo cp -v ${DIR}/scripts/ttyO2.conf ${TEMPDIR}/initrd-tree/etc/ttyO2.conf @@ -829,11 +798,9 @@ echo "done" function reset_scripts { if [ "$USB_ROOTFS" ];then - sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/dvi-normal-lucid.cmd sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/dvi-normal-maverick.cmd sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/dvi-normal-squeeze.cmd - sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/serial-normal-lucid.cmd sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/serial-normal-maverick.cmd sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/serial-normal-squeeze.cmd fi @@ -923,12 +890,6 @@ function check_distro { unset IN_VALID_DISTRO fi - if test "-$DISTRO_TYPE-" = "-lucid-" - then - DIST=lucid - unset IN_VALID_DISTRO - fi - if test "-$DISTRO_TYPE-" = "-maverick-" then DIST=maverick @@ -964,7 +925,6 @@ required options: Debian: squeeze Ubuntu - lucid maverick --firmware diff --git a/scripts/dvi-normal-lucid.cmd b/scripts/dvi-normal-lucid.cmd deleted file mode 100644 index 0fc7d5e..0000000 --- a/scripts/dvi-normal-lucid.cmd +++ /dev/null @@ -1,15 +0,0 @@ -echo "Debug: Lucid DVI" -if test "${beaglerev}" = "xMA"; then -echo "Kernel is not ready for 1Ghz limiting to 800Mhz" -setenv mpurate 800 -fi -if test "${beaglerev}" = "xMB"; then -echo "Kernel is not ready for 1Ghz limiting to 800Mhz" -setenv mpurate 800 -fi -setenv dvimode 1280x720MR-16@60 -setenv vram 12MB -setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate} -boot - diff --git a/scripts/lucid-tweaks.diff b/scripts/lucid-tweaks.diff deleted file mode 100644 index f3825e4..0000000 --- a/scripts/lucid-tweaks.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh -index 61bc6ae..fea0a1b 100644 ---- a/lib/chroot-setup.sh -+++ b/lib/chroot-setup.sh -@@ -110,6 +110,12 @@ EOF - APT_LISTCHANGES_FRONTEND=none - export APT_LISTCHANGES_FRONTEND - -+ cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf -+ #cp /etc/e2fsck.conf /target/etc/e2fsck.conf -+ mkdir -p /target/etc/init/ -+ -+ cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf -+ - return 0 - } - -@@ -120,6 +126,33 @@ chroot_cleanup () { - mv /target/sbin/initctl.REAL /target/sbin/initctl - fi - -+ if [ -e /target/boot/initrd.img ]; then -+ /usr/sbin/flash_eraseall /dev/mtd2 -+ -+ -+ fi -+ -+ -+ -+ if [ -e /etc/rcn.conf ]; then -+ #mkdir -p /tmp/mmc -+ #mount /dev/mmcblk0p1 /tmp/mmc -+ #cp /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr -+ #cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr -+ #rm -f /tmp/mmc/uInitrd.net -+ #sync -+ #umount /tmp/mmc -+ -+ mkdir -p /target/boot/uboot -+ echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /target/etc/fstab -+ -+ cp -r /lib/modules/`uname -r`/ /target/lib/modules/ -+ cp -r /lib/firmware/ /target/lib/ -+ rm -f /etc/rcn.conf -+ -+ -+ fi -+ - # Undo the mounts done by the packages during installation. - # Reverse sorting to umount the deepest mount points first. - # Items with count of 1 are new. diff --git a/scripts/serial-normal-lucid.cmd b/scripts/serial-normal-lucid.cmd deleted file mode 100644 index 2780bbd..0000000 --- a/scripts/serial-normal-lucid.cmd +++ /dev/null @@ -1,13 +0,0 @@ -echo "Debug: Lucid Serial" -if test "${beaglerev}" = "xMA"; then -echo "Kernel is not ready for 1Ghz limiting to 800Mhz" -setenv mpurate 800 -fi -if test "${beaglerev}" = "xMB"; then -echo "Kernel is not ready for 1Ghz limiting to 800Mhz" -setenv mpurate 800 -fi -setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000' -setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate} -boot -