Removed default config from flash.

The bootloader checksum check fails if the configuration is changed.
This commit is contained in:
Michael McMaster 2015-04-26 08:10:09 +10:00
parent 9ad7cc15d0
commit 1b14acad1a
4 changed files with 2 additions and 27 deletions

View File

@ -53,30 +53,8 @@ static int usbInEpState;
static int usbDebugEpState;
static int usbReady;
uint8_t DEFAULT_CONFIG[256]
__attribute__ ((section(".DEFAULT_CONFIG"))) =
{
CONFIG_TARGET_ENABLED,
CONFIG_FIXED,
0,
0,
0, 0, 0, 0,
0xff, 0xff, 0x3f, 0x00, // 4194303, 2GB - 1 sector
0x00, 0x02, //512
63, 0,
255, 0,
' ', 'c', 'o', 'd', 'e', 's', 'r', 'c',
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S', 'C', 'S', 'I', '2', 'S', 'D',
' ', '4', '.', '2',
'1','2','3','4','5','6','7','8','1','2','3','4','5','6','7','8'
};
// otherwise linker removes unused section.
volatile uint8_t trickLinker;
void configInit()
{
trickLinker = DEFAULT_CONFIG[0];
// The USB block will be powered by an internal 3.3V regulator.
// The PSoC must be operating between 4.6V and 5V for the regulator
// to work.

View File

@ -494,8 +494,6 @@ int scsiDiskCommand()
void scsiDiskPoll()
{
debugPause(); // TODO comment re. timeouts.
if (scsiDev.phase == DATA_IN &&
transfer.currentBlock != transfer.blocks)
{
@ -738,7 +736,6 @@ void scsiDiskPoll()
}
scsiDiskReset();
}
debugResume(); // TODO comment re. timeouts.
}
void scsiDiskReset()

View File

@ -3357,7 +3357,7 @@
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@General@Enable printf Float" v="True" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Optimization Level" v="Size" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Remove Unused Functions" v="True" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="-Wl,--section-start=.DEFAULT_CONFIG=0x0001BC00" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="" />
</name>
</platform>
<platform>

View File

@ -2499,7 +2499,7 @@
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@General@Enable printf Float" v="True" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Optimization Level" v="Size" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Remove Unused Functions" v="True" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="-Wl,--section-start=.DEFAULT_CONFIG=0x0001BC00" />
<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="" />
</name>
</platform>
<platform>