Simplify high fuse logic

avr/boards.txt

@@ -5,7 +5,6 @@
 ## This is the file where fuse settings, clock frequencies, upload ports, bootloaders and ##
 ## compiler flags are located. ##
 ## ##
-## MighyCore uses the Urboot bootloader, which
 ###########################################################################################################
 
 # Menu options
@@ -29,7 +28,6 @@ menu.bootloader=Bootloader
 1284.bootloader.tool=avrdude
 1284.bootloader.unlock_bits=0xff
 1284.bootloader.lock_bits=0xff
-1284.bootloader.high_fuses=0b1101{bootloader.eesave_bit}111
 1284.build.core=MCUdude_corefiles
 1284.build.board=AVR_ATmega1284
 1284.build.extra_flags={build.clkpr}
@@ -67,9 +65,9 @@ menu.bootloader=Bootloader
 
 # EEPROM
 1284.menu.eeprom.keep=EEPROM retained
-1284.menu.eeprom.keep.bootloader.eesave_bit=0
+1284.menu.eeprom.keep.bootloader.high_fuses=0xd7
 1284.menu.eeprom.erase=EEPROM not retained
-1284.menu.eeprom.erase.bootloader.eesave_bit=1
+1284.menu.eeprom.erase.bootloader.high_fuses=0xdf
 
 # Variants
 1284.menu.variant.modelP=1284P
@@ -216,7 +214,6 @@ menu.bootloader=Bootloader
 644.bootloader.tool=avrdude
 644.bootloader.unlock_bits=0xff
 644.bootloader.lock_bits=0xff
-644.bootloader.high_fuses=0b1101{bootloader.eesave_bit}111
 644.build.core=MCUdude_corefiles
 644.build.board=AVR_ATmega644
 644.build.extra_flags={build.clkpr}
@@ -243,9 +240,9 @@ menu.bootloader=Bootloader
 
 # EEPROM
 644.menu.eeprom.keep=EEPROM retained
-644.menu.eeprom.keep.bootloader.eesave_bit=0
+644.menu.eeprom.keep.bootloader.high_fuses=0xd7
 644.menu.eeprom.erase=EEPROM not retained
-644.menu.eeprom.erase.bootloader.eesave_bit=1
+644.menu.eeprom.erase.bootloader.high_fuses=0xdf
 
 # Pinouts
 644.menu.pinout.standard=Standard pinout
@@ -403,7 +400,6 @@ menu.bootloader=Bootloader
 324.bootloader.tool=avrdude
 324.bootloader.unlock_bits=0xff
 324.bootloader.lock_bits=0xff
-324.bootloader.high_fuses=0b1101{bootloader.eesave_bit}111
 324.build.core=MCUdude_corefiles
 324.build.board=AVR_ATmega324
 324.build.extra_flags={build.clkpr}
@@ -437,9 +433,9 @@ menu.bootloader=Bootloader
 
 # EEPROM
 324.menu.eeprom.keep=EEPROM retained
-324.menu.eeprom.keep.bootloader.eesave_bit=0
+324.menu.eeprom.keep.bootloader.high_fuses=0xd7
 324.menu.eeprom.erase=EEPROM not retained
-324.menu.eeprom.erase.bootloader.eesave_bit=1
+324.menu.eeprom.erase.bootloader.high_fuses=0xdf
 
 # Pinouts
 324.menu.pinout.standard=Standard pinout
@@ -609,7 +605,6 @@ menu.bootloader=Bootloader
 164.bootloader.tool=avrdude
 164.bootloader.unlock_bits=0xff
 164.bootloader.lock_bits=0xff
-164.bootloader.high_fuses=0b1101{bootloader.eesave_bit}101
 164.build.core=MCUdude_corefiles
 164.build.board=AVR_ATmega164
 164.build.extra_flags={build.clkpr}
@@ -636,9 +631,9 @@ menu.bootloader=Bootloader
 
 # EEPROM
 164.menu.eeprom.keep=EEPROM retained
-164.menu.eeprom.keep.bootloader.eesave_bit=0
+164.menu.eeprom.keep.bootloader.high_fuses=0xd7
 164.menu.eeprom.erase=EEPROM not retained
-164.menu.eeprom.erase.bootloader.eesave_bit=1
+164.menu.eeprom.erase.bootloader.high_fuses=0xdf
 
 # Pinouts
 164.menu.pinout.standard=Standard pinout
@@ -970,7 +965,7 @@ menu.bootloader=Bootloader
 16.bootloader.unlock_bits=0xff
 16.bootloader.lock_bits=0xff
 16.bootloader.low_fuses=0b{bootloader.bod_bits}{bootloader.sut_cksel_bits}
-16.bootloader.high_fuses=0b110{bootloader.ckopt_bit}{bootloader.eesave_bit}101
+16.bootloader.high_fuses=0b110{bootloader.ckopt_bit}{bootloader.eesave_bit}111
 16.build.core=MCUdude_corefiles
 16.build.board=AVR_ATmega16
 16.build.mcu=atmega16
@@ -1143,7 +1138,7 @@ menu.bootloader=Bootloader
 8535.bootloader.unlock_bits=0xff
 8535.bootloader.lock_bits=0xff
 8535.bootloader.low_fuses=0b{bootloader.bod_bits}{bootloader.sut_cksel_bits}
-8535.bootloader.high_fuses=0b110{bootloader.ckopt_bit}{bootloader.eesave_bit}101
+8535.bootloader.high_fuses=0b110{bootloader.ckopt_bit}{bootloader.eesave_bit}111
 8535.build.core=MCUdude_corefiles
 8535.build.board=AVR_ATmega8535
 8535.build.mcu=atmega8535