diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml index df35276735ec0ac7a83520acb5310edb04c516af..a3e9b5f5f9f69a44c39761c1b131cd0cd38ece41 100644 --- a/config/cca-3world.yaml +++ b/config/cca-3world.yaml @@ -167,6 +167,9 @@ build: -t: GCC5 -p: edk2/ArmVirtPkg/ArmVirtKvmTool.dsc -b: RELEASE + --pcd: PcdShellDefaultDelay=0 + ' --pcd': PcdPlatformBootTimeOut=0 + ' --pcd': PcdUefiShellDefaultBootEnable=1 build: - source edk2/edksetup.sh --reconfig diff --git a/config/edk2-base.yaml b/config/edk2-base.yaml index b127752ca152b55ebefc849a4387e6bb0b9d20e8..08e39f6a70be00631289e9a245362423237baa2b 100644 --- a/config/edk2-base.yaml +++ b/config/edk2-base.yaml @@ -47,6 +47,8 @@ build: -t: GCC5 -p: Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc -b: RELEASE + --pcd: PcdShellDefaultDelay=0 + ' --pcd': PcdUefiShellDefaultBootEnable=1 build: - source edk2/edksetup.sh --reconfig diff --git a/config/edk2-flash.img b/config/edk2-flash.img deleted file mode 100644 index 7fca2ed1474a8549a56cfae48b92d610a24a4c3e..0000000000000000000000000000000000000000 Binary files a/config/edk2-flash.img and /dev/null differ diff --git a/config/ns-edk2.yaml b/config/ns-edk2.yaml index b6f321b3bc26846f82d3c59a2d207e62b15989c6..89c644faa40c3ae1408c745fa2e583135d9e8bc2 100644 --- a/config/ns-edk2.yaml +++ b/config/ns-edk2.yaml @@ -24,12 +24,12 @@ description: >- is supplied and the config will refuse to run unless it is explicitly specified. - Note that by default, a pre-canned flash image is loaded into the model, which - contains UEFI variables directing EDK2 to boot to the shell. This will cause - startup.nsh to be executed and will start the kernel boot. This way everything - is automatic. By default, all EDK2 output is muxed to stdout. If you prefer - booting UEFI to its UI, override the EDK2FLASH rtvar with an empty string and - override terminals.'bp.terminal_0'.type to 'telnet'. + Note that by default, UEFI variables are build time configured directing EDK2 + to boot to the shell. This will cause startup.nsh to be executed and will + start the kernel boot. This way everything is automatic. By default, all EDK2 + output is muxed to stdout. If you prefer booting UEFI to its UI, override the + the build pcd parameter `PcdUefiShellDefaultBootEnable` using the overlay and + override terminals 'bp.terminal_0'.type to 'telnet'. When booting with device tree, a directory can optionally be shared from the host system into the Linux environment running in the FVP. To do so, set the @@ -53,10 +53,6 @@ build: params: BL33: ${artifact:EDK2} - edk2flash: - artifacts: - EDK2FLASH: ${param:configdir}/edk2-flash.img - run: rtvars: BL1: @@ -89,7 +85,7 @@ run: EDK2FLASH: type: path - value: ${artifact:EDK2FLASH} + value: '' params: -C bp.secureflashloader.fname: ${rtvar:BL1} diff --git a/documentation/userguide/configstore/cca-3world.rst b/documentation/userguide/configstore/cca-3world.rst index 23241739a34d2f3263e379a3fc8320ab7831d7c8..986a94eac3af8e59714bf2a81602bc5e01a26dd8 100644 --- a/documentation/userguide/configstore/cca-3world.rst +++ b/documentation/userguide/configstore/cca-3world.rst @@ -109,6 +109,6 @@ CMDLINE console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp KERNEL ${artifact:KERNEL} ROOTFS SHARE -EDK2FLASH ${artifact:EDK2FLASH} +EDK2FLASH ============== =============================================================== diff --git a/documentation/userguide/configstore/cca-4world.rst b/documentation/userguide/configstore/cca-4world.rst index 70d4be8d1873e4c7be5df0ca45439f71bcfbe396..0fc46c801f4a490f584128fb7383d559620ff232 100644 --- a/documentation/userguide/configstore/cca-4world.rst +++ b/documentation/userguide/configstore/cca-4world.rst @@ -68,6 +68,6 @@ CMDLINE console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp KERNEL ${artifact:KERNEL} ROOTFS SHARE -EDK2FLASH ${artifact:EDK2FLASH} +EDK2FLASH ============== =============================================================== diff --git a/documentation/userguide/configstore/ffa-tftf.rst b/documentation/userguide/configstore/ffa-tftf.rst index 308f74be28febe8b541c7a8d089dfd23f999cdc1..ee62b95a4b105bf06cb3abd24e5e2710b80deed6 100644 --- a/documentation/userguide/configstore/ffa-tftf.rst +++ b/documentation/userguide/configstore/ffa-tftf.rst @@ -39,6 +39,6 @@ CMDLINE console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp KERNEL ROOTFS SHARE -EDK2FLASH ${artifact:EDK2FLASH} +EDK2FLASH ============== =============================================================== diff --git a/documentation/userguide/configstore/ns-edk2-optee.rst b/documentation/userguide/configstore/ns-edk2-optee.rst index e38875126c11443ca72bb83b9a22538862b83931..aa1f0858cd69a6a94b44741b3c55730471161f10 100644 --- a/documentation/userguide/configstore/ns-edk2-optee.rst +++ b/documentation/userguide/configstore/ns-edk2-optee.rst @@ -39,6 +39,6 @@ CMDLINE console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp KERNEL ROOTFS SHARE -EDK2FLASH ${artifact:EDK2FLASH} +EDK2FLASH ============== =============================================================== diff --git a/documentation/userguide/configstore/ns-edk2.rst b/documentation/userguide/configstore/ns-edk2.rst index 3ac99d670b7e04b4f7ecac309f68cf530c7f7e37..04d321b5fae70977e325a07094b288a7c53b59c9 100644 --- a/documentation/userguide/configstore/ns-edk2.rst +++ b/documentation/userguide/configstore/ns-edk2.rst @@ -18,7 +18,7 @@ An extra rtvar is added (DTB) which allows specification of a custom device tree By default (if not overriding the rtvars) a sensible command line is used that will set up the console for logging and attempt to mount the rootfs image from the FVP's virtio block device. However the default rootfs image is empty, so the kernel will panic when attempting to mount; the user must supply a rootfs if it is required that the kernel completes its boot. No default kernel image is supplied and the config will refuse to run unless it is explicitly specified. -Note that by default, a pre-canned flash image is loaded into the model, which contains UEFI variables directing EDK2 to boot to the shell. This will cause startup.nsh to be executed and will start the kernel boot. This way everything is automatic. By default, all EDK2 output is muxed to stdout. If you prefer booting UEFI to its UI, override the EDK2FLASH rtvar with an empty string and override terminals.'bp.terminal_0'.type to 'telnet'. +Note that by default, UEFI variables are build time configured directing EDK2 to boot to the shell. This will cause startup.nsh to be executed and will start the kernel boot. This way everything is automatic. By default, all EDK2 output is muxed to stdout. If you prefer booting UEFI to its UI, override the the build pcd parameter `PcdUefiShellDefaultBootEnable` using the overlay and override terminals 'bp.terminal_0'.type to 'telnet'. When booting with device tree, a directory can optionally be shared from the host system into the Linux environment running in the FVP. To do so, set the SHARE rtvar to the desired directory, then mount the share inside the FVP with the following (or automate it in fstab): @@ -54,6 +54,6 @@ CMDLINE console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp KERNEL ROOTFS SHARE -EDK2FLASH ${artifact:EDK2FLASH} +EDK2FLASH ============== =============================================================== diff --git a/documentation/userguide/quickstart.rst b/documentation/userguide/quickstart.rst index 3d0da12d2372f9bbd1fd9205d97f840ca57a9e8f..ca83ce6c7fbca1b52bdd14054a054687c1b72908 100644 --- a/documentation/userguide/quickstart.rst +++ b/documentation/userguide/quickstart.rst @@ -208,7 +208,7 @@ concrete config. You can view non-concrete fragments by providing extra args). root=/dev/vda ip=dhcp KERNEL: None ROOTFS: - EDK2FLASH: ${artifact:EDK2FLASH} + EDK2FLASH: -------------------------------------------------------------------------------- @@ -237,15 +237,14 @@ concrete config. You can view non-concrete fragments by providing extra args). supplied and the config will refuse to run unless it is explicitly specified. - Note that by default, a pre-canned flash image is loaded - into the model, which contains UEFI variables directing - EDK2 to boot to the shell. This will cause startup.nsh to - be executed and will start the kernel boot. This way - everything is automatic. By default, all EDK2 output is - muxed to stdout. If you prefer booting UEFI to its UI, - override the EDK2FLASH rtvar with an empty string and - override terminals.'bp.terminal_0'.type to 'telnet'. - + Note that by default, UEFI variables are build time + configured directing EDK2 to boot to the shell. This will + cause startup.nsh to be executed and will start the kernel + boot. This way everything is automatic. By default, all + EDK2 output is muxed to stdout. If you prefer booting UEFI + to its UI, override the the build pcd parameter + `PcdUefiShellDefaultBootEnable` using the overlay and + override terminals 'bp.terminal_0'.type to 'telnet'. concrete: True run-time variables: LOCAL_NET_PORT: 8022 @@ -257,7 +256,7 @@ concrete config. You can view non-concrete fragments by providing extra args). root=/dev/vda ip=dhcp KERNEL: None ROOTFS: - EDK2FLASH: ${artifact:EDK2FLASH} + EDK2FLASH: -------------------------------------------------------------------------------- @@ -347,7 +346,6 @@ run: # Create directory structure. mkdir -p /data_nvme0n1/ryarob01/shrinkwrap_demo/live/build/source/ns-edk2/dt mkdir -p /data_nvme0n1/ryarob01/shrinkwrap_demo/live/build/source/ns-edk2/edk2 - mkdir -p /data_nvme0n1/ryarob01/shrinkwrap_demo/live/build/source/ns-edk2/edk2flash mkdir -p /data_nvme0n1/ryarob01/shrinkwrap_demo/live/build/source/ns-edk2/tfa mkdir -p /data_nvme0n1/ryarob01/shrinkwrap_demo/live/package/ns-edk2 @@ -812,12 +810,12 @@ command: that the kernel completes its boot. No default kernel image is supplied and the config will refuse to run unless it is explicitly specified. - Note that by default, a pre-canned flash image is loaded into the model, which contains - UEFI variables directing EDK2 to boot to the shell. This will cause startup.nsh - to be executed and will start the kernel boot. This way everything is automatic. - By default, all EDK2 output is muxed to stdout. If you prefer booting UEFI to its - UI, override the EDK2FLASH rtvar with an empty string and override terminals.''bp.terminal_0''.type - to ''telnet''.' + Note that by default, UEFI variables are build time configured directing EDK2 + to boot to the shell. This will cause startup.nsh to be executed and will + start the kernel boot. This way everything is automatic. By default, all EDK2 + output is muxed to stdout. If you prefer booting UEFI to its UI, override the + the build pcd parameter `PcdUefiShellDefaultBootEnable` using the overlay + and override terminals 'bp.terminal_0'.type to 'telnet'. concrete: true graph: {} build: @@ -895,6 +893,8 @@ command: -t: GCC5 -p: Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc -b: RELEASE + --pcd: PcdShellDefaultDelay=0 + ' --pcd': PcdUefiShellDefaultBootEnable=1 prebuild: - export WORKSPACE=${param:sourcedir} - export GCC5_AARCH64_PREFIX=$$CROSS_COMPILE @@ -909,17 +909,6 @@ command: postbuild: [] artifacts: EDK2: ${param:builddir}/RELEASE_GCC5/FV/FVP_AARCH64_EFI.fd - edk2flash: - repo: {} - sourcedir: null - builddir: null - toolchain: null - params: {} - prebuild: [] - build: [] - postbuild: [] - artifacts: - EDK2FLASH: ${param:configdir}/edk2-flash.img tfa: repo: .: @@ -981,7 +970,7 @@ command: value: '' EDK2FLASH: type: path - value: ${artifact:EDK2FLASH} + value: '' params: -C bp.dram_size: 4 -C cluster0.NUM_CORES: 4