hwpack: requiring a backup mirror for all will be too painful

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

hwpack/am335x-bone.conf

@@ -9,8 +9,7 @@ SYSTEM="bone_dtb"
 #ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
 #ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
 
-bootloader_primary_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-#bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
 bootloader_latest_file="bootloader-ng"
 
 bootloader_location="fatfs_boot"

hwpack/docs.txt

@@ -7,7 +7,7 @@ So, the plan for <device>.conf.. Ignore [] seperaters when creating your own *.c
 #Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7
 #        --dtb omap3-beagle-xm (BeagleBoard xM:supported)
 
-[(2) Bootloader]
+[(2) Bootloader TI/OMAP]
 [FIXME: website address, should be defined as a variable...]
 [For the xM: http://rcn-ee.net/deb/tools/latest/bootloader-ng ]
 [format of file:]
@@ -29,4 +29,32 @@ boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
 
+[(3) Partition Setup]
+[imx and a mainline u-boot]
+
+bootloader_location="dd_uboot_boot"
+dd_uboot_seek="1"
+dd_uboot_bs="1024"
+boot_partition_size="64"
+boot_startmb="2"
+unset spl_name
+boot_name="u-boot.imx"
+
+boot_image="bootz"
+boot_script="uEnv.txt"
+boot_fstype="ext2"
+
+[(4) Kernel Setup]
+
+#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
+kernel_subarch="omap-psp"
+kernel_repo="TESTING"
+
+kernel_addr="0x80300000"
+initrd_addr="0x81600000"
+load_addr="0x80008000"
+dtb_addr="0x815f0000"
+dtb_file="am335x-bone.dtb"
+
+
 [more to come...]

hwpack/imx51-babbage.conf

@@ -9,8 +9,7 @@ SYSTEM="mx51evk"
 #ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
 #ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
 
-bootloader_primary_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-#bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
 bootloader_latest_file="bootloader-ng"
 
 bootloader_location="dd_uboot_boot"

hwpack/imx53-qsb.conf

@@ -9,8 +9,7 @@ SYSTEM="mx53loco_dtb"
 #ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
 #ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
 
-bootloader_primary_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-#bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
 bootloader_latest_file="bootloader-ng"
 
 bootloader_location="dd_uboot_boot"

hwpack/omap3-beagle-xm.conf

@@ -9,8 +9,7 @@ SYSTEM="beagle_xm"
 #ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
 #ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
 
-bootloader_primary_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-#bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
 bootloader_latest_file="bootloader-ng"
 
 bootloader_location="fatfs_boot"

hwpack/omap4-panda.conf

@@ -9,8 +9,7 @@ SYSTEM="panda"
 #ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
 #ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
 
-bootloader_primary_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-#bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
 bootloader_latest_file="bootloader-ng"
 
 bootloader_location="fatfs_boot"

mk_mmc.sh

@@ -27,7 +27,6 @@
 #uEnv.txt bootscript support
 
 MIRROR="http://rcn-ee.net/deb"
-BACKUP_MIRROR="http://rcn-ee.homeip.net:81/dl/mirrors/deb"
 
 BOOT_LABEL="boot"
 PARTITION_PREFIX=""
@@ -193,28 +192,15 @@ function dl_bootloader {
 	echo "Downloading Device's Bootloader"
 	echo "-----------------------------"
 	minimal_boot="1"
-	#Mirror changes: so need a release where we do this..
-	#unset disable_mirror
-	disable_mirror=1 
 
 	mkdir -p ${TEMPDIR}/dl/${DISTARCH}
 	mkdir -p "${DIR}/dl/${DISTARCH}"
 
-	unset RCNEEDOWN
+	wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${bootloader_http}/${bootloader_latest_file}
-	if [ "${disable_mirror}" ] ; then
-		wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${bootloader_primary_http}/${bootloader_latest_file}
-	else
-		echo "attempting to use rcn-ee.net for dl files [10 second time out]..."
-		wget -T 10 -t 1 --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${bootloader_primary_http}/${bootloader_latest_file}
-	fi
 
 	if [ ! -f ${TEMPDIR}/dl/${bootloader_latest_file} ] ; then
-		if [ "${disable_mirror}" ] ; then
+		echo "error: can't connect to rcn-ee.net, retry in a few minutes..."
-			echo "error: can't connect to rcn-ee.net, retry in a few minutes (backup mirror down)"
+		exit
-			exit
-		else
-			wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${bootloader_backukp_http}/${bootloader_latest_file}
-		fi
 	fi
 
 	boot_version=$(cat ${TEMPDIR}/dl/${bootloader_latest_file} | grep "VERSION:" | awk -F":" '{print $2}')
@@ -265,19 +251,11 @@ function dl_kernel_image {
 	if [ ! "${KERNEL_DEB}" ] ; then
 		wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}/${DISTARCH}/LATEST-${kernel_subarch}
 
-		if [ "$RCNEEDOWN" ] ; then
-			sed -i -e "s/rcn-ee.net/rcn-ee.homeip.net:81/g" ${TEMPDIR}/dl/LATEST-${kernel_subarch}
-			sed -i -e 's:81/deb/:81/dl/mirrors/deb/:g' ${TEMPDIR}/dl/LATEST-${kernel_subarch}
-		fi
-
 		FTP_DIR=$(cat ${TEMPDIR}/dl/LATEST-${kernel_subarch} | grep "ABI:1 ${kernel_repo}" | awk '{print $3}')
-		if [ "$RCNEEDOWN" ] ; then
+
-			#http://rcn-ee.homeip.net:81/dl/mirrors/deb/squeeze-armel/v3.2.6-x4/install-me.sh
+		#http://rcn-ee.net/deb/squeeze-armel/v3.2.6-x4/install-me.sh
-			FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $8}')
+		FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
-		else
+
-			#http://rcn-ee.net/deb/squeeze-armel/v3.2.6-x4/install-me.sh
-			FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
-		fi
 		KERNEL=$(echo ${FTP_DIR} | sed 's/v//')
 
 		wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}/${DISTARCH}/${FTP_DIR}/
@@ -1590,8 +1568,7 @@ function convert_uboot_to_dtb_board {
 
 function check_uboot_type {
 	#New defines for hwpack:
-	bootloader_primary_http="http://rcn-ee.net/deb/tools/latest/"
+	bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-#	bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
 	bootloader_latest_file="bootloader-ng"
 
 	unset IN_VALID_UBOOT