* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
@ 2013-11-27 9:33 Linus Walleij
2013-11-27 9:55 ` Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Linus Walleij @ 2013-11-27 9:33 UTC (permalink / raw)
To: u-boot
When U-Boot is configured for Versatile AB, it will still pass
the machine ID of Versatile PB to the kernel. After this simple
fix the system boots correctly.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
board/armltd/versatile/versatile.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
index 30a3b904db4c..4e2d3421d8b1 100644
--- a/board/armltd/versatile/versatile.c
+++ b/board/armltd/versatile/versatile.c
@@ -52,7 +52,11 @@ int board_early_init_f (void)
int board_init (void)
{
/* arch number of Versatile Board */
+#ifdef CONFIG_ARCH_VERSATILE_AB
+ gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB;
+#else
gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
+#endif
/* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
2013-11-27 9:33 [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB Linus Walleij
@ 2013-11-27 9:55 ` Marek Vasut
2013-11-27 12:39 ` Linus Walleij
2013-11-27 12:51 ` Stefano Babic
2013-11-27 10:02 ` Marek Vasut
2014-01-13 8:45 ` Albert ARIBAUD
2 siblings, 2 replies; 8+ messages in thread
From: Marek Vasut @ 2013-11-27 9:55 UTC (permalink / raw)
To: u-boot
Dear Linus Walleij,
> When U-Boot is configured for Versatile AB, it will still pass
> the machine ID of Versatile PB to the kernel. After this simple
> fix the system boots correctly.
>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> board/armltd/versatile/versatile.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/board/armltd/versatile/versatile.c
> b/board/armltd/versatile/versatile.c index 30a3b904db4c..4e2d3421d8b1
> 100644
> --- a/board/armltd/versatile/versatile.c
> +++ b/board/armltd/versatile/versatile.c
> @@ -52,7 +52,11 @@ int board_early_init_f (void)
> int board_init (void)
> {
> /* arch number of Versatile Board */
> +#ifdef CONFIG_ARCH_VERSATILE_AB
> + gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB;
> +#else
> gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
> +#endif
>
> /* adress of boot parameters */
> gd->bd->bi_boot_params = 0x00000100;
We should just switch to DT, but I do understand the motivation here. Can you
not detect which board it is dynamically to avoid the ifdef?
Otherwise:
Acked-by: Marek Vasut <marex@denx.de>
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
2013-11-27 9:55 ` Marek Vasut
@ 2013-11-27 12:39 ` Linus Walleij
2013-11-27 12:51 ` Stefano Babic
1 sibling, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2013-11-27 12:39 UTC (permalink / raw)
To: u-boot
On Wed, Nov 27, 2013 at 10:55 AM, Marek Vasut <marex@denx.de> wrote:
> We should just switch to DT, but I do understand the motivation here.
I will be working on cleanups and DT next, this is just to get a
working baseline.
> Can you
> not detect which board it is dynamically to avoid the ifdef?
No :-/
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
2013-11-27 9:55 ` Marek Vasut
2013-11-27 12:39 ` Linus Walleij
@ 2013-11-27 12:51 ` Stefano Babic
2013-11-27 13:12 ` Linus Walleij
1 sibling, 1 reply; 8+ messages in thread
From: Stefano Babic @ 2013-11-27 12:51 UTC (permalink / raw)
To: u-boot
On 27/11/2013 10:55, Marek Vasut wrote:
> Dear Linus Walleij,
>
>> When U-Boot is configured for Versatile AB, it will still pass
>> the machine ID of Versatile PB to the kernel. After this simple
>> fix the system boots correctly.
>>
>> Cc: Stefano Babic <sbabic@denx.de>
>> Cc: Marek Vasut <marex@denx.de>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>> ---
>> board/armltd/versatile/versatile.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/board/armltd/versatile/versatile.c
>> b/board/armltd/versatile/versatile.c index 30a3b904db4c..4e2d3421d8b1
>> 100644
>> --- a/board/armltd/versatile/versatile.c
>> +++ b/board/armltd/versatile/versatile.c
>> @@ -52,7 +52,11 @@ int board_early_init_f (void)
>> int board_init (void)
>> {
>> /* arch number of Versatile Board */
>> +#ifdef CONFIG_ARCH_VERSATILE_AB
>> + gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB;
>> +#else
>> gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
>> +#endif
>>
>> /* adress of boot parameters */
>> gd->bd->bi_boot_params = 0x00000100;
>
> We should just switch to DT, but I do understand the motivation here. Can you
> not detect which board it is dynamically to avoid the ifdef?
>
I do not know if it is possible, but if yes, we did not need in the past
to introduce CONFIG_ARCH_VERSATILE_AB.
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
2013-11-27 12:51 ` Stefano Babic
@ 2013-11-27 13:12 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2013-11-27 13:12 UTC (permalink / raw)
To: u-boot
On Wed, Nov 27, 2013 at 1:51 PM, Stefano Babic <sbabic@denx.de> wrote:
> I do not know if it is possible, but if yes, we did not need in the past to
> introduce CONFIG_ARCH_VERSATILE_AB.
The boards are similar enough that they will boot to prompt, but they
will register the wrong set of peripherals, and some stuff will not
work...
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
2013-11-27 9:33 [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB Linus Walleij
2013-11-27 9:55 ` Marek Vasut
@ 2013-11-27 10:02 ` Marek Vasut
2013-11-27 12:39 ` Linus Walleij
2014-01-13 8:45 ` Albert ARIBAUD
2 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2013-11-27 10:02 UTC (permalink / raw)
To: u-boot
Dear Linus Walleij,
+CC Albert, he's the ARM guy. Stefano is the Freescale IMX guy :)
> When U-Boot is configured for Versatile AB, it will still pass
> the machine ID of Versatile PB to the kernel. After this simple
> fix the system boots correctly.
>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> board/armltd/versatile/versatile.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/board/armltd/versatile/versatile.c
> b/board/armltd/versatile/versatile.c index 30a3b904db4c..4e2d3421d8b1
> 100644
> --- a/board/armltd/versatile/versatile.c
> +++ b/board/armltd/versatile/versatile.c
> @@ -52,7 +52,11 @@ int board_early_init_f (void)
> int board_init (void)
> {
> /* arch number of Versatile Board */
> +#ifdef CONFIG_ARCH_VERSATILE_AB
> + gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB;
> +#else
> gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
> +#endif
>
> /* adress of boot parameters */
> gd->bd->bi_boot_params = 0x00000100;
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB
2013-11-27 9:33 [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB Linus Walleij
2013-11-27 9:55 ` Marek Vasut
2013-11-27 10:02 ` Marek Vasut
@ 2014-01-13 8:45 ` Albert ARIBAUD
2 siblings, 0 replies; 8+ messages in thread
From: Albert ARIBAUD @ 2014-01-13 8:45 UTC (permalink / raw)
To: u-boot
Hi Linus,
On Wed, 27 Nov 2013 10:33:32 +0100, Linus Walleij
<linus.walleij@linaro.org> wrote:
> When U-Boot is configured for Versatile AB, it will still pass
> the machine ID of Versatile PB to the kernel. After this simple
> fix the system boots correctly.
>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> board/armltd/versatile/versatile.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
> index 30a3b904db4c..4e2d3421d8b1 100644
> --- a/board/armltd/versatile/versatile.c
> +++ b/board/armltd/versatile/versatile.c
> @@ -52,7 +52,11 @@ int board_early_init_f (void)
> int board_init (void)
> {
> /* arch number of Versatile Board */
> +#ifdef CONFIG_ARCH_VERSATILE_AB
> + gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB;
> +#else
> gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
> +#endif
>
> /* adress of boot parameters */
> gd->bd->bi_boot_params = 0x00000100;
Applied to u-boot-arm/next, thanks!
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-01-13 8:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-27 9:33 [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB Linus Walleij
2013-11-27 9:55 ` Marek Vasut
2013-11-27 12:39 ` Linus Walleij
2013-11-27 12:51 ` Stefano Babic
2013-11-27 13:12 ` Linus Walleij
2013-11-27 10:02 ` Marek Vasut
2013-11-27 12:39 ` Linus Walleij
2014-01-13 8:45 ` Albert ARIBAUD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox