diff options
| author | Nathaniel Graff <nathaniel.graff@sifive.com> | 2019-06-21 21:57:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 21:57:45 +0000 |
| commit | 4bc2e5141c68e82f2f6d7c8f71051fe93dd96d18 (patch) | |
| tree | d62ccc6b3076684fa62bd73d6ce2e082115b37d7 /bsp/sifive-hifive1 | |
| parent | 543c5f1122f39fc5791a31bc3c8d714108acf8d1 (diff) | |
| parent | b3cf267705758a305a59b2d31e76e752d84a204c (diff) | |
Merge pull request #295 from sifive/update-targets
Fix OpenOCD cfg and remove warnings
Diffstat (limited to 'bsp/sifive-hifive1')
| -rw-r--r-- | bsp/sifive-hifive1/metal-inline.h | 2 | ||||
| -rw-r--r-- | bsp/sifive-hifive1/metal.h | 2 | ||||
| -rw-r--r-- | bsp/sifive-hifive1/openocd.cfg | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bsp/sifive-hifive1/metal-inline.h b/bsp/sifive-hifive1/metal-inline.h index 0deb10b..f3d83c7 100644 --- a/bsp/sifive-hifive1/metal-inline.h +++ b/bsp/sifive-hifive1/metal-inline.h @@ -12,7 +12,7 @@ /* --------------------- fixed_clock ------------ */ -extern inline unsigned long __metal_driver_fixed_clock_rate(struct metal_clock *clock); +extern inline unsigned long __metal_driver_fixed_clock_rate(const struct metal_clock *clock); /* --------------------- fixed_factor_clock ------------ */ diff --git a/bsp/sifive-hifive1/metal.h b/bsp/sifive-hifive1/metal.h index 792a88a..9589eba 100644 --- a/bsp/sifive-hifive1/metal.h +++ b/bsp/sifive-hifive1/metal.h @@ -146,7 +146,7 @@ struct __metal_driver_sifive_fe310_g000_prci __metal_dt_prci_10008000; /* --------------------- fixed_clock ------------ */ -static inline unsigned long __metal_driver_fixed_clock_rate(struct metal_clock *clock) +static inline unsigned long __metal_driver_fixed_clock_rate(const struct metal_clock *clock) { if ((uintptr_t)clock == (uintptr_t)&__metal_dt_clock_0) { return METAL_FIXED_CLOCK_0_CLOCK_FREQUENCY; diff --git a/bsp/sifive-hifive1/openocd.cfg b/bsp/sifive-hifive1/openocd.cfg index 0a20b89..5835934 100644 --- a/bsp/sifive-hifive1/openocd.cfg +++ b/bsp/sifive-hifive1/openocd.cfg @@ -3,12 +3,12 @@ adapter_khz 10000 interface ftdi -ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H" -ftdi_vid_pid 0x15ba 0x002a +ftdi_device_desc "Dual RS232-HS" +ftdi_vid_pid 0x0403 0x6010 -ftdi_layout_init 0x0808 0x0a1b -ftdi_layout_signal nSRST -oe 0x0200 -ftdi_layout_signal LED -data 0x0800 +ftdi_layout_init 0x0008 0x001b +ftdi_layout_signal nSRST -oe 0x0020 +ftdi_layout_signal LED -data 0x0020 set _CHIPNAME riscv jtag newtap $_CHIPNAME cpu -irlen 5 |