u-boot bootz testing, add two temp bootz targets

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/8/head
Robert Nelson 13 years ago
parent 421202ae0b
commit f995558585

@ -521,40 +521,64 @@ function boot_uenv_txt_template {
__EOF__ __EOF__
fi fi
if [ ! "${USE_ZIMAGE}" ] ; then
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
bootfile=uImage.net
bootinitrd=uInitrd.net
boot=bootm
__EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
bootfile=uImage
bootinitrd=uInitrd
boot=bootm
__EOF__
else
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
bootfile=zImage.net
bootinitrd=initrd.net
boot=bootz
__EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
bootfile=zImage
bootinitrd=initrd.img
boot=bootz
__EOF__
fi
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
bootfile=uImage.net address_image=IMAGE_ADDR
bootinitrd=uInitrd.net address_initrd=INITRD_ADDR
address_uimage=UIMAGE_ADDR
address_uinitrd=UINITRD_ADDR
console=DICONSOLE console=DICONSOLE
mmcroot=/dev/ram0 rw mmcroot=/dev/ram0 rw
xyz_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile} xyz_load_image=fatload mmc 0:1 \${address_image} \${bootfile}
xyz_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd} xyz_load_initrd=fatload mmc 0:1 \${address_initrd} \${bootinitrd}
xyz_mmcboot=run xyz_load_uimage; run xyz_load_uinitrd; echo Booting from mmc ... xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} \${device_args} mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} \${device_args}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
bootfile=uImage address_image=IMAGE_ADDR
bootinitrd=uInitrd address_initrd=INITRD_ADDR
address_uimage=UIMAGE_ADDR
address_uinitrd=UINITRD_ADDR
console=SERIAL_CONSOLE console=SERIAL_CONSOLE
mmcroot=FINAL_PART ro mmcroot=FINAL_PART ro
mmcrootfstype=FINAL_FSTYPE rootwait fixrtc mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
xyz_load_uimage=fatload mmc 0:1 \${address_uimage} \${bootfile} xyz_load_image=fatload mmc 0:1 \${address_image} \${bootfile}
xyz_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd} xyz_load_initrd=fatload mmc 0:1 \${address_initrd} \${bootinitrd}
xyz_mmcboot=run xyz_load_uimage; run xyz_load_uinitrd; echo Booting from mmc ... xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} \${device_args} mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} \${device_args}
@ -578,55 +602,83 @@ function boot_uenv_txt_template {
beagle_bx|beagle_cx) beagle_bx|beagle_cx)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5 deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5 deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__ __EOF__
;; ;;
beagle_xm) beagle_xm)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
optargs=VIDEO_CONSOLE
deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__
;;
beagle_xm_zimage)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}:\${filesize}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}:\${filesize}
__EOF__ __EOF__
;; ;;
igepv2|crane|panda|panda_es|mx51evk|mx53loco) igepv2|crane|panda|panda_es|mx51evk|mx53loco)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
deviceargs=setenv device_args deviceargs=setenv device_args
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
deviceargs=setenv device_args deviceargs=setenv device_args
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__
;;
panda_es_zimage)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
deviceargs=setenv device_args
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}:\${filesize}
__EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
optargs=VIDEO_CONSOLE
deviceargs=setenv device_args
loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}:\${filesize}
__EOF__ __EOF__
;; ;;
bone) bone)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
deviceargs=setenv device_args ip=\${ip_method} deviceargs=setenv device_args ip=\${ip_method}
mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
deviceargs=setenv device_args ip=\${ip_method} deviceargs=setenv device_args ip=\${ip_method}
mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd} mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} \${address_image} \${address_initrd}
__EOF__ __EOF__
;; ;;
@ -663,11 +715,11 @@ function tweak_boot_scripts {
VIDEO_OMAPFB_MODE=tv VIDEO_OMAPFB_MODE=tv
fi fi
#Set uImage boot address #Set kernel boot address
sed -i -e 's:UIMAGE_ADDR:'$UIMAGE_ADDR':g' ${TEMPDIR}/bootscripts/*.cmd sed -i -e 's:IMAGE_ADDR:'$IMAGE_ADDR':g' ${TEMPDIR}/bootscripts/*.cmd
#Set uInitrd boot address #Set initrd boot address
sed -i -e 's:UINITRD_ADDR:'$UINITRD_ADDR':g' ${TEMPDIR}/bootscripts/*.cmd sed -i -e 's:INITRD_ADDR:'$INITRD_ADDR':g' ${TEMPDIR}/bootscripts/*.cmd
#Set the Serial Console #Set the Serial Console
sed -i -e 's:SERIAL_CONSOLE:'$SERIAL_CONSOLE':g' ${TEMPDIR}/bootscripts/*.cmd sed -i -e 's:SERIAL_CONSOLE:'$SERIAL_CONSOLE':g' ${TEMPDIR}/bootscripts/*.cmd
@ -1456,8 +1508,8 @@ function is_omap {
SPL_BOOT=1 SPL_BOOT=1
SUBARCH="omap" SUBARCH="omap"
UIMAGE_ADDR="0x80300000" IMAGE_ADDR="0x80300000"
UINITRD_ADDR="0x81600000" INITRD_ADDR="0x81600000"
ZRELADD="0x80008000" ZRELADD="0x80008000"
@ -1493,6 +1545,7 @@ function check_uboot_type {
unset DO_UBOOT unset DO_UBOOT
unset IN_VALID_UBOOT unset IN_VALID_UBOOT
unset SMSC95XX_MOREMEM unset SMSC95XX_MOREMEM
unset USE_ZIMAGE
case "${UBOOT_TYPE}" in case "${UBOOT_TYPE}" in
beagle_bx) beagle_bx)
@ -1525,6 +1578,15 @@ function check_uboot_type {
SERIAL="ttyO2" SERIAL="ttyO2"
is_omap is_omap
;; ;;
beagle_xm_zimage)
SYSTEM="beagle_xm_zimage"
DO_UBOOT=1
BOOTLOADER="BEAGLEBOARD_XM"
SERIAL="ttyO2"
is_omap
USE_BETA_BOOTLOADER=1
USE_ZIMAGE=1
;;
beagle_xm_kms) beagle_xm_kms)
SYSTEM="beagle_xm" SYSTEM="beagle_xm"
DO_UBOOT=1 DO_UBOOT=1
@ -1580,6 +1642,17 @@ function check_uboot_type {
VIDEO_OMAP_RAM="16MB" VIDEO_OMAP_RAM="16MB"
KMS_VIDEOB="video=HDMI-A-1" KMS_VIDEOB="video=HDMI-A-1"
;; ;;
panda_es_zimage)
SYSTEM="panda_es_zimage"
DO_UBOOT=1
BOOTLOADER="PANDABOARD_ES"
SERIAL="ttyO2"
is_omap
VIDEO_OMAP_RAM="16MB"
KMS_VIDEOB="video=HDMI-A-1"
USE_BETA_BOOTLOADER=1
USE_ZIMAGE=1
;;
panda_kms) panda_kms)
SYSTEM="panda_es" SYSTEM="panda_es"
DO_UBOOT=1 DO_UBOOT=1
@ -1616,8 +1689,8 @@ function check_uboot_type {
SERIAL="ttymxc0" SERIAL="ttymxc0"
is_imx is_imx
ZRELADD="0x90008000" ZRELADD="0x90008000"
UIMAGE_ADDR="0x90800000" IMAGE_ADDR="0x90800000"
UINITRD_ADDR="0x92100000" INITRD_ADDR="0x92100000"
BETA_KERNEL=1 BETA_KERNEL=1
SERIAL_MODE=1 SERIAL_MODE=1
;; ;;
@ -1629,8 +1702,8 @@ function check_uboot_type {
SERIAL="ttymxc0" SERIAL="ttymxc0"
is_imx is_imx
ZRELADD="0x70008000" ZRELADD="0x70008000"
UIMAGE_ADDR="0x70800000" IMAGE_ADDR="0x70800000"
UINITRD_ADDR="0x72100000" INITRD_ADDR="0x72100000"
;; ;;
*) *)
IN_VALID_UBOOT=1 IN_VALID_UBOOT=1

Loading…
Cancel
Save