From 32783f11e67c44c6e43052c0590356dab5ee7120 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 15 Apr 2013 12:44:08 -0500 Subject: [PATCH] BeagleBone: use new features in u-boot: v2013.04-rc2 Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 12 +++++++----- hwpack/am335x-bone-video.conf | 12 +++++++----- hwpack/am335x-boneblack.conf | 14 ++++++++------ hwpack/am335x-evmsk.conf | 12 +++++++----- mk_mmc.sh | 10 ++++++++-- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index b25fede..d8360dd 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -9,7 +9,7 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: bootloader_location="fatfs_boot" -boot_partition_size="64" +boot_partition_size="100" spl_name="MLO" boot_name="u-boot.img" @@ -17,8 +17,8 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" -uboot_SCRIPT_ENTRY="loaduimage" -uboot_CMD_LOAD="fatload" +uboot_SCRIPT_ENTRY="uenvcmd" +uboot_CMD_LOAD="load" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp @@ -28,10 +28,12 @@ kernel_repo="TESTING" usbnet_mem= #Kernel: Bootloader Settings: -conf_loadaddr="0x80300000" -conf_initrdaddr="0x81600000" 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" conf_fdtfile="am335x-bone.dtb" need_dtbs=1 need_am335x_firmware=1 diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index ec7bb6b..09d3689 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -9,7 +9,7 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: bootloader_location="fatfs_boot" -boot_partition_size="64" +boot_partition_size="100" spl_name="MLO" boot_name="u-boot.img" @@ -17,8 +17,8 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" -uboot_SCRIPT_ENTRY="loaduimage" -uboot_CMD_LOAD="fatload" +uboot_SCRIPT_ENTRY="uenvcmd" +uboot_CMD_LOAD="load" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp @@ -28,10 +28,12 @@ kernel_repo="TESTING" usbnet_mem= #Kernel: Bootloader Settings: -conf_loadaddr="0x80300000" -conf_initrdaddr="0x81600000" 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" conf_fdtfile="am335x-bone.dtb" need_dtbs=1 need_am335x_firmware=1 diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index e395122..144db35 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -3,13 +3,13 @@ # --dtb am335x-boneblack (BeagleBone Black (v3.8.x)) #Bootloader: -conf_conf_board="BEAGLEBONE_A" +conf_board="BEAGLEBONE_A" conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: bootloader_location="fatfs_boot" -boot_partition_size="64" +boot_partition_size="100" spl_name="MLO" boot_name="u-boot.img" @@ -17,8 +17,8 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" -uboot_SCRIPT_ENTRY="loaduimage" -uboot_CMD_LOAD="fatload" +uboot_SCRIPT_ENTRY="uenvcmd" +uboot_CMD_LOAD="load" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp @@ -28,10 +28,12 @@ kernel_repo="TESTING" usbnet_mem= #Kernel: Bootloader Settings: -conf_loadaddr="0x80300000" -conf_initrdaddr="0x81600000" 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" conf_fdtfile="am335x-boneblack.dtb" need_dtbs=1 need_am335x_firmware=1 diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf index 1a49da7..00bc0c8 100644 --- a/hwpack/am335x-evmsk.conf +++ b/hwpack/am335x-evmsk.conf @@ -9,7 +9,7 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: bootloader_location="fatfs_boot" -boot_partition_size="64" +boot_partition_size="100" spl_name="MLO" boot_name="u-boot.img" @@ -17,8 +17,8 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" -uboot_SCRIPT_ENTRY="loaduimage" -uboot_CMD_LOAD="fatload" +uboot_SCRIPT_ENTRY="uenvcmd" +uboot_CMD_LOAD="load" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp @@ -28,10 +28,12 @@ kernel_repo="TESTING" usbnet_mem= #Kernel: Bootloader Settings: -conf_loadaddr="0x80300000" -conf_initrdaddr="0x81600000" 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" conf_fdtfile="am335x-evmsk.dtb" need_dtbs=1 need_am335x_firmware=1 diff --git a/mk_mmc.sh b/mk_mmc.sh index 27c5977..c2a0185 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1557,8 +1557,8 @@ function check_uboot_type { ;; bone) need_am335x_firmware="1" - uboot_SCRIPT_ENTRY="loaduimage" - uboot_CMD_LOAD="fatload" + uboot_SCRIPT_ENTRY="uenvcmd" + uboot_CMD_LOAD="load" SYSTEM="bone" conf_board="BEAGLEBONE_A" is_omap @@ -1574,6 +1574,12 @@ 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_dtb) echo "Note: [--dtb am335x-bone-serial] now replaces [--uboot bone_dtb]"