Skip to content

Commit

Permalink
boards/qemu_x86: fix emulated program memory size
Browse files Browse the repository at this point in the history
Qemu_x86 didn't reflect emulated program memory size.
It was because chosen zephyr,flash was assigned to flash_simulator
which was helping to generate DT_FLASH properties for sim_flash node.

This change revert choice of flash0 which solve problem with
program memory size. Flash simulator have to use
DT_SOC_NV_FLASH_xxx labels for fetch its property since that.

fixes #15832

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
  • Loading branch information
nvlsianpu authored and andrewboie committed Jul 17, 2019
1 parent cdc7b6d commit 5a3f106
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions boards/x86/qemu_x86/dts_fixup.h
Expand Up @@ -9,4 +9,9 @@

#define DT_FLASH_DEV_NAME DT_ZEPHYR_SIM_FLASH_SIM_FLASH_LABEL

#define DT_FLASH_SIM_BASE_ADDRESS DT_SOC_NV_FLASH_0_BASE_ADDRESS
#define DT_FLASH_SIM_ERASE_BLOCK_SIZE DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE
#define DT_FLASH_SIM_SIZE DT_SOC_NV_FLASH_0_SIZE
#define DT_FLASH_SIM_WRITE_BLOCK_SIZE DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE

/* End of Board Level DTS fixup file */
2 changes: 1 addition & 1 deletion boards/x86/qemu_x86/qemu_x86.dts
Expand Up @@ -20,7 +20,7 @@

chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash_sim0;
zephyr,flash = &flash0;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,bt-uart = &uart1;
Expand Down

0 comments on commit 5a3f106

Please sign in to comment.