##// END OF EJS Templates
Merge double if check ENABLE_QEMU=TRUE
Unknown -
r291:cb0ab51c2410
parent child
Show More
@@ -519,16 +519,6 if [ "$KERNEL_REDUCE" = true ] ; then
519 KERNELSRC_CONFIG=false
519 KERNELSRC_CONFIG=false
520 fi
520 fi
521
521
522 # Configure qemu compatible kernel
523 if [ "$ENABLE_QEMU" = true ] ; then
524 DTB_FILE=vexpress-v2p-ca15_a7.dtb
525 UBOOT_CONFIG=vexpress_ca15_tc2_defconfig
526 KERNEL_DEFCONFIG="vexpress_defconfig"
527 if [ "$KERNEL_MENUCONFIG" = false ] ; then
528 KERNEL_OLDDEFCONFIG=true
529 fi
530 fi
531
532 # Execute bootstrap scripts
522 # Execute bootstrap scripts
533 for SCRIPT in bootstrap.d/*.sh; do
523 for SCRIPT in bootstrap.d/*.sh; do
534 head -n 3 "$SCRIPT"
524 head -n 3 "$SCRIPT"
@@ -596,6 +586,14 rm -f "${R}/vmlinuz"
596 rm -f "${R}${QEMU_BINARY}"
586 rm -f "${R}${QEMU_BINARY}"
597
587
598 if [ "$ENABLE_QEMU" = true ] ; then
588 if [ "$ENABLE_QEMU" = true ] ; then
589 # Configure qemu compatible kernel
590 DTB_FILE=vexpress-v2p-ca15_a7.dtb
591 UBOOT_CONFIG=vexpress_ca15_tc2_defconfig
592 KERNEL_DEFCONFIG="vexpress_defconfig"
593 if [ "$KERNEL_MENUCONFIG" = false ] ; then
594 KERNEL_OLDDEFCONFIG=true
595 fi
596
599 # Setup QEMU directory
597 # Setup QEMU directory
600 mkdir "${BASEDIR}/qemu"
598 mkdir "${BASEDIR}/qemu"
601
599
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant