]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feat/spi_hal_support' into 'master'
authorAngus Gratton <angus@espressif.com>
Sun, 14 Apr 2019 23:57:11 +0000 (07:57 +0800)
committerAngus Gratton <angus@espressif.com>
Sun, 14 Apr 2019 23:57:11 +0000 (07:57 +0800)
spi_master: refactor and add HAL support

See merge request idf/esp-idf!4159

1  2 
components/driver/spi_common.c
components/driver/spi_master.c
components/soc/linker.lf

Simple merge
Simple merge
index d68b5a62bb5d6ab32503a7a2fe4a24599853c748,a38aac87803456758254a2e2dfc1cdd6924cc9b1..74da25bd782f8f80c2ba996815a852cb16d3f402
@@@ -1,6 -1,6 +1,6 @@@
 -[mapping]
 +[mapping:soc]
  archive: libsoc.a
- entries: 
+ entries:
      cpu_util (noflash_text)
      rtc_clk (noflash)
      rtc_clk_init (noflash_text)