diff --git a/mk_mmc.sh b/mk_mmc.sh index a77c994..f371324 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -36,16 +36,20 @@ function dl_xload_uboot { MLO=${MLO##*/} UBOOT=${UBOOT##*/} +rm -f ${DIR}/deploy/${DIST}/initrd.gz || true +KERNEL=${KERNEL_REL}-x${KERNEL_PATCH} + case "$DIST" in lucid) KERNEL=${KERNEL_REL}-l${KERNEL_PATCH} - rm -f ${DIR}/deploy/${DIST}/initrd.gz || true wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ports.ubuntu.com/ubuntu-ports/dists/${DIST}/main/installer-armel/current/images/versatile/netboot/initrd.gz wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ports.ubuntu.com/pool/universe/m/mtd-utils/mtd-utils_20090606-1_armel.deb ;; + maverick) + KERNEL=${KERNEL_REL}-l${KERNEL_PATCH} + wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ports.ubuntu.com/ubuntu-ports/dists/${DIST}/main/installer-armel/current/images/versatile/netboot/initrd.gz + ;; squeeze) - KERNEL=${KERNEL_REL}-x${KERNEL_PATCH} - rm -f ${DIR}/deploy/${DIST}/initrd.gz || true wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ftp.debian.org/debian/dists/${DIST}/main/installer-armel/current/images/versatile/netboot/initrd.gz ;; esac @@ -74,6 +78,19 @@ case "$DIST" in wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ports.ubuntu.com/pool/multiverse/l/linux-firmware-nonfree/${LUCID_NONF_FW} LUCID_NONF_FW=${LUCID_NONF_FW##*/} ;; + maverick) + rm -f ${DIR}/deploy/index.html || true + wget --directory-prefix=${DIR}/deploy/ http://ports.ubuntu.com/pool/main/l/linux-firmware/ + MAVERICK_FW=$(cat ${DIR}/deploy/index.html | grep 1.38 | grep linux-firmware | grep _all.deb | head -1 | awk -F"\"" '{print $8}') + wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ports.ubuntu.com/pool/main/l/linux-firmware/${MAVERICK_FW} + MAVERICK_FW=${MAVERICK_FW##*/} + + rm -f ${DIR}/deploy/index.html || true + wget --directory-prefix=${DIR}/deploy/ http://ports.ubuntu.com/pool/multiverse/l/linux-firmware-nonfree/ + MAVERICK_NONF_FW=$(cat ${DIR}/deploy/index.html | grep 1.9 | grep linux-firmware-nonfree | grep _all.deb | head -1 | awk -F"\"" '{print $8}') + wget -c --directory-prefix=${DIR}/deploy/${DIST} http://ports.ubuntu.com/pool/multiverse/l/linux-firmware-nonfree/${MAVERICK_NONF_FW} + MAVERICK_NONF_FW=${MAVERICK_NONF_FW##*/} + ;; squeeze) #from: http://packages.debian.org/source/squeeze/firmware-nonfree @@ -132,6 +149,10 @@ case "$DIST" in sudo dpkg -x ${DIR}/deploy/${DIST}/${LUCID_FW} ${DIR}/initrd-tree sudo dpkg -x ${DIR}/deploy/${DIST}/${LUCID_NONF_FW} ${DIR}/initrd-tree ;; + maverick) + sudo dpkg -x ${DIR}/deploy/${DIST}/${MAVERICK_FW} ${DIR}/initrd-tree + sudo dpkg -x ${DIR}/deploy/${DIST}/${MAVERICK_NONF_FW} ${DIR}/initrd-tree + ;; squeeze) #from: http://packages.debian.org/source/squeeze/firmware-nonfree sudo dpkg -x ${DIR}/deploy/${DIST}/${ATMEL_FW} ${DIR}/initrd-tree @@ -194,6 +215,10 @@ case "$DIST" in sudo cp -v ${DIR}/scripts/ttyS2.conf ${DIR}/initrd-tree/etc/ttyS2.conf sudo dpkg -x ${DIR}/deploy/${DIST}/mtd-utils_20090606-1_armel.deb ${DIR}/initrd-tree ;; + maverick) + 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 + ;; squeeze) sudo cp -v ${DIR}/scripts/e2fsck.conf ${DIR}/initrd-tree/etc/e2fsck.conf ;; @@ -441,6 +466,12 @@ function check_distro { unset IN_VALID_DISTRO fi + if test "-$DISTRO_TYPE-" = "-maverick-" + then + DIST=maverick + unset IN_VALID_DISTRO + fi + # if test "-$DISTRO_TYPE-" = "-sid-" # then # DIST=sid @@ -465,6 +496,7 @@ required options: squeeze Ubuntu lucid + maverick --firmware Add distro firmware diff --git a/scripts/dvi-normal-maverick.cmd b/scripts/dvi-normal-maverick.cmd new file mode 100644 index 0000000..bfee583 --- /dev/null +++ b/scripts/dvi-normal-maverick.cmd @@ -0,0 +1,10 @@ +if test "${beaglerev}" = "xMA"; 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=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate} +boot + diff --git a/scripts/maverick-tweaks.diff b/scripts/maverick-tweaks.diff new file mode 100644 index 0000000..b1b0d26 --- /dev/null +++ b/scripts/maverick-tweaks.diff @@ -0,0 +1,51 @@ +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/ttyS2.conf /target/etc/init/ttyS2.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 ++ cp /tmp/mmc/uInitrd /tmp/mmc/uInitrd.net ++ cp /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd ++ 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-maverick.cmd b/scripts/serial-normal-maverick.cmd new file mode 100644 index 0000000..d3968b0 --- /dev/null +++ b/scripts/serial-normal-maverick.cmd @@ -0,0 +1,8 @@ +if test "${beaglerev}" = "xMA"; 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=ttyS2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate} +boot +