github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eradicate all occurences of hardcoded memory addresses from all sources files, except for the FPGA bitstream fallback

Browse source
This commit is contained in:
henryk@ploetzli.ch 2009-08-31 14:52:59 +00:00
parent 52b3d184ce
commit e3ae025783
7 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
armsrc/fpgaloader.c
View file

@ -275,14 +275,14 @@ void FpgaDownloadAndGo(void)
} }
/* Fallback for the old flash image format: Check for the magic marker 0xFFFFFFFF /* Fallback for the old flash image format: Check for the magic marker 0xFFFFFFFF
* 0xAA995566 at address 0x2000. This is raw bitstream with a size of 336,768 bits * 0xAA995566 at address 0x102000. This is raw bitstream with a size of 336,768 bits
* = 10,524 DWORDs, stored as DWORDS e.g. little-endian in memory, but each DWORD * = 10,524 DWORDs, stored as DWORDS e.g. little-endian in memory, but each DWORD
* is still to be transmitted in MSBit first order. Set the invert flag to indicate * is still to be transmitted in MSBit first order. Set the invert flag to indicate
* that the DownloadFPGA function should invert every 4 byte sequence when doing * that the DownloadFPGA function should invert every 4 byte sequence when doing
* the bytewise download. * the bytewise download.
*/ */
if( *(DWORD*)0x2000 == 0xFFFFFFFF && *(DWORD*)0x2004 == 0xAA995566 ) if( *(DWORD*)0x102000 == 0xFFFFFFFF && *(DWORD*)0x102004 == 0xAA995566 )
DownloadFPGA((DWORD *)0x2000, 10524, 1); DownloadFPGA((DWORD *)0x102000, 10524, 1);
} }
void FpgaGatherVersion(char *dst, int len) void FpgaGatherVersion(char *dst, int len)

6
bootrom/bootrom.c
View file

@ -107,6 +107,7 @@ void UsbPacketReceived(BYTE *packet, int len)
UsbSendPacket(packet, len); UsbSendPacket(packet, len);
} }
extern char _osimage_entry;
void BootROM(void) void BootROM(void)
{ {
//------------ //------------
@ -182,9 +183,8 @@ void BootROM(void)
USB_D_PLUS_PULLUP_OFF(); USB_D_PLUS_PULLUP_OFF();
LED_B_ON(); LED_B_ON();
// jump to Flash address 0x10000 (LSBit set for thumb mode, 0x100000 added for Flash base address) // jump to Flash address of the osimage entry point (LSBit set for thumb mode)
asm("ldr r3, = 0x00110001\n"); asm("bx %0\n" : : "r" ( ((int)&_osimage_entry) | 0x1 ) );
asm("bx r3\n");
} }
} }
} }

9
bootrom/flash-reset.s
View file

@ -16,12 +16,17 @@ flashstart:
b Fiq b Fiq
Reset: Reset:
ldr sp, = 0x0020FFF8 @ initialize stack pointer to top of RAM ldr sp, .stack_end @ initialize stack pointer to top of RAM
bl CopyBootToRAM @ copy bootloader to RAM (in case the bl CopyBootToRAM @ copy bootloader to RAM (in case the
@ user re-flashes the bootloader) @ user re-flashes the bootloader)
ldr r3, = 0x00200000 @ start address of RAM bootloader ldr r3, .bootphase2_start @ start address of RAM bootloader
bx r3 @ jump to it bx r3 @ jump to it
.stack_end:
.word _stack_end
.bootphase2_start:
.word __bootphase2_start__
Fiq: Fiq:
b Fiq b Fiq
UndefinedInstruction: UndefinedInstruction:

8
bootrom/fromflash.c
View file

@ -1,11 +1,13 @@
#include <proxmark3.h> #include <proxmark3.h>
extern char __bootphase2_src_start__, __bootphase2_start__, __bootphase2_end__;
void __attribute__((section(".bootphase1"))) CopyBootToRAM(void) void __attribute__((section(".bootphase1"))) CopyBootToRAM(void)
{ {
int i; int i;
volatile DWORD *s = (volatile DWORD *)0x200; volatile DWORD *s = (volatile DWORD *)&__bootphase2_src_start__;
volatile DWORD *d = (volatile DWORD *)0x200000; volatile DWORD *d = (volatile DWORD *)&__bootphase2_start__;
unsigned int l = (int)&__bootphase2_end__ - (int)&__bootphase2_start__;
for(i = 0; i < 1024; i++) *d++ = *s++; for(i = 0; i < l/sizeof(DWORD); i++) *d++ = *s++;
} }

1
bootrom/ldscript-flash
View file

@ -25,6 +25,7 @@ SECTIONS
LONG(_version_information_start) LONG(_version_information_start)
} >bootphase1 } >bootphase1
__bootphase2_src_start__ = ORIGIN(bootphase2);
.bootphase2 : { .bootphase2 : {
__bootphase2_start__ = .; __bootphase2_start__ = .;
*(.startphase2) *(.startphase2)

5
bootrom/ram-reset.s
View file

@ -6,5 +6,8 @@
.global ramstart .global ramstart
ramstart: ramstart:
ldr sp, = 0x0020FFF8 ldr sp, .stack_end
bl BootROM bl BootROM
.stack_end:
.word _stack_end

4
common/ldscript.common
View file

@ -16,5 +16,7 @@ MEMORY
/* Export some information that can be used from within the firmware */ /* Export some information that can be used from within the firmware */
_bootphase1_version_pointer = ORIGIN(bootphase1) + LENGTH(bootphase1) - 0x4; _bootphase1_version_pointer = ORIGIN(bootphase1) + LENGTH(bootphase1) - 0x4;
_osimage_entry = ORIGIN(osimage);
_flash_start = ORIGIN(bootphase1); _flash_start = ORIGIN(bootphase1);
_flash_end = ORIGIN(osimage) + LENGTH(osimage); _flash_end = ORIGIN(osimage) + LENGTH(osimage);
_stack_end = ORIGIN(ram) + LENGTH(ram) - 8;