boxtec-support
/
netinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uboot when avaiable use uenvcmd by default

Browse Source 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent 2ffa6bf003
commit d51506cb67
17 changed files with 81 additions and 26 deletions
Show Stats Download Patch File Download Diff File

5
hwpack/am335x-bone-serial.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_CMD_BOOTZ=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_fdt_auto_detection=1 uboot_fdt_auto_detection=1
#Kernel: #Kernel:

5
hwpack/am335x-bone-video.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_CMD_BOOTZ=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_fdt_auto_detection=1 uboot_fdt_auto_detection=1
#Kernel: #Kernel:

5
hwpack/am335x-boneblack.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_CMD_BOOTZ=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_fdt_auto_detection=1 uboot_fdt_auto_detection=1
#Kernel: #Kernel:

6
hwpack/docs.txt
Unescape View File

@ -41,9 +41,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="loaduimage"
[(3) Partition Setup] [(3) Partition Setup]
[imx and a mainline u-boot] [imx and a mainline u-boot]
@ -59,7 +62,6 @@ boot_name="u-boot.imx"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
[(4) Kernel Setup] [(4) Kernel Setup]
[Raw Deb file or:] [Raw Deb file or:]

5
hwpack/imx51-babbage.conf
Unescape View File

@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx

5
hwpack/imx53-qsb.conf
Unescape View File

@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx

5
hwpack/imx6q-sabrelite.conf
Unescape View File

@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx

5
hwpack/imx6q-sabresd.conf
Unescape View File

@ -30,9 +30,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx

5
hwpack/omap3-beagle-xm-v3.9-dt.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
#conf_uboot_CONFIG_CMD_FS_GENERIC=1 #conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap

5
hwpack/omap3-beagle-xm.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
#conf_uboot_CONFIG_CMD_FS_GENERIC=1 #conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap

5
hwpack/omap4-panda-a4.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap

5
hwpack/omap4-panda-es.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap

5
hwpack/omap4-panda-v3.9-dt.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap

5
hwpack/omap4-panda.conf
Unescape View File

@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="fat" boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap

5
hwpack/wandboard-dl.conf
Unescape View File

@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx

5
hwpack/wandboard-solo.conf
Unescape View File

@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#allows using "load" over "fatload"/"ext2load" #allows using "load" over "fatload"/"ext2load"
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
#uenvcmd avaiable?
conf_uboot_use_uenvcmd=1
#conf_uboot_no_uenvcmd="loaduimage"
#Bootloader: u-boot settings #Bootloader: u-boot settings
boot_fstype="ext2" boot_fstype="ext2"
uboot_SCRIPT_ENTRY="uenvcmd"
#Kernel: #Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx

26
mk_mmc.sh
Unescape View File

@ -480,27 +480,27 @@ boot_uenv_txt_template () {
if [ ! "${need_dtbs}" ] ; then if [ ! "${need_dtbs}" ] ; then
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
#Classic Board File Boot: #Classic Board File Boot:
${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_entrypt}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
#New Device Tree Boot: #New Device Tree Boot:
#${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} #${conf_entrypt}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_entrypt}=run xyz_message; run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
__EOF__ __EOF__
else else
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
#Classic Board File Boot: #Classic Board File Boot:
#${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} #${conf_entrypt}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
#New Device Tree Boot: #New Device Tree Boot:
${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} ${conf_entrypt}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} ${conf_entrypt}=run xyz_message; run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
__EOF__ __EOF__
fi fi
@ -1220,7 +1220,7 @@ populate_boot () {
echo "boot.scr -> uEnv.txt wrapper..." echo "boot.scr -> uEnv.txt wrapper..."
${conf_fileload} mmc \${mmcdev}:\${mmcpart} \${loadaddr} uEnv.txt ${conf_fileload} mmc \${mmcdev}:\${mmcpart} \${loadaddr} uEnv.txt
env import -t \${loadaddr} \${filesize} env import -t \${loadaddr} \${filesize}
run ${uboot_SCRIPT_ENTRY} run ${conf_entrypt}
__EOF__ __EOF__
mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/boot.scr mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/boot.scr
cp -v ${TEMPDIR}/disk/boot.scr ${TEMPDIR}/disk/backup/boot.scr cp -v ${TEMPDIR}/disk/boot.scr ${TEMPDIR}/disk/backup/boot.scr
@ -1433,6 +1433,12 @@ process_dtb_conf () {
conf_fileload="ext2load" conf_fileload="ext2load"
fi fi
fi fi
if [ "${conf_uboot_use_uenvcmd}" ] ; then
conf_entrypt="uenvcmd"
else
conf_entrypt="${conf_uboot_no_uenvcmd}"
fi
} }
check_dtb_board () { check_dtb_board () {
@ -1542,7 +1548,7 @@ check_uboot_type () {
;; ;;
bone-serial|bone) bone-serial|bone)
need_am335x_firmware="1" need_am335x_firmware="1"
uboot_SCRIPT_ENTRY="uenvcmd" conf_entrypt="uenvcmd"
SYSTEM="bone" SYSTEM="bone"
conf_board="BEAGLEBONE_A" conf_board="BEAGLEBONE_A"
is_omap is_omap
@ -1561,11 +1567,12 @@ check_uboot_type () {
conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host." conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_BOOTZ=1
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
conf_uboot_use_uenvcmd=1
convert_uboot_to_dtb_board convert_uboot_to_dtb_board
;; ;;
bone-video) bone-video)
need_am335x_firmware="1" need_am335x_firmware="1"
uboot_SCRIPT_ENTRY="uenvcmd" conf_entrypt="uenvcmd"
SYSTEM="bone" SYSTEM="bone"
conf_board="BEAGLEBONE_A" conf_board="BEAGLEBONE_A"
is_omap is_omap
@ -1582,6 +1589,7 @@ check_uboot_type () {
conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host." conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_BOOTZ=1
conf_uboot_CONFIG_CMD_FS_GENERIC=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1
conf_uboot_use_uenvcmd=1
convert_uboot_to_dtb_board convert_uboot_to_dtb_board
;; ;;
bone_dt|bone_dtb) bone_dt|bone_dtb)

Write Preview
Loading…
Cancel
Save