From 2c8f64b7799df078372872e00325b26fcc93c8d8 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 22 Jan 2013 15:39:42 -0600 Subject: [PATCH] cleanup: boot scripts when using dtbs always define Signed-off-by: Robert Nelson --- mk_mmc.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 8114b43..088cd41 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -330,12 +330,14 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ initrd_high=0xffffffff fdt_high=0xffffffff + dtb_file=${dtb_file} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ initrd_high=0xffffffff fdt_high=0xffffffff + dtb_file=${dtb_file} __EOF__ fi @@ -479,23 +481,12 @@ function boot_uenv_txt_template { expansion_args=setenv expansion __EOF__ ;; - bone) - cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - expansion_args=setenv expansion ip=\${ip_method} - __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - expansion_args=setenv expansion ip=\${ip_method} - __EOF__ - ;; - bone_dtb) + bone|bone_dtb) cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - dtb_file=${dtb_file} expansion_args=setenv expansion ip=\${ip_method} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - dtb_file=${dtb_file} expansion_args=setenv expansion ip=\${ip_method} __EOF__ ;;