bone: use the more reliable memory address (partial revert)

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

hwpack/am335x-bone-serial.conf

@@ -4,7 +4,7 @@
 
 #Bootloader:
 conf_board="BEAGLEBONE_A"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
 conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
@@ -29,12 +29,13 @@ usbnet_mem=
 
 #Kernel: Bootloader Settings:
 conf_zreladdr="0x80008000"
-conf_loadaddr="0x80200000"
+#u-boot: conf_loadaddr="0x80200000" (locksup)
+conf_loadaddr="0x80300000"
 conf_fdtaddr="0x815f0000"
 #u-boot:rdaddr="0x81000000"
 #initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-conf_initrdaddr="0x81000000"
-conf_fdtfile="am335x-bone.dtb"
+#u-boot: conf_initrdaddr="0x81000000" (locksup)
+conf_initrdaddr="0x81600000"
 need_dtbs=1
 need_am335x_firmware=1
 

hwpack/am335x-bone-video.conf

@@ -4,7 +4,7 @@
 
 #Bootloader:
 conf_board="BEAGLEBONE_A"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
 conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
@@ -29,12 +29,13 @@ usbnet_mem=
 
 #Kernel: Bootloader Settings:
 conf_zreladdr="0x80008000"
-conf_loadaddr="0x80200000"
+#u-boot: conf_loadaddr="0x80200000" (locksup)
+conf_loadaddr="0x80300000"
 conf_fdtaddr="0x815f0000"
 #u-boot:rdaddr="0x81000000"
 #initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-conf_initrdaddr="0x81000000"
-conf_fdtfile="am335x-bone.dtb"
+#u-boot: conf_initrdaddr="0x81000000" (locksup)
+conf_initrdaddr="0x81600000"
 need_dtbs=1
 need_am335x_firmware=1
 

hwpack/am335x-boneblack.conf

@@ -29,12 +29,12 @@ usbnet_mem=
 
 #Kernel: Bootloader Settings:
 conf_zreladdr="0x80008000"
-#uboot: conf_loadaddr="0x80200000" (locksup)
+#u-boot: conf_loadaddr="0x80200000" (locksup)
 conf_loadaddr="0x80300000"
 conf_fdtaddr="0x815f0000"
 #u-boot:rdaddr="0x81000000"
 #initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-#u-bot: conf_initrdaddr="0x81000000" (locksup)
+#u-boot: conf_initrdaddr="0x81000000" (locksup)
 conf_initrdaddr="0x81600000"
 conf_fdtfile="am335x-boneblack.dtb"
 need_dtbs=1

hwpack/am335x-evmsk.conf

@@ -4,7 +4,7 @@
 
 #Bootloader:
 conf_board="BEAGLEBONE_A"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
 conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
@@ -29,12 +29,13 @@ usbnet_mem=
 
 #Kernel: Bootloader Settings:
 conf_zreladdr="0x80008000"
-conf_loadaddr="0x80200000"
+#u-boot: conf_loadaddr="0x80200000" (locksup)
+conf_loadaddr="0x80300000"
 conf_fdtaddr="0x815f0000"
 #u-boot:rdaddr="0x81000000"
 #initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-conf_initrdaddr="0x81000000"
-conf_fdtfile="am335x-evmsk.dtb"
+#u-boot: conf_initrdaddr="0x81000000" (locksup)
+conf_initrdaddr="0x81600000"
 need_dtbs=1
 need_am335x_firmware=1
 

mk_mmc.sh

@@ -351,7 +351,7 @@ function boot_uenv_txt_template {
 		__EOF__
 	fi
 
-	if [ "${need_dtbs}" ] ; then
+	if [ "${need_dtbs}" ] && [ "x${conf_board}" != "xBEAGLEBONE_A" ]; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			initrd_high=0xffffffff
 			fdt_high=0xffffffff
@@ -1574,12 +1574,6 @@ function check_uboot_type {
 
 		#just to disable the omapfb stuff..
 		USE_KMS=1
-		conf_zreladdr="0x80008000"
-		conf_loadaddr="0x80200000"
-		conf_fdtaddr="0x815f0000"
-		#u-boot:rdaddr="0x81000000"
-		#initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-		conf_initrdaddr="0x81000000"
 		;;
 	bone-video)
 		need_am335x_firmware="1"
@@ -1598,12 +1592,6 @@ function check_uboot_type {
 
 		#just to disable the omapfb stuff..
 		USE_KMS=1
-		conf_zreladdr="0x80008000"
-		conf_loadaddr="0x80200000"
-		conf_fdtaddr="0x815f0000"
-		#u-boot:rdaddr="0x81000000"
-		#initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-		conf_initrdaddr="0x81000000"
 		;;
 
 	bone_dt|bone_dtb)