diff options
Diffstat (limited to 'meta-arm/meta-arm-bsp/conf')
| -rw-r--r-- | meta-arm/meta-arm-bsp/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-arm/meta-arm-bsp/conf/machine/corstone1000-fvp.conf | 6 | ||||
| -rw-r--r-- | meta-arm/meta-arm-bsp/conf/machine/include/fvp-common.inc | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/meta-arm/meta-arm-bsp/conf/layer.conf b/meta-arm/meta-arm-bsp/conf/layer.conf index 3df56136e1..75efe54643 100644 --- a/meta-arm/meta-arm-bsp/conf/layer.conf +++ b/meta-arm/meta-arm-bsp/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-arm-bsp" BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-arm-bsp = "5" -LAYERSERIES_COMPAT_meta-arm-bsp = "langdale" +LAYERSERIES_COMPAT_meta-arm-bsp = "langdale mickledore" LAYERDEPENDS_meta-arm-bsp = "core meta-arm" # This won't be used by layerindex-fetch, but works everywhere else diff --git a/meta-arm/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index 4433f8bd3a..2a72f7ff23 100644 --- a/meta-arm/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -42,3 +42,9 @@ FVP_TERMINALS[host.host_terminal_1] ?= "Secure World Console" FVP_TERMINALS[se.secenc_terminal] ?= "Secure Enclave Console" FVP_TERMINALS[extsys0.extsys_terminal] ?= "Cortex M3" +# MMC card configuration +FVP_CONFIG[board.msd_mmc.card_type] ?= "SDHC" +FVP_CONFIG[board.msd_mmc.p_fast_access] ?= "0" +FVP_CONFIG[board.msd_mmc.diagnostics] ?= "2" +FVP_CONFIG[board.msd_mmc.p_max_block_count] ?= "0xFFFF" +FVP_CONFIG[board.msd_config.pl180_fifo_depth] ?= "16" diff --git a/meta-arm/meta-arm-bsp/conf/machine/include/fvp-common.inc b/meta-arm/meta-arm-bsp/conf/machine/include/fvp-common.inc index c834f24d60..b10977c684 100644 --- a/meta-arm/meta-arm-bsp/conf/machine/include/fvp-common.inc +++ b/meta-arm/meta-arm-bsp/conf/machine/include/fvp-common.inc @@ -25,12 +25,15 @@ PACKAGECONFIG:remove:pn-openssh = "rng-tools" MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" TEST_TARGET = "OEFVPTarget" +TEST_TARGET_IP = "127.0.0.1:8022" FVP_PROVIDER ?= "fvp-base-a-aem-native" FVP_EXE ?= "FVP_Base_RevC-2xAEMvA" FVP_CONFIG[bp.ve_sysregs.exit_on_shutdown] ?= "1" FVP_CONFIG[bp.virtio_net.enabled] ?= "1" FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1" +# Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP. +FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22" FVP_CONFIG[cache_state_modelled] ?= "0" FVP_CONFIG[bp.secureflashloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1-fvp.bin" FVP_CONFIG[bp.flashloader0.fname] ?= "${DEPLOY_DIR_IMAGE}/fip-fvp.bin" |