Tidying
This commit is contained in:
@@ -52,7 +52,7 @@ See source code in src/SignalHandler/ for more.
|
||||
|
||||
---
|
||||
|
||||
### Building Bloom
|
||||
### Building Bloom from source
|
||||
To compile Bloom, the following dependencies must be resolved. The accompanying installation commands require support
|
||||
for apt-get.
|
||||
|
||||
|
||||
@@ -11,7 +11,5 @@ package(){
|
||||
depends=('fontconfig>=2.11.94' 'freetype2>=2.6' 'gcc-libs>=5' 'glibc>=2.18' 'libgl' 'libglvnd' 'libpng12' 'libx11' 'libxcb' 'libxext' 'libxkbcommon>=0.5.0' 'libxkbcommon-x11>=0.5.0' 'libxrender' 'xcb-util-image>=0.2.1' 'xcb-util-keysyms>=0.4.0' 'xcb-util-renderutil' 'xcb-util-wm>=0.4.1' 'zlib>=1.1.4')
|
||||
|
||||
mkdir -p "${pkgdir}/@CPACK_PACKAGING_INSTALL_PREFIX@"
|
||||
|
||||
# Extract package data
|
||||
cp -R @CMAKE_INSTALL_PREFIX@* "${pkgdir}/@CPACK_PACKAGING_INSTALL_PREFIX@"
|
||||
}
|
||||
|
||||
@@ -546,7 +546,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
|
||||
}
|
||||
|
||||
auto memoryType = Avr8MemoryType::SRAM;
|
||||
if (registerDescriptor.type == TargetRegisterType::GENERAL_PURPOSE_REGISTER
|
||||
if (
|
||||
registerDescriptor.type == TargetRegisterType::GENERAL_PURPOSE_REGISTER
|
||||
&& (this->configVariant == Avr8ConfigVariant::XMEGA || this->configVariant == Avr8ConfigVariant::UPDI)
|
||||
) {
|
||||
memoryType = Avr8MemoryType::REGISTER_FILE;
|
||||
@@ -578,8 +579,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
|
||||
if (this->configVariant == Avr8ConfigVariant::DEBUG_WIRE) {
|
||||
avr8MemoryType = Avr8MemoryType::FLASH_PAGE;
|
||||
|
||||
} else if (this->configVariant == Avr8ConfigVariant::XMEGA
|
||||
|| this->configVariant == Avr8ConfigVariant::UPDI) {
|
||||
} else if (
|
||||
this->configVariant == Avr8ConfigVariant::XMEGA
|
||||
|| this->configVariant == Avr8ConfigVariant::UPDI
|
||||
) {
|
||||
avr8MemoryType = Avr8MemoryType::APPL_FLASH;
|
||||
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user