Skip to content

Enable HAL Flash API on Fast Models MPS2 targets #7554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 103 additions & 0 deletions targets/TARGET_ARM_FM/TARGET_FVP_MPS2/flash_api.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/*
* Copyright (c) 2017-2018 ARM Limited
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing software
* distributed under the License is distributed on an "AS IS" BASIS
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "device.h"
#include "flash_api.h"
#include "memory_zones.h"

/* Fast Model FVP MPS2 is modeling after V2M-MPS2 platform with a FPGA (AN385).
* The implementation emulates flash over SRAM.
*/

#define FLASH_PAGE_SIZE 256
#define FLASH_OFS_START FLASH_START
#define FLASH_SECTOR_SIZE 0x1000
#define FLASH_OFS_END (FLASH_OFS_START + FLASH_SIZE)

int32_t flash_init(flash_t *obj)
{
(void)obj;

return 0;
}

int32_t flash_free(flash_t *obj)
{
(void)obj;

return 0;
}

int32_t flash_erase_sector(flash_t *obj, uint32_t address)
{
(void)obj;

memset((void *)address, 0xff, FLASH_SECTOR_SIZE);

return 0;
}

int32_t flash_read(flash_t *obj, uint32_t address,
uint8_t *data, uint32_t size)
{
(void)obj;

memcpy(data, (void *)address, size);

return 0;
}

int32_t flash_program_page(flash_t *obj, uint32_t address,
const uint8_t *data, uint32_t size)
{
(void)obj;

memcpy((void *)address, data, size);

return 0;
}

uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
{
(void)obj;

if (address < FLASH_OFS_START || address >= FLASH_OFS_END) {
return MBED_FLASH_INVALID_SIZE;
}

return FLASH_SECTOR_SIZE;
}

uint32_t flash_get_page_size(const flash_t *obj)
{
(void)obj;

return FLASH_PAGE_SIZE;
}

uint32_t flash_get_start_address(const flash_t *obj)
{
(void)obj;

return FLASH_OFS_START;
}

uint32_t flash_get_size(const flash_t *obj)
{
(void)obj;

return FLASH_SIZE;
}
50 changes: 50 additions & 0 deletions targets/TARGET_ARM_FM/TARGET_FVP_MPS2/memory_zones.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright (c) 2017-2018 ARM Limited
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing software
* distributed under the License is distributed on an "AS IS" BASIS
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/*
* This file contains the information of memory zones for code and data on
* ARM Versatile Express Cortex-M Prototyping Systems (V2M-MPS2) TRM.
* It is used in startup code and linker scripts of supported compilers (ARM and
* GCC_ARM).
*
* WARNING: IAR does not include this file and re-define these values in
* MPS2.icf file. Please make sure that the two files share the same values.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this PR also update this file then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this file will be updated. but not in this PR. I do have another PR is going on about refactoring MPS2 board memory layout files. IAR does not use this memory_zone.h anyway, It is should be no impact.

*
* These memory zones are defined in section 4.2 of ARM V2M-MPS2 RTL and
* Fast Model Reference Guide.
*/

#ifndef MEMORY_ZONES_H
#define MEMORY_ZONES_H

/*
* Code memory zones
* Please note that MPS2 on Fast Models do not simulate persistent flash memory.
* The FLASH memory zone is a 256 KiB SRAM block and named FLASH
* only to keep the same name than in the CMSDK RTL and Fast Models Reference
* Guide.
*/
#define FLASH_START 0x00000000
#define FLASH_SIZE 0x00040000 /* 256 KiB */
#define ZBT_SRAM1_START 0x00400000
#define ZBT_SRAM1_SIZE 0x00400000 /* 4 MiB */

/* Data memory zones */
#define ZBT_SRAM2_START 0x20000000
#define ZBT_SRAM2_SIZE 0x00800000 /* 8 MiB */

#endif /* MEMORY_ZONES_H */

5 changes: 5 additions & 0 deletions targets/TARGET_ARM_FM/TARGET_FVP_MPS2/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ struct analogin_s {
__IO uint32_t address;
};

/* This structure is not used by the HAL implementation. */
struct flash_s {
uint8_t not_used;
};

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion targets/targets.json
Original file line number Diff line number Diff line change
Expand Up @@ -4239,7 +4239,7 @@
"public": false,
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
"OUTPUT_EXT": "elf",
"device_has": ["AACI", "ANALOGIN", "CLCD", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "TSC", "USTICKER"],
"device_has": ["AACI", "ANALOGIN", "CLCD", "FLASH", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "TSC", "USTICKER"],
"release_versions": ["5"]
},
"FVP_MPS2_M0": {
Expand Down