From dc3e008311a83eb3b0e785726088173dc4ca0519 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 22 Jan 2013 15:15:55 -0600 Subject: [PATCH] generic: specify u-boot script entry point Signed-off-by: Robert Nelson --- hwpack/am335x-bone.conf | 3 ++- hwpack/imx51-babbage.conf | 1 + hwpack/imx53-qsb.conf | 1 + hwpack/imx53-qsb_v3_4.conf | 1 + hwpack/imx6q-sabrelite.conf | 1 + hwpack/omap3-beagle-xm.conf | 1 + hwpack/omap4-panda.conf | 1 + mk_mmc.sh | 48 ++++++++++++++++++++++--------------- 8 files changed, 37 insertions(+), 20 deletions(-) diff --git a/hwpack/am335x-bone.conf b/hwpack/am335x-bone.conf index 2ea8c4e..aa5d7ef 100644 --- a/hwpack/am335x-bone.conf +++ b/hwpack/am335x-bone.conf @@ -20,6 +20,7 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp kernel_subarch="omap-psp" @@ -37,4 +38,4 @@ SERIAL="ttyO0" SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_MODE=1 -USE_KMS=1 \ No newline at end of file +USE_KMS=1 diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index a50ad2d..5ff4e4d 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -24,6 +24,7 @@ boot_image="bootz" boot_script="uEnv.txt" boot_fstype="ext2" uboot_CMD_FS_GENERIC=1 +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx kernel_subarch="imx" diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 5159b67..7f0e26b 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -24,6 +24,7 @@ boot_image="bootz" boot_script="uEnv.txt" boot_fstype="ext2" uboot_CMD_FS_GENERIC=1 +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx kernel_subarch="imx" diff --git a/hwpack/imx53-qsb_v3_4.conf b/hwpack/imx53-qsb_v3_4.conf index 06e664c..1ca035d 100644 --- a/hwpack/imx53-qsb_v3_4.conf +++ b/hwpack/imx53-qsb_v3_4.conf @@ -24,6 +24,7 @@ boot_image="bootz" boot_script="uEnv.txt" boot_fstype="ext2" uboot_CMD_FS_GENERIC=1 +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx kernel_subarch="imx" diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 459fed0..9266eed 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -25,6 +25,7 @@ USE_UIMAGE=1 boot_scr_wrapper=1 boot_script="uEnv.txt" boot_fstype="ext2" +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx kernel_subarch="imx" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index 47a51e2..62197a1 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -20,6 +20,7 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap kernel_subarch="omap" diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 3da6e19..87299ed 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -20,6 +20,7 @@ boot_name="u-boot.img" boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" +uboot_SCRIPT_ENTRY="loaduimage" #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap kernel_subarch="omap" diff --git a/mk_mmc.sh b/mk_mmc.sh index 1d885e1..8771b88 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -453,26 +453,26 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5 - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5 - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ ;; beagle_xm) cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ ;; @@ -480,13 +480,13 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ ;; @@ -494,13 +494,13 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ ;; @@ -508,13 +508,13 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ ;; @@ -522,26 +522,26 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ ;; bone) cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ expansion_args=setenv expansion ip=\${ip_method} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion ip=\${ip_method} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} __EOF__ ;; @@ -549,14 +549,14 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ dtb_file=${dtb_file} expansion_args=setenv expansion ip=\${ip_method} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ dtb_file=${dtb_file} expansion_args=setenv expansion ip=\${ip_method} - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ ;; @@ -564,13 +564,13 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ optargs=VIDEO_CONSOLE expansion_args=setenv expansion - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ expansion_args=setenv expansion - loaduimage=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} __EOF__ ;; @@ -1293,7 +1293,7 @@ function populate_boot { setenv boot_fstype ${boot_fstype} \${boot_fstype}load mmc \${mmcdev}:\${mmcpart} \${loadaddr} uEnv.txt env import -t \${loadaddr} \${filesize} - run loaduimage + run ${uboot_SCRIPT_ENTRY} __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 cp -v ${TEMPDIR}/disk/boot.scr ${TEMPDIR}/disk/backup/boot.scr @@ -1498,6 +1498,7 @@ function check_uboot_type { case "${UBOOT_TYPE}" in beagle_bx) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="beagle_bx" board="BEAGLEBOARD_BX" is_omap @@ -1509,6 +1510,7 @@ function check_uboot_type { echo "-----------------------------" ;; beagle_cx) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="beagle_cx" board="BEAGLEBOARD_CX" is_omap @@ -1526,6 +1528,7 @@ function check_uboot_type { convert_uboot_to_dtb_board ;; beagle_xm_kms) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="beagle_xm" board="BEAGLEBOARD_XM" is_omap @@ -1538,6 +1541,7 @@ function check_uboot_type { kernel_repo="TESTING" ;; bone) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="bone" board="BEAGLEBONE_A" is_omap @@ -1560,6 +1564,7 @@ function check_uboot_type { convert_uboot_to_dtb_board ;; igepv2) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="igepv2" board="IGEP00X0" is_omap @@ -1572,6 +1577,7 @@ function check_uboot_type { convert_uboot_to_dtb_board ;; panda_dtb) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="panda_dtb" board="PANDABOARD" is_omap @@ -1584,6 +1590,7 @@ function check_uboot_type { need_dtbs=1 ;; panda_es) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="panda_es" board="PANDABOARD_ES" is_omap @@ -1593,6 +1600,7 @@ function check_uboot_type { usbnet_mem="32768" ;; panda_es_dtb) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="panda_es_dtb" board="PANDABOARD_ES" is_omap @@ -1604,6 +1612,7 @@ function check_uboot_type { need_dtbs=1 ;; panda_es_kms) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="panda_es" board="PANDABOARD_ES" is_omap @@ -1617,6 +1626,7 @@ function check_uboot_type { kernel_repo="TESTING" ;; crane) + uboot_SCRIPT_ENTRY="loaduimage" SYSTEM="crane" board="CRANEBOARD" is_omap