Patchwork [U-Boot,1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION

login
register
mail settings
Submitter Stephan Linz
Date June 26, 2012, 10:28 p.m.
Message ID <1340749706-27266-1-git-send-email-linz@li-pro.net>
Download mbox | patch
Permalink /patch/167472/
State Accepted
Commit 2629d63efc2ed9c6a02dd6605a0a5cb62f4e278d
Headers show

Comments

Stephan Linz - June 26, 2012, 10:28 p.m.
CONFIG_SYS_FLASH_PROTECTION will defined twice. The second one
is outside the flash configuration context and we can remove
it safely.

Signed-off-by: Stephan Linz <linz@li-pro.net>
---
 include/configs/microblaze-generic.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Michal Simek - June 27, 2012, 8:32 a.m.
On 06/27/2012 12:28 AM, Stephan Linz wrote:
> CONFIG_SYS_FLASH_PROTECTION will defined twice. The second one
> is outside the flash configuration context and we can remove
> it safely.
>
> Signed-off-by: Stephan Linz<linz@li-pro.net>
> ---
>   include/configs/microblaze-generic.h |    2 --
>   1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 295d123..5f16820 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -200,8 +200,6 @@
>   # define CONFIG_ENV_IS_NOWHERE	1
>   # define CONFIG_ENV_SIZE	0x1000
>   # define CONFIG_ENV_ADDR	(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
> -/* hardware flash protection */
> -# define CONFIG_SYS_FLASH_PROTECTION
>   #endif /* !FLASH */
>
>   /* system ace */


Applied all three patches to microblaze custodian repo with minor cleanup.

Thanks,
Michal

Patch

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 295d123..5f16820 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -200,8 +200,6 @@ 
 # define CONFIG_ENV_IS_NOWHERE	1
 # define CONFIG_ENV_SIZE	0x1000
 # define CONFIG_ENV_ADDR	(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
-/* hardware flash protection */
-# define CONFIG_SYS_FLASH_PROTECTION
 #endif /* !FLASH */
 
 /* system ace */