@ -985,7 +985,7 @@ populate_boot () {
if [ ! " x ${ conf_smart_uboot } " = "xenable" ] ; then
if [ ! " x ${ conf_smart_uboot } " = "xenable" ] ; then
touch ${ TEMPDIR } /disk/boot/trampoline.uboot
touch ${ TEMPDIR } /disk/boot/trampoline.uboot
if [ " ${ uboot_CONFIG_CMD_BOOTZ } " ] ; then
if [ " x ${ uboot_CONFIG_CMD_BOOTZ } " = "xenable " ] ; then
cp -v ${ TEMPDIR } /kernel/boot/vmlinuz-* ${ TEMPDIR } /disk/zImage.net
cp -v ${ TEMPDIR } /kernel/boot/vmlinuz-* ${ TEMPDIR } /disk/zImage.net
else
else
mkimage -A arm -O linux -T kernel -C none -a ${ conf_zreladdr } -e ${ conf_zreladdr } -n ${ LINUX_VER } -d ${ TEMPDIR } /kernel/boot/vmlinuz-* ${ TEMPDIR } /disk/uImage.net
mkimage -A arm -O linux -T kernel -C none -a ${ conf_zreladdr } -e ${ conf_zreladdr } -n ${ LINUX_VER } -d ${ TEMPDIR } /kernel/boot/vmlinuz-* ${ TEMPDIR } /disk/uImage.net
@ -1245,7 +1245,7 @@ process_dtb_conf () {
esac
esac
fi
fi
if [ " ${ uboot_CONFIG_CMD_BOOTZ } " ] ; then
if [ " x ${ uboot_CONFIG_CMD_BOOTZ } " = "xenable " ] ; then
conf_bootcmd = "bootz"
conf_bootcmd = "bootz"
conf_normal_kernel_file = zImage
conf_normal_kernel_file = zImage
conf_net_kernel_file = zImage.net
conf_net_kernel_file = zImage.net
@ -1257,7 +1257,7 @@ process_dtb_conf () {
kernel = /boot/uImage
kernel = /boot/uImage
fi
fi
if [ " ${ uboot_CONFIG_SUPPORT_RAW_INITRD } " ] ; then
if [ " x ${ uboot_CONFIG_SUPPORT_RAW_INITRD } " = "xenable " ] ; then
conf_normal_initrd_file = initrd.img
conf_normal_initrd_file = initrd.img
conf_net_initrd_file = initrd.net
conf_net_initrd_file = initrd.net
initrd = /boot/initrd.img-current
initrd = /boot/initrd.img-current
@ -1268,7 +1268,7 @@ process_dtb_conf () {
initrd = /boot/uInitrd
initrd = /boot/uInitrd
fi
fi
if [ " ${ uboot_CONFIG_CMD_FS_GENERIC } " ] ; then
if [ " x ${ uboot_CONFIG_CMD_FS_GENERIC } " = "xenable " ] ; then
conf_fileload = "load"
conf_fileload = "load"
else
else
if [ " x ${ conf_boot_fstype } " = "xfat" ] ; then
if [ " x ${ conf_boot_fstype } " = "xfat" ] ; then