merging conflicts were resolved

nihalpasham / rustBoot

rustBoot is a standalone bootloader written entirely in `Rust`, designed to run on anything from a microcontroller to a system on chip. It can be used to boot into bare-metal firmware or Linux.

MIT License

214 stars 21 forks source link

merging conflicts were resolved #16

Closed yashwanthsinghm closed 2 years ago

yashwanthsinghm commented 2 years ago

Targets were removed.
build after fetch upstream.
Tested to generate signed images for nrf52840 and stm32f411.

nihalpasham commented 2 years ago

The PR still contains the target folder. Please exclude it via the .gitignore file.

~~The stm dependencies in the update crate are referencing rustboot-hal and not hal. By the way, does your change compile?~~

nihalpasham commented 2 years ago

Nice work on your first pr - @yashwanthsinghm. 🚀