Patchwork [U-Boot,2/9] openrisc: Add architecture image support

login
register
mail settings
Submitter Stefan Kristiansson
Date Nov. 19, 2011, 5:21 a.m.
Message ID <1321680098-31121-3-git-send-email-stefan.kristiansson@saunalahti.fi>
Download mbox | patch
Permalink /patch/126520/
State Superseded
Headers show

Comments

Stefan Kristiansson - Nov. 19, 2011, 5:21 a.m.
Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
---
 common/image.c  |    1 +
 include/image.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
Marek Vasut - Nov. 21, 2011, 10:45 p.m.
> Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> ---
>  common/image.c  |    1 +
>  include/image.h |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/common/image.c b/common/image.c
> index 555d9d9..564dee1 100644
> --- a/common/image.c
> +++ b/common/image.c
> @@ -94,6 +94,7 @@ static const table_entry_t uimage_arch[] = {
>  	{	IH_ARCH_BLACKFIN,	"blackfin",	"Blackfin",	},
>  	{	IH_ARCH_AVR32,		"avr32",	"AVR32",	},
>  	{	IH_ARCH_NDS32,		"nds32",	"NDS32",	},
> +	{	IH_ARCH_OPENRISC,	"or1k",		"OpenRISC 1000",},
>  	{	-1,			"",		"",		},
>  };
> 
> diff --git a/include/image.h b/include/image.h
> index c56a18d..dffa3cd 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -108,6 +108,7 @@
>  #define IH_ARCH_ST200	        18	/* STMicroelectronics ST200  */
>  #define IH_ARCH_SANDBOX		19	/* Sandbox architecture (test 
only) */
>  #define IH_ARCH_NDS32	        19	/* ANDES Technology - NDS32  */
> +#define IH_ARCH_OPENRISC        21	/* OpenRISC 1000  */

This is actually weird, right ? Sandbox and NDS32 having the same number. I 
smell merge issue here which needs a tiny patch.
> 
>  /*
>   * Image Types

M

Patch

diff --git a/common/image.c b/common/image.c
index 555d9d9..564dee1 100644
--- a/common/image.c
+++ b/common/image.c
@@ -94,6 +94,7 @@  static const table_entry_t uimage_arch[] = {
 	{	IH_ARCH_BLACKFIN,	"blackfin",	"Blackfin",	},
 	{	IH_ARCH_AVR32,		"avr32",	"AVR32",	},
 	{	IH_ARCH_NDS32,		"nds32",	"NDS32",	},
+	{	IH_ARCH_OPENRISC,	"or1k",		"OpenRISC 1000",},
 	{	-1,			"",		"",		},
 };
 
diff --git a/include/image.h b/include/image.h
index c56a18d..dffa3cd 100644
--- a/include/image.h
+++ b/include/image.h
@@ -108,6 +108,7 @@ 
 #define IH_ARCH_ST200	        18	/* STMicroelectronics ST200  */
 #define IH_ARCH_SANDBOX		19	/* Sandbox architecture (test only) */
 #define IH_ARCH_NDS32	        19	/* ANDES Technology - NDS32  */
+#define IH_ARCH_OPENRISC        21	/* OpenRISC 1000  */
 
 /*
  * Image Types