* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
@ 2011-10-31 7:26 Matthias Weisser
2011-10-31 7:41 ` Igor Grinberg
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Matthias Weisser @ 2011-10-31 7:26 UTC (permalink / raw)
To: u-boot
MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
config file.
Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
board/syteco/jadecpu/jadecpu.c | 1 -
include/configs/jadecpu.h | 6 ++++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
index 63a0d33..72288fe 100644
--- a/board/syteco/jadecpu/jadecpu.c
+++ b/board/syteco/jadecpu/jadecpu.c
@@ -40,7 +40,6 @@ int board_init(void)
writel(0x00000010, &ccnt->cmux_md);
gd->flags = 0;
- gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
icache_enable();
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index a239efc..42cb858 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -37,6 +37,12 @@
#define CONFIG_USE_ARCH_MEMCPY
#define CONFIG_USE_ARCH_MEMSET
+#ifndef MACH_TYPE_JADECPU
+#define MACH_TYPE_JADECPU 2636
+#endif
+
+#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
+
/*
* Environment settings
*/
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-10-31 7:26 [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU Matthias Weisser
@ 2011-10-31 7:41 ` Igor Grinberg
2011-11-05 10:49 ` Albert ARIBAUD
2011-11-05 12:15 ` [U-Boot] [PATCH v2] " Matthias Weisser
2 siblings, 0 replies; 9+ messages in thread
From: Igor Grinberg @ 2011-10-31 7:41 UTC (permalink / raw)
To: u-boot
On 10/31/11 09:26, Matthias Weisser wrote:
> MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
> config file.
>
> Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
> board/syteco/jadecpu/jadecpu.c | 1 -
> include/configs/jadecpu.h | 6 ++++++
> 2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
> index 63a0d33..72288fe 100644
> --- a/board/syteco/jadecpu/jadecpu.c
> +++ b/board/syteco/jadecpu/jadecpu.c
> @@ -40,7 +40,6 @@ int board_init(void)
> writel(0x00000010, &ccnt->cmux_md);
>
> gd->flags = 0;
> - gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
> gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
>
> icache_enable();
> diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
> index a239efc..42cb858 100644
> --- a/include/configs/jadecpu.h
> +++ b/include/configs/jadecpu.h
> @@ -37,6 +37,12 @@
> #define CONFIG_USE_ARCH_MEMCPY
> #define CONFIG_USE_ARCH_MEMSET
>
> +#ifndef MACH_TYPE_JADECPU
> +#define MACH_TYPE_JADECPU 2636
> +#endif
> +
> +#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
> +
> /*
> * Environment settings
> */
--
Regards,
Igor.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-10-31 7:26 [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU Matthias Weisser
2011-10-31 7:41 ` Igor Grinberg
@ 2011-11-05 10:49 ` Albert ARIBAUD
2011-11-05 13:26 ` Wolfgang Denk
2011-11-05 12:15 ` [U-Boot] [PATCH v2] " Matthias Weisser
2 siblings, 1 reply; 9+ messages in thread
From: Albert ARIBAUD @ 2011-11-05 10:49 UTC (permalink / raw)
To: u-boot
Hi Matthias,
Le 31/10/2011 08:26, Matthias Weisser a ?crit :
> MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
> config file.
>
> Signed-off-by: Matthias Weisser<weisserm@arcor.de>
> ---
> board/syteco/jadecpu/jadecpu.c | 1 -
> include/configs/jadecpu.h | 6 ++++++
> 2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
> index 63a0d33..72288fe 100644
> --- a/board/syteco/jadecpu/jadecpu.c
> +++ b/board/syteco/jadecpu/jadecpu.c
> @@ -40,7 +40,6 @@ int board_init(void)
> writel(0x00000010,&ccnt->cmux_md);
>
> gd->flags = 0;
> - gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
> gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
>
> icache_enable();
> diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
> index a239efc..42cb858 100644
> --- a/include/configs/jadecpu.h
> +++ b/include/configs/jadecpu.h
> @@ -37,6 +37,12 @@
> #define CONFIG_USE_ARCH_MEMCPY
> #define CONFIG_USE_ARCH_MEMSET
>
> +#ifndef MACH_TYPE_JADECPU
> +#define MACH_TYPE_JADECPU 2636
> +#endif
NAK -- remove ifndef/endif around definition. This way, if/when mach
type reappears in official mach-type.h, we will get a warning about your
mach-type being defined twice.
> +#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
> +
> /*
> * Environment settings
> */
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-11-05 10:49 ` Albert ARIBAUD
@ 2011-11-05 13:26 ` Wolfgang Denk
2011-11-05 14:09 ` Albert ARIBAUD
0 siblings, 1 reply; 9+ messages in thread
From: Wolfgang Denk @ 2011-11-05 13:26 UTC (permalink / raw)
To: u-boot
Dear Albert ARIBAUD,
In message <4EB514C7.9000503@aribaud.net> you wrote:
>
> > +#ifndef MACH_TYPE_JADECPU
> > +#define MACH_TYPE_JADECPU 2636
> > +#endif
>
> NAK -- remove ifndef/endif around definition. This way, if/when mach
> type reappears in official mach-type.h, we will get a warning about your
> mach-type being defined twice.
Note that you will only get a warning if a _different_ value get's
defined (``warning: "VAR" redefined''). If both values are the same,
no warning will be raised.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If the facts don't fit the theory, change the facts.
-- Albert Einstein
^ permalink raw reply [flat|nested] 9+ messages in thread* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-11-05 13:26 ` Wolfgang Denk
@ 2011-11-05 14:09 ` Albert ARIBAUD
2011-11-05 14:56 ` Wolfgang Denk
0 siblings, 1 reply; 9+ messages in thread
From: Albert ARIBAUD @ 2011-11-05 14:09 UTC (permalink / raw)
To: u-boot
Le 05/11/2011 14:26, Wolfgang Denk a ?crit :
> Dear Albert ARIBAUD,
>
> In message<4EB514C7.9000503@aribaud.net> you wrote:
>>
>>> +#ifndef MACH_TYPE_JADECPU
>>> +#define MACH_TYPE_JADECPU 2636
>>> +#endif
>>
>> NAK -- remove ifndef/endif around definition. This way, if/when mach
>> type reappears in official mach-type.h, we will get a warning about your
>> mach-type being defined twice.
>
> Note that you will only get a warning if a _different_ value get's
> defined (``warning: "VAR" redefined''). If both values are the same,
> no warning will be raised.
Hmm, correct. In order to catch the mach-type creeping back in
mach-types.h, we'd need to define something like
#define MACH_TYPE_JADECPU (2636)
I'll post an ARM-global patch for this, but as it will obviously not be
a bugfix, it'll wait until next merge window.
> Best regards,
>
> Wolfgang Denk
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-11-05 14:09 ` Albert ARIBAUD
@ 2011-11-05 14:56 ` Wolfgang Denk
2011-11-05 15:04 ` Albert ARIBAUD
0 siblings, 1 reply; 9+ messages in thread
From: Wolfgang Denk @ 2011-11-05 14:56 UTC (permalink / raw)
To: u-boot
Dear Albert ARIBAUD,
In message <4EB543AF.7010006@aribaud.net> you wrote:
>
> > Note that you will only get a warning if a _different_ value get's
> > defined (``warning: "VAR" redefined''). If both values are the same,
> > no warning will be raised.
>
> Hmm, correct. In order to catch the mach-type creeping back in
> mach-types.h, we'd need to define something like
>
> #define MACH_TYPE_JADECPU (2636)
>
> I'll post an ARM-global patch for this, but as it will obviously not be
> a bugfix, it'll wait until next merge window.
Please save the effort. Waht would it be good for? As long as the
values are the same, it's OK anyway. And if they should be different,
we get a bunch of warnings.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I am pleased to see that we have differences. May we together become
greater than the sum of both of us.
-- Surak of Vulcan, "The Savage Curtain", stardate 5906.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-11-05 14:56 ` Wolfgang Denk
@ 2011-11-05 15:04 ` Albert ARIBAUD
0 siblings, 0 replies; 9+ messages in thread
From: Albert ARIBAUD @ 2011-11-05 15:04 UTC (permalink / raw)
To: u-boot
Le 05/11/2011 15:56, Wolfgang Denk a ?crit :
> Dear Albert ARIBAUD,
>
> In message<4EB543AF.7010006@aribaud.net> you wrote:
>>
>>> Note that you will only get a warning if a _different_ value get's
>>> defined (``warning: "VAR" redefined''). If both values are the same,
>>> no warning will be raised.
>>
>> Hmm, correct. In order to catch the mach-type creeping back in
>> mach-types.h, we'd need to define something like
>>
>> #define MACH_TYPE_JADECPU (2636)
>>
>> I'll post an ARM-global patch for this, but as it will obviously not be
>> a bugfix, it'll wait until next merge window.
>
> Please save the effort. Waht would it be good for? As long as the
> values are the same, it's OK anyway. And if they should be different,
> we get a bunch of warnings.
Just wanted to make sure we know when the temporary MACH_TYPE addition
in the config header becomes obsolete. But then, I can also run a grep
on include/configs/*.h whenever mach-types.h is updated.
> Best regards,
>
> Wolfgang Denk
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-10-31 7:26 [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU Matthias Weisser
2011-10-31 7:41 ` Igor Grinberg
2011-11-05 10:49 ` Albert ARIBAUD
@ 2011-11-05 12:15 ` Matthias Weisser
2011-11-05 12:36 ` Albert ARIBAUD
2 siblings, 1 reply; 9+ messages in thread
From: Matthias Weisser @ 2011-11-05 12:15 UTC (permalink / raw)
To: u-boot
MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
config file.
Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
Changes in V2:
Removed ifdef around MACH_TYPE
board/syteco/jadecpu/jadecpu.c | 1 -
include/configs/jadecpu.h | 6 ++++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
index 63a0d33..72288fe 100644
--- a/board/syteco/jadecpu/jadecpu.c
+++ b/board/syteco/jadecpu/jadecpu.c
@@ -40,7 +40,6 @@ int board_init(void)
writel(0x00000010, &ccnt->cmux_md);
gd->flags = 0;
- gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
icache_enable();
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index a239efc..42cb858 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -37,6 +37,10 @@
#define CONFIG_USE_ARCH_MEMCPY
#define CONFIG_USE_ARCH_MEMSET
+#define MACH_TYPE_JADECPU 2636
+
+#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
+
/*
* Environment settings
*/
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v2] arm: jadecpu: Readd MACH_TYPE_JADECPU
2011-11-05 12:15 ` [U-Boot] [PATCH v2] " Matthias Weisser
@ 2011-11-05 12:36 ` Albert ARIBAUD
0 siblings, 0 replies; 9+ messages in thread
From: Albert ARIBAUD @ 2011-11-05 12:36 UTC (permalink / raw)
To: u-boot
Hi Matthias,
Le 05/11/2011 13:15, Matthias Weisser a ?crit :
> MACH_TYPE_JADECPU was removed from mach-types.h. Add it to board
> config file.
>
> Signed-off-by: Matthias Weisser<weisserm@arcor.de>
> ---
> Changes in V2:
> Removed ifdef around MACH_TYPE
>
> board/syteco/jadecpu/jadecpu.c | 1 -
> include/configs/jadecpu.h | 6 ++++++
> 2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
> index 63a0d33..72288fe 100644
> --- a/board/syteco/jadecpu/jadecpu.c
> +++ b/board/syteco/jadecpu/jadecpu.c
> @@ -40,7 +40,6 @@ int board_init(void)
> writel(0x00000010,&ccnt->cmux_md);
>
> gd->flags = 0;
> - gd->bd->bi_arch_number = MACH_TYPE_JADECPU;
> gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
>
> icache_enable();
> diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
> index a239efc..42cb858 100644
> --- a/include/configs/jadecpu.h
> +++ b/include/configs/jadecpu.h
> @@ -37,6 +37,10 @@
> #define CONFIG_USE_ARCH_MEMCPY
> #define CONFIG_USE_ARCH_MEMSET
>
> +#define MACH_TYPE_JADECPU 2636
> +
> +#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
> +
> /*
> * Environment settings
> */
Applied to u-boot-arm/master, thanks!
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-11-05 15:04 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-31 7:26 [U-Boot] [PATCH] arm: jadecpu: Readd MACH_TYPE_JADECPU Matthias Weisser
2011-10-31 7:41 ` Igor Grinberg
2011-11-05 10:49 ` Albert ARIBAUD
2011-11-05 13:26 ` Wolfgang Denk
2011-11-05 14:09 ` Albert ARIBAUD
2011-11-05 14:56 ` Wolfgang Denk
2011-11-05 15:04 ` Albert ARIBAUD
2011-11-05 12:15 ` [U-Boot] [PATCH v2] " Matthias Weisser
2011-11-05 12:36 ` Albert ARIBAUD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox