diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | board/board-nitrokey-start.h | 3 | ||||
| -rw-r--r-- | clk_gpio_init.c | 1 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2015-09-04 Niibe Yutaka <gniibe@fsij.org> + + * board/board-nitrokey-start.h (BOARD_ID): Fix the value. + * clk_gpio_init.c (AFIO_MAPR_SWJ_CFG_JTAGDISABLE): New. + 2015-08-06 Niibe Yutaka <gniibe@fsij.org> * example-fsm-55/README: Updated. diff --git a/board/board-nitrokey-start.h b/board/board-nitrokey-start.h index 4904d9d..996c603 100644 --- a/board/board-nitrokey-start.h +++ b/board/board-nitrokey-start.h @@ -1,5 +1,5 @@ #define BOARD_NAME "NITROKEY-START" -#define BOARD_ID 0x4aa5b5e2 +#define BOARD_ID 0xad1e7ebd #define STM32F10X_MD /* Medium-density device */ @@ -57,5 +57,4 @@ #define RCC_RSTR_IOP_RST \ (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | RCC_APB2RSTR_AFIORST) -#define AFIO_MAPR_SWJ_CFG_JTAGDISABLE ((uint32_t)0x02000000) #define AFIO_MAPR_SOMETHING AFIO_MAPR_SWJ_CFG_JTAGDISABLE diff --git a/clk_gpio_init.c b/clk_gpio_init.c index 4c1f2bd..316ea03 100644 --- a/clk_gpio_init.c +++ b/clk_gpio_init.c @@ -283,6 +283,7 @@ static struct AFIO *const AFIO = (struct AFIO *const)AFIO_BASE; #define AFIO_MAPR_TIM3_REMAP_PARTIALREMAP 0x00000800 #define AFIO_MAPR_SWJ_CFG_DISABLE 0x04000000 +#define AFIO_MAPR_SWJ_CFG_JTAGDISABLE 0x02000000 struct GPIO { |