Skip to content

Commit d433b55

Browse files
committed
changes from CR of IAR fixes for nRF5x port
1 parent 7eaef66 commit d433b55

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_ARM_STD/nRF52832.sct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LR_IROM1 0x1C000 0x0064000 {
1818
*(InRoot$$Sections)
1919
.ANY (+RO)
2020
}
21-
RW_IRAM1 0x20002080 0x0000DF80 {
21+
RW_IRAM1 0x20002EF8 0x0000D108 {
2222
.ANY (+RW +ZI)
2323
}
2424
}

hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_IAR/nRF52832.icf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ define symbol __ICFEDIT_intvec_start__ = 0x1c000;
66
/*-Memory Regions-*/
77
define symbol __ICFEDIT_region_ROM_start__ = 0x1c000;
88
define symbol __ICFEDIT_region_ROM_end__ = 0x7ffff;
9-
define symbol __ICFEDIT_region_RAM_start__ = 0x20002080;
9+
define symbol __ICFEDIT_region_RAM_start__ = 0x20002ef8;
1010
define symbol __ICFEDIT_region_RAM_end__ = 0x2000ffff;
1111
export symbol __ICFEDIT_region_RAM_start__;
1212
export symbol __ICFEDIT_region_RAM_end__;
1313
/*-Sizes-*/
1414
/*Heap 1/4 of ram and stack 1/8*/
15-
define symbol __ICFEDIT_size_cstack__ = 0xc00;
15+
define symbol __ICFEDIT_size_cstack__ = 0x800;
1616
define symbol __ICFEDIT_size_heap__ = 0x1800;
1717
/**** End of ICF editor section. ###ICF###*/
1818

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/analogin_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ uint16_t analogin_read_u16(analogin_t *obj)
6262

6363
nrf_drv_adc_channel_t adc_channel;
6464

65-
65+
// initialization by assigment because IAR dosen't support variable initializer in declaration statement.
6666
adc_channel.config.config.resolution = NRF_ADC_CONFIG_RES_10BIT;
6767
adc_channel.config.config.input = NRF_ADC_CONFIG_SCALING_INPUT_FULL_SCALE;
6868
adc_channel.config.config.reference = NRF_ADC_CONFIG_REF_VBG;

0 commit comments

Comments
 (0)