Minor changes from review of merge
This commit is contained in:
parent
68d7ef6ce1
commit
da3c05a898
@ -1,7 +1,7 @@
|
||||
/************************************************************************************
|
||||
* arch/arm/src/efm32/chip/efm32_flash.h
|
||||
*
|
||||
* Copyright (C) 2014 Bouteville Pierre-Noel. All rights reserved.
|
||||
* Copyright (C) 2015 Bouteville Pierre-Noel. All rights reserved.
|
||||
* Author: Bouteville Pierre-Noel <pnb990@gmail.com>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -54,3 +54,4 @@
|
||||
# define EFM32_FLASH_PAGESIZE 512
|
||||
#endif
|
||||
|
||||
#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_FLASH_H */
|
||||
|
@ -544,7 +544,7 @@
|
||||
#define MSC_LOCK_LOCKKEY_LOCKED (_MSC_LOCK_LOCKKEY_LOCKED << 0) /* Shifted mode LOCKED for MSC_LOCK */
|
||||
#define MSC_LOCK_LOCKKEY_UNLOCK (_MSC_LOCK_LOCKKEY_UNLOCK << 0) /* Shifted mode UNLOCK for MSC_LOCK */
|
||||
|
||||
#define MSC_UNLOCK_CODE 0x1B71 /**< MSC unlock code */
|
||||
#define MSC_UNLOCK_CODE 0x1B71 /* MSC unlock code */
|
||||
|
||||
/* Bit fields for MSC CMD */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user