Merge the 128rfa1 and 256rfr2 board.txt entries

Now, there is just a single "Pinoccio Scout" board in the Arduino IDE.
However, there is now also a "Processor" submenu, that allows choosing
between the two boards.

Author: matthijskooijman

avr/boards.txt

@@ -1,49 +1,43 @@
+menu.cpu=Processor
+
 ##############################################################
-pinoccio.name=Pinoccio 256RFR2
+pinoccio.name=Pinoccio Scout
 pinoccio.cpu=atmega256rfr2
 
 pinoccio.upload.tool=avrdude
 pinoccio.upload.protocol=stk500v2
-pinoccio.upload.maximum_size=253952
-pinoccio.upload.speed=115200
 
 pinoccio.bootloader.tool=avrdude
-pinoccio.bootloader.low_fuses=0xFF
-pinoccio.bootloader.high_fuses=0xD0
-pinoccio.bootloader.extended_fuses=0xFE
-pinoccio.bootloader.path=stk500v2
-pinoccio.bootloader.file=stk500boot_v2_pinoccio.hex
-pinoccio.bootloader.unlock_bits=0x3F
-pinoccio.bootloader.lock_bits=0x0F
 
-pinoccio.build.mcu=atmega256rfr2
 pinoccio.build.f_cpu=16000000L
 pinoccio.build.core=arduino:arduino
 pinoccio.build.variant=pinoccio
 pinoccio.build.board=PINOCCIO
 # Workaround for https://github.com/arduino/Arduino/pull/1695
 pinoccio.build.extra_flags=-D__PROG_TYPES_COMPAT__
 
-##############################################################
-pinoccio128.name=Pinoccio 128RFA1
-pinoccio128.cpu=atmega128rfa1
-
-pinoccio128.upload.tool=avrdude
-pinoccio128.upload.protocol=arduino
-pinoccio128.upload.maximum_size=129048
-pinoccio128.upload.speed=57600
+pinoccio.menu.cpu.atmega256rfr2=ATmega256RFR2
+pinoccio.menu.cpu.atmega256rfr2.build.mcu=atmega256rfr2
+pinoccio.menu.cpu.atmega256rfr2.upload.maximum_size=253952
+pinoccio.menu.cpu.atmega256rfr2.upload.speed=115200
+pinoccio.menu.cpu.atmega256rfr2.bootloader.low_fuses=0xFF
+pinoccio.menu.cpu.atmega256rfr2.bootloader.high_fuses=0xD0
+pinoccio.menu.cpu.atmega256rfr2.bootloader.extended_fuses=0xFE
+pinoccio.menu.cpu.atmega256rfr2.bootloader.unlock_bits=0x3F
+pinoccio.menu.cpu.atmega256rfr2.bootloader.lock_bits=0x0F
+pinoccio.menu.cpu.atmega256rfr2.bootloader.path=stk500v2
+pinoccio.menu.cpu.atmega256rfr2.bootloader.file=stk500boot_v2_pinoccio.hex
 
-pinoccio128.bootloader.tool=avrdude
-pinoccio128.bootloader.low_fuses=0xF7
-pinoccio128.bootloader.high_fuses=0xD0
-pinoccio128.bootloader.extended_fuses=0xF0
-pinoccio128.bootloader.path=pinoccio
-pinoccio128.bootloader.file=ATmegaBOOT_atmega128rfa1.hex
-pinoccio128.bootloader.unlock_bits=0x3F
-pinoccio128.bootloader.lock_bits=0x0F
+pinoccio.menu.cpu.atmega128rfa1=ATmega128RFA1 (early prototype)
+pinoccio.menu.cpu.atmega128rfa1.build.mcu=atmega128rfa1
+pinoccio.menu.cpu.atmega128rfa1.upload.maximum_size=129048
+pinoccio.menu.cpu.atmega128rfa1.upload.speed=57600
+pinoccio.menu.cpu.atmega128rfa1.bootloader.low_fuses=0xF7
+pinoccio.menu.cpu.atmega128rfa1.bootloader.high_fuses=0xD0
+pinoccio.menu.cpu.atmega128rfa1.bootloader.extended_fuses=0xF0
+pinoccio.menu.cpu.atmega128rfa1.bootloader.path=pinoccio
+pinoccio.menu.cpu.atmega128rfa1.bootloader.file=ATmegaBOOT_atmega128rfa1.hex
+pinoccio.menu.cpu.atmega128rfa1.bootloader.unlock_bits=0x3F
+pinoccio.menu.cpu.atmega128rfa1.bootloader.lock_bits=0x0F
 
-pinoccio128.build.mcu=atmega128rfa1
-pinoccio128.build.f_cpu=16000000L
-pinoccio128.build.core=arduino:arduino
-pinoccio128.build.variant=pinoccio
-pinoccio128.build.board=PINOCCIO
+##############################################################

avr/platform.txt

@@ -59,8 +59,8 @@ recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 # AVR Uploader/Programmers tools
 # ------------------------------
 
-tools.avrdude.cmd.path={runtime.ide.path}/hardware/tools/avr/bin/avrdude
-tools.avrdude.config.path={runtime.ide.path}/hardware/tools/avr/etc/avrdude.conf
+tools.avrdude.cmd.path=/usr/bin/avrdude
+tools.avrdude.config.path=/etc/avrdude.conf
 
 tools.avrdude.upload.params.verbose=-v -v -v -v
 tools.avrdude.upload.params.quiet=-q -q