Message ID | 1320730825-1989-1-git-send-email-yanpai.chen@gmail.com |
---|---|
State | Accepted |
Commit | 641483af40915dabdfe7764bb22d7e5103cb636b |
Delegated to: | Anatolij Gustschin |
Headers | show |
On Tue, Nov 8, 2011 at 1:40 PM, Andrew Chen <yanpai.chen@gmail.com> wrote: > From: Yan-Pai Chen <ypchen@faraday-tech.com> > > MACH_TYPE_FARADAY was dropped from mach-types.h. Add it back to > board config file. > > Signed-off-by: Yan-Pai Chen <ypchen@faraday-tech.com> > --- > board/faraday/a320evb/a320evb.c | 1 - > include/configs/a320evb.h | 6 ++++++ > 2 files changed, 6 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..1fafbed 100644 > --- a/include/configs/a320evb.h > +++ b/include/configs/a320evb.h > @@ -25,6 +25,12 @@ > #include <asm/arch/a320.h> > > /* > + * mach-type definition > + */ > +#define MACH_TYPE_FARADAY 758 > +#define CONFIG_MACH_TYPE MACH_TYPE_FARADAY > + > +/* > * Linux kernel tagged list > */ > #define CONFIG_CMDLINE_TAG > -- > 1.7.4.1 > > Hi All, Is this OK?
On 11/08/11 07:40, Andrew Chen wrote: > From: Yan-Pai Chen <ypchen@faraday-tech.com> > > MACH_TYPE_FARADAY was dropped from mach-types.h. Add it back to > board config file. > > Signed-off-by: Yan-Pai Chen <ypchen@faraday-tech.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il> > --- > board/faraday/a320evb/a320evb.c | 1 - > include/configs/a320evb.h | 6 ++++++ > 2 files changed, 6 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..1fafbed 100644 > --- a/include/configs/a320evb.h > +++ b/include/configs/a320evb.h > @@ -25,6 +25,12 @@ > #include <asm/arch/a320.h> > > /* > + * mach-type definition > + */ > +#define MACH_TYPE_FARADAY 758 > +#define CONFIG_MACH_TYPE MACH_TYPE_FARADAY > + > +/* > * Linux kernel tagged list > */ > #define CONFIG_CMDLINE_TAG
On Tue, 8 Nov 2011 13:40:25 +0800 Andrew Chen <yanpai.chen@gmail.com> wrote: > From: Yan-Pai Chen <ypchen@faraday-tech.com> > > MACH_TYPE_FARADAY was dropped from mach-types.h. Add it back to > board config file. > > Signed-off-by: Yan-Pai Chen <ypchen@faraday-tech.com> > --- > board/faraday/a320evb/a320evb.c | 1 - > include/configs/a320evb.h | 6 ++++++ > 2 files changed, 6 insertions(+), 1 deletions(-) Applied to u-boot-staging agust@denx.de. Thanks! Anatolij
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..1fafbed 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -25,6 +25,12 @@ #include <asm/arch/a320.h> /* + * mach-type definition + */ +#define MACH_TYPE_FARADAY 758 +#define CONFIG_MACH_TYPE MACH_TYPE_FARADAY + +/* * Linux kernel tagged list */ #define CONFIG_CMDLINE_TAG