Skip to content

Commit 8e24d68

Browse files
authored
Merge pull request #2361 from geky/add-ipv4-vk_rz_a1h
Enable FEATURE_IPV4 for the VK_RZ_A1H
2 parents 0131aa6 + 413ea26 commit 8e24d68

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

hal/targets.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,9 @@
16521652
},
16531653
"program_cycle_s": 2,
16541654
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1655-
"default_build": "standard"
1655+
"features": ["IPV4"],
1656+
"default_build": "standard",
1657+
"release_versions": ["2", "5"]
16561658
},
16571659
"MAXWSNENV": {
16581660
"inherits": ["Target"],

hal/targets/cmsis/TARGET_RENESAS/TARGET_VK_RZ_A1H/TOOLCHAIN_IAR/startup_VKRZA1H.s

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
SECTION .intvec:CODE:NOROOT(2)
3131

32-
PUBLIC __vector
33-
PUBLIC __iar_program_start
32+
PUBLIC __vector_core_a9
33+
PUBWEAK __iar_program_start
3434
PUBLIC Undefined_Handler
3535
EXTERN SWI_Handler
3636
PUBLIC Prefetch_Handler
@@ -52,7 +52,7 @@
5252
__iar_init$$done: ; The vector table is not needed
5353
; until after copy initialization is done
5454

55-
__vector: ; Make this a DATA label, so that stack usage
55+
__vector_core_a9: ; Make this a DATA label, so that stack usage
5656
; analysis doesn't consider it an uncalled fun
5757

5858
ARM
@@ -95,7 +95,7 @@ FIQ_Addr: DCD FIQ_Handler
9595
EXTERN SystemInit
9696
EXTERN InitMemorySubsystem
9797
EXTERN __cmain
98-
REQUIRE __vector
98+
REQUIRE __vector_core_a9
9999
EXTWEAK __iar_init_core
100100
EXTWEAK __iar_init_vfp
101101

@@ -138,7 +138,7 @@ goToSleep:
138138
139139
140140
;; Set Vector Base Address Register (VBAR) to point to this application's vector table
141-
ldr r0, =__vector
141+
ldr r0, =__vector_core_a9
142142
mcr p15, 0, r0, c12, c0, 0
143143
144144

0 commit comments

Comments
 (0)