diff mbox

[U-Boot,1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY

Message ID 1321703956-4224-2-git-send-email-agust@denx.de
State Rejected
Headers show

Commit Message

Anatolij Gustschin Nov. 19, 2011, 11:59 a.m. UTC
MACH_TYPE_FARADAY was removed from mach-types.h.
Add it to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/faraday/a320evb/a320evb.c |    1 -
 include/configs/a320evb.h       |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

Comments

Simon Glass Nov. 19, 2011, 5:56 p.m. UTC | #1
On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_FARADAY was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

I built this and it fixes the failure. I did not test on hardware.

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  board/faraday/a320evb/a320evb.c |    1 -
>  include/configs/a320evb.h       |    3 +++
>  2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
> index 2578be4..dfd186b 100644
> --- a/board/faraday/a320evb/a320evb.c
> +++ b/board/faraday/a320evb/a320evb.c
> @@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
>
>  int board_init(void)
>  {
> -       gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
>        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
>
>        ftsmc020_init();        /* initialize Flash */
> diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
> index 45a7c53..2904e2e 100644
> --- a/include/configs/a320evb.h
> +++ b/include/configs/a320evb.h
> @@ -37,6 +37,9 @@
>
>  #undef CONFIG_SKIP_LOWLEVEL_INIT
>
> +#define MACH_TYPE_FARADAY      758
> +#define CONFIG_MACH_TYPE       MACH_TYPE_FARADAY
> +
>  /*
>  * Power Management Unit
>  */
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Anatolij Gustschin Nov. 21, 2011, 6:46 p.m. UTC | #2
Dear Po-Yu Chuang,

On Sat, 19 Nov 2011 12:59:08 +0100
Anatolij Gustschin <agust@denx.de> wrote:

> MACH_TYPE_FARADAY was removed from mach-types.h.
> Add it to the board config file.

Could you please look at this patch and send your
Acked-by if the patch is okay.

Thanks,
Anatolij

> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/faraday/a320evb/a320evb.c |    1 -
>  include/configs/a320evb.h       |    3 +++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
> index 2578be4..dfd186b 100644
> --- a/board/faraday/a320evb/a320evb.c
> +++ b/board/faraday/a320evb/a320evb.c
> @@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
>  
>  int board_init(void)
>  {
> -	gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
>  	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
>  
>  	ftsmc020_init();	/* initialize Flash */
> diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
> index 45a7c53..2904e2e 100644
> --- a/include/configs/a320evb.h
> +++ b/include/configs/a320evb.h
> @@ -37,6 +37,9 @@
>  
>  #undef CONFIG_SKIP_LOWLEVEL_INIT
>  
> +#define MACH_TYPE_FARADAY	758
> +#define CONFIG_MACH_TYPE	MACH_TYPE_FARADAY
> +
>  /*
>   * Power Management Unit
>   */
Po-Yu Chuang Nov. 22, 2011, 3:18 a.m. UTC | #3
Dear Anatolij,

On Tue, Nov 22, 2011 at 2:46 AM, Anatolij Gustschin <agust@denx.de> wrote:
> Dear Po-Yu Chuang,
>
> On Sat, 19 Nov 2011 12:59:08 +0100
> Anatolij Gustschin <agust@denx.de> wrote:
>
>> MACH_TYPE_FARADAY was removed from mach-types.h.
>> Add it to the board config file.
>
> Could you please look at this patch and send your
> Acked-by if the patch is okay.
>
> Thanks,
> Anatolij
>
>>
>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>> ---
>>  board/faraday/a320evb/a320evb.c |    1 -
>>  include/configs/a320evb.h       |    3 +++
>>  2 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
>> index 2578be4..dfd186b 100644
>> --- a/board/faraday/a320evb/a320evb.c
>> +++ b/board/faraday/a320evb/a320evb.c
>> @@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
>>
>>  int board_init(void)
>>  {
>> -     gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
>>       gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
>>
>>       ftsmc020_init();        /* initialize Flash */
>> diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
>> index 45a7c53..2904e2e 100644
>> --- a/include/configs/a320evb.h
>> +++ b/include/configs/a320evb.h
>> @@ -37,6 +37,9 @@
>>
>>  #undef CONFIG_SKIP_LOWLEVEL_INIT
>>
>> +#define MACH_TYPE_FARADAY    758
>> +#define CONFIG_MACH_TYPE     MACH_TYPE_FARADAY
>> +
>>  /*
>>   * Power Management Unit
>>   */

Thanks for your patch and sorry I did not notice it.

Acked-by: Po-Yu Chuang <ratbert.chuang@gmail.com>

Best regards,
Po-Yu Chuang
Po-Yu Chuang Nov. 22, 2011, 3:45 a.m. UTC | #4
Dear Anatolij,

On Tue, Nov 22, 2011 at 11:18 AM, Po-Yu Chuang <ratbert.chuang@gmail.com> wrote:
> Dear Anatolij,
>
> On Tue, Nov 22, 2011 at 2:46 AM, Anatolij Gustschin <agust@denx.de> wrote:
>> Dear Po-Yu Chuang,
>>
>> On Sat, 19 Nov 2011 12:59:08 +0100
>> Anatolij Gustschin <agust@denx.de> wrote:
>>
>>> MACH_TYPE_FARADAY was removed from mach-types.h.
>>> Add it to the board config file.
>>
>> Could you please look at this patch and send your
>> Acked-by if the patch is okay.
>>
>> Thanks,
>> Anatolij
>>
>>>
>>> Signed-off-by: Anatolij Gustschin <agust@denx.de>

[snip]

>
> Thanks for your patch and sorry I did not notice it.
>
> Acked-by: Po-Yu Chuang <ratbert.chuang@gmail.com>
>
> Best regards,
> Po-Yu Chuang
>

Andrew told me that he had submitted a very same patch two weeks ago:

http://www.mail-archive.com/u-boot@lists.denx.de/msg68553.html

I think his patch should be applied instead.

BTW, I have leaved my job. Andrew is currently the maintainer of a320evb.

Best regards,
Po-Yu Chuang
diff mbox

Patch

diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
index 2578be4..dfd186b 100644
--- a/board/faraday/a320evb/a320evb.c
+++ b/board/faraday/a320evb/a320evb.c
@@ -31,7 +31,6 @@  DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	ftsmc020_init();	/* initialize Flash */
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 45a7c53..2904e2e 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -37,6 +37,9 @@ 
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 
+#define MACH_TYPE_FARADAY	758
+#define CONFIG_MACH_TYPE	MACH_TYPE_FARADAY
+
 /*
  * Power Management Unit
  */