| Message ID | 1320087260-6152-1-git-send-email-dimov@ronetix.at |
|---|---|
| State | Accepted |
| Commit | a3e09cc28c0abb48f76f9375bf4d1c6e0cae82fe |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
On 10/31/11 20:54, Asen Chavdarov Dimov wrote: > > Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Hi Asen, Le 31/10/2011 19:54, Asen Chavdarov Dimov a écrit : > > Signed-off-by: Asen Chavdarov Dimov<dimov@ronetix.at> > --- > board/ronetix/pm9261/pm9261.c | 3 --- > board/ronetix/pm9263/pm9263.c | 3 --- > board/ronetix/pm9g45/pm9g45.c | 2 -- > include/configs/pm9261.h | 3 +++ > include/configs/pm9263.h | 3 +++ > include/configs/pm9g45.h | 3 +++ > 6 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c > index 871b94a..b26e33a 100644 > --- a/board/ronetix/pm9261/pm9261.c > +++ b/board/ronetix/pm9261/pm9261.c > @@ -248,9 +248,6 @@ int board_init(void) > 1<< ATMEL_ID_PIOC, > &pmc->pcer); > > - /* arch number of PM9261-Board */ > - gd->bd->bi_arch_number = MACH_TYPE_PM9261; > - > /* adress of boot parameters */ > gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; > > diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c > index cfc9847..b0f7ea6 100644 > --- a/board/ronetix/pm9263/pm9263.c > +++ b/board/ronetix/pm9263/pm9263.c > @@ -349,9 +349,6 @@ int board_init(void) > (1<< ATMEL_ID_PIOB), > &pmc->pcer); > > - /* arch number of AT91SAM9263EK-Board */ > - gd->bd->bi_arch_number = MACH_TYPE_PM9263; > - > /* adress of boot parameters */ > gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; > > diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c > index f3374a4..961d193 100644 > --- a/board/ronetix/pm9g45/pm9g45.c > +++ b/board/ronetix/pm9g45/pm9g45.c > @@ -139,8 +139,6 @@ int board_init(void) > (1<< ATMEL_ID_PIOC) | > (1<< ATMEL_ID_PIODE),&pmc->pcer); > > - /* arch number of AT91SAM9M10G45EK-Board */ > - gd->bd->bi_arch_number = MACH_TYPE_PM9G45; > /* adress of boot parameters */ > gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; > > diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h > index 89e17b8..55455e7 100644 > --- a/include/configs/pm9261.h > +++ b/include/configs/pm9261.h > @@ -52,6 +52,9 @@ > #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ > #define CONFIG_SYS_TEXT_BASE 0 > > +#define MACH_TYPE_PM9261 1187 > +#define CONFIG_MACH_TYPE MACH_TYPE_PM9261 > + > /* clocks */ > /* CKGR_MOR - enable main osc. */ > #define CONFIG_SYS_MOR_VAL \ > diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h > index 1f7543c..43104a3 100644 > --- a/include/configs/pm9263.h > +++ b/include/configs/pm9263.h > @@ -52,6 +52,9 @@ > #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ > #define CONFIG_SYS_TEXT_BASE 0 > > +#define MACH_TYPE_PM9263 1475 > +#define CONFIG_MACH_TYPE MACH_TYPE_PM9263 > + > /* clocks */ > #define CONFIG_SYS_MOR_VAL \ > (AT91_PMC_MOR_MOSCEN | \ > diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h > index acc1204..d3beaf3 100644 > --- a/include/configs/pm9g45.h > +++ b/include/configs/pm9g45.h > @@ -41,6 +41,9 @@ > #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ > #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45" > > +#define MACH_TYPE_PM9G45 2672 > +#define CONFIG_MACH_TYPE MACH_TYPE_PM9G45 > + > /* ARM asynchronous clock */ > #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ > #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 871b94a..b26e33a 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -248,9 +248,6 @@ int board_init(void) 1 << ATMEL_ID_PIOC, &pmc->pcer); - /* arch number of PM9261-Board */ - gd->bd->bi_arch_number = MACH_TYPE_PM9261; - /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index cfc9847..b0f7ea6 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -349,9 +349,6 @@ int board_init(void) (1 << ATMEL_ID_PIOB), &pmc->pcer); - /* arch number of AT91SAM9263EK-Board */ - gd->bd->bi_arch_number = MACH_TYPE_PM9263; - /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index f3374a4..961d193 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -139,8 +139,6 @@ int board_init(void) (1 << ATMEL_ID_PIOC) | (1 << ATMEL_ID_PIODE), &pmc->pcer); - /* arch number of AT91SAM9M10G45EK-Board */ - gd->bd->bi_arch_number = MACH_TYPE_PM9G45; /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 89e17b8..55455e7 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -52,6 +52,9 @@ #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ #define CONFIG_SYS_TEXT_BASE 0 +#define MACH_TYPE_PM9261 1187 +#define CONFIG_MACH_TYPE MACH_TYPE_PM9261 + /* clocks */ /* CKGR_MOR - enable main osc. */ #define CONFIG_SYS_MOR_VAL \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 1f7543c..43104a3 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -52,6 +52,9 @@ #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ #define CONFIG_SYS_TEXT_BASE 0 +#define MACH_TYPE_PM9263 1475 +#define CONFIG_MACH_TYPE MACH_TYPE_PM9263 + /* clocks */ #define CONFIG_SYS_MOR_VAL \ (AT91_PMC_MOR_MOSCEN | \ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index acc1204..d3beaf3 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -41,6 +41,9 @@ #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45" +#define MACH_TYPE_PM9G45 2672 +#define CONFIG_MACH_TYPE MACH_TYPE_PM9G45 + /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at> --- board/ronetix/pm9261/pm9261.c | 3 --- board/ronetix/pm9263/pm9263.c | 3 --- board/ronetix/pm9g45/pm9g45.c | 2 -- include/configs/pm9261.h | 3 +++ include/configs/pm9263.h | 3 +++ include/configs/pm9g45.h | 3 +++ 6 files changed, 9 insertions(+), 8 deletions(-)