| @@ -69,6 +69,11 if [ "$ENABLE_UBOOT" = true ] ; then | |||||
| 69 | # Set mkfile to use the correct dtb file |
|
69 | # Set mkfile to use the correct dtb file | |
| 70 | sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage" |
|
70 | sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage" | |
| 71 |
|
71 | |||
|
|
72 | # Set mkfile to use the correct mach id | |||
|
|
73 | if [ "$ENABLE_QEMU" = true ] ; then | |||
|
|
74 | sed -i "s/^\(setenv machid \).*/\10x000008e0/" "${BOOT_DIR}/uboot.mkimage" | |||
|
|
75 | fi | |||
|
|
76 | ||||
| 72 | # Set mkfile to use kernel image |
|
77 | # Set mkfile to use kernel image | |
| 73 | sed -i "s/^\(fatload mmc 0:1 \${kernel_addr_r} \).*/\1${KERNEL_IMAGE}/" "${BOOT_DIR}/uboot.mkimage" |
|
78 | sed -i "s/^\(fatload mmc 0:1 \${kernel_addr_r} \).*/\1${KERNEL_IMAGE}/" "${BOOT_DIR}/uboot.mkimage" | |
| 74 |
|
79 | |||
| @@ -336,7 +336,7 fi | |||||
| 336 |
|
336 | |||
| 337 | # Add device-tree-compiler required for building the U-Boot bootloader |
|
337 | # Add device-tree-compiler required for building the U-Boot bootloader | |
| 338 | if [ "$ENABLE_UBOOT" = true ] ; then |
|
338 | if [ "$ENABLE_UBOOT" = true ] ; then | |
| 339 | APT_INCLUDES="${APT_INCLUDES},device-tree-compiler" |
|
339 | APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex" | |
| 340 | fi |
|
340 | fi | |
| 341 |
|
341 | |||
| 342 | # Check if root SSH (v2) public key file exists |
|
342 | # Check if root SSH (v2) public key file exists | |
| @@ -525,6 +525,8 fi | |||||
| 525 |
|
525 | |||
| 526 | # Configure qemu compatible kernel |
|
526 | # Configure qemu compatible kernel | |
| 527 | if [ "$ENABLE_QEMU" = true ] ; then |
|
527 | if [ "$ENABLE_QEMU" = true ] ; then | |
|
|
528 | DTB_FILE=vexpress-v2p-ca15_a7.dtb | |||
|
|
529 | UBOOT_CONFIG=vexpress_ca15_tc2_defconfig | |||
| 528 | KERNEL_DEFCONFIG="vexpress_defconfig" |
|
530 | KERNEL_DEFCONFIG="vexpress_defconfig" | |
| 529 | if [ "$KERNEL_MENUCONFIG" = false ] ; then |
|
531 | if [ "$KERNEL_MENUCONFIG" = false ] ; then | |
| 530 | KERNEL_OLDDEFCONFIG=true |
|
532 | KERNEL_OLDDEFCONFIG=true | |
| @@ -626,6 +628,19 if [ "$ENABLE_QEMU" = true ] ; then | |||||
| 626 | done |
|
628 | done | |
| 627 | fi |
|
629 | fi | |
| 628 |
|
630 | |||
|
|
631 | # Copy u-boot files to QEMU directory | |||
|
|
632 | if [ "$ENABLE_UBOOT" = true ] ; then | |||
|
|
633 | if [ -f "${BOOT_DIR}/u-boot.bin" ] ; then | |||
|
|
634 | install_readonly "${BOOT_DIR}/u-boot.bin" "${BASEDIR}/qemu/u-boot.bin" | |||
|
|
635 | fi | |||
|
|
636 | if [ -f "${BOOT_DIR}/uboot.mkimage" ] ; then | |||
|
|
637 | install_readonly "${BOOT_DIR}/uboot.mkimage" "${BASEDIR}/qemu/uboot.mkimage" | |||
|
|
638 | fi | |||
|
|
639 | if [ -f "${BOOT_DIR}/boot.scr" ] ; then | |||
|
|
640 | install_readonly "${BOOT_DIR}/boot.scr" "${BASEDIR}/qemu/boot.scr" | |||
|
|
641 | fi | |||
|
|
642 | fi | |||
|
|
643 | ||||
| 629 | # Copy initramfs to QEMU directory |
|
644 | # Copy initramfs to QEMU directory | |
| 630 | if [ -f "${BOOT_DIR}/initramfs-${KERNEL_VERSION}" ] ; then |
|
645 | if [ -f "${BOOT_DIR}/initramfs-${KERNEL_VERSION}" ] ; then | |
| 631 | install_readonly "${BOOT_DIR}/initramfs-${KERNEL_VERSION}" "${BASEDIR}/qemu/initramfs-${KERNEL_VERSION}" |
|
646 | install_readonly "${BOOT_DIR}/initramfs-${KERNEL_VERSION}" "${BASEDIR}/qemu/initramfs-${KERNEL_VERSION}" | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
