Skip to content

Commit ef45c7d

Browse files
committed
Adding local modifications
1 parent 3068bc8 commit ef45c7d

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

esp32p4/include/esp_eth/include/esp_eth_mac_esp.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,6 @@ typedef enum {
253253
.clock_gpio = (emac_rmii_clock_gpio_t) 50 \
254254
} \
255255
}, \
256-
.clock_config_out_in = \
257-
{ \
258-
.rmii = \
259-
{ \
260-
.clock_mode = EMAC_CLK_EXT_IN, \
261-
.clock_gpio = (emac_rmii_clock_gpio_t) -1 \
262-
} \
263-
}, \
264256
.dma_burst_len = ETH_DMA_BURST_LEN_32, \
265257
.intr_priority = 0, \
266258
.emac_dataif_gpio = \
@@ -275,6 +267,14 @@ typedef enum {
275267
.rxd1_num = 30 \
276268
} \
277269
}, \
270+
.clock_config_out_in = \
271+
{ \
272+
.rmii = \
273+
{ \
274+
.clock_mode = EMAC_CLK_EXT_IN, \
275+
.clock_gpio = (emac_rmii_clock_gpio_t) -1 \
276+
} \
277+
}, \
278278
}
279279
#endif // CONFIG_IDF_TARGET_ESP32P4
280280

esp32p4/include/hal/esp32p4/include/hal/i2c_ll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static inline void i2c_ll_set_source_clk(i2c_dev_t *hw, i2c_clock_source_t src_c
796796

797797
/// use a macro to wrap the function, force the caller to use it in a critical section
798798
/// the critical section needs to declare the __DECLARE_RCC_ATOMIC_ENV variable in advance
799-
#define i2c_ll_set_source_clk(...) do {(void)__DECLARE_RCC_ATOMIC_ENV; i2c_ll_set_source_clk(__VA_ARGS__);} while(0)
799+
#define i2c_ll_set_source_clk(...) do {i2c_ll_set_source_clk(__VA_ARGS__);} while(0)
800800

801801
/**
802802
* @brief Set LP I2C source clock

esp32p4/include/hal/include/hal/i2c_hal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void _i2c_hal_set_bus_timing(i2c_hal_context_t *hal, int scl_freq, i2c_clock_sou
9898
#if SOC_PERIPH_CLK_CTRL_SHARED
9999
/// use a macro to wrap the function, force the caller to use it in a critical section
100100
/// the critical section needs to declare the __DECLARE_RCC_ATOMIC_ENV variable in advance
101-
#define i2c_hal_set_bus_timing(...) do {(void)__DECLARE_RCC_ATOMIC_ENV; _i2c_hal_set_bus_timing(__VA_ARGS__);} while(0)
101+
#define i2c_hal_set_bus_timing(...) do {_i2c_hal_set_bus_timing(__VA_ARGS__);} while(0)
102102
#else
103103
#define i2c_hal_set_bus_timing(...) _i2c_hal_set_bus_timing(__VA_ARGS__)
104104
#endif

esp32p4/platformio-build.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@
7272

7373
env.Append(
7474
ASFLAGS=[
75-
"-march=rv32imc"
75+
"-march=rv32imafc_zicsr_zifencei_xesppie",
76+
"-mabi=ilp32f"
7677
],
7778

7879
ASPPFLAGS=[
79-
"-x", "assembler-with-cpp"
80+
"-x", "assembler-with-cpp",
81+
"-march=rv32imafc_zicsr_zifencei_xesppie",
82+
"-mabi=ilp32f"
8083
],
8184

8285
CFLAGS=[

0 commit comments

Comments
 (0)