Fix possible type casting issue. Add another JTAG config file :)

[proxmark3-svn] / bootrom / bootrom.c

diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 04bc14bea3a522f615f670e94b548db5e7250831..53e6924d017d6b32aced8ea9a6f40f59c2b5622d 100644 (file)
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -1,3 +1,11 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Main code for the bootloader
+//-----------------------------------------------------------------------------
+

 #include <proxmark3.h>
 
 struct common_area common_area __attribute__((section(".commonarea")));
 #include <proxmark3.h>
 
 struct common_area common_area __attribute__((section(".commonarea")));


@@ -249,7 +257,7 @@ void BootROM(void)
     LED_A_OFF();
 
     // if 512K FLASH part - TODO make some defines :)
     LED_A_OFF();
 
     // if 512K FLASH part - TODO make some defines :)

-    if ((AT91C_BASE_DBGU->DBGU_CIDR | 0xf00) == 0xa00) {
+    if ((AT91C_BASE_DBGU->DBGU_CIDR & 0xf00) == 0xa00) {

            AT91C_BASE_EFC0->EFC_FMR =
                MC_FLASH_MODE_FLASH_WAIT_STATES(1) |
                        MC_FLASH_MODE_MASTER_CLK_IN_MHZ(0x48);
            AT91C_BASE_EFC0->EFC_FMR =
                MC_FLASH_MODE_FLASH_WAIT_STATES(1) |
                        MC_FLASH_MODE_MASTER_CLK_IN_MHZ(0x48);