* [U-Boot] [PATCH] ARM: tegra: fix colibri_t20 machine type
@ 2015-03-23 17:43 Marcel Ziswiler
2015-03-23 19:37 ` Stephen Warren
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Ziswiler @ 2015-03-23 17:43 UTC (permalink / raw)
To: u-boot
A while ago I got Russell to change the machine type of our Colibri T20
from COLIBRI_TEGRA2 to COLIBRI_T20 which is also reflected in his
machine registry:
http://www.arm.linux.org.uk/developer/machines/list.php?id=3323
---
arch/arm/include/asm/mach-types.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
index d4a447b..c424a22 100644
--- a/arch/arm/include/asm/mach-types.h
+++ b/arch/arm/include/asm/mach-types.h
@@ -936,7 +936,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_CWME9210 3320
#define MACH_TYPE_CWME9210JS 3321
#define MACH_TYPE_PGS_SITARA 3322
-#define MACH_TYPE_COLIBRI_TEGRA2 3323
+#define MACH_TYPE_COLIBRI_T20 3323
#define MACH_TYPE_W21 3324
#define MACH_TYPE_POLYSAT1 3325
#define MACH_TYPE_DATAWAY 3326
@@ -12197,16 +12197,16 @@ extern unsigned int __machine_arch_type;
# define machine_is_pgs_v1() (0)
#endif
-#ifdef CONFIG_MACH_COLIBRI_TEGRA2
+#ifdef CONFIG_MACH_COLIBRI_T20
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
-# define machine_arch_type MACH_TYPE_COLIBRI_TEGRA2
+# define machine_arch_type MACH_TYPE_COLIBRI_T20
# endif
-# define machine_is_colibri_tegra2() (machine_arch_type == MACH_TYPE_COLIBRI_TEGRA2)
+# define machine_is_colibri_t20() (machine_arch_type == MACH_TYPE_COLIBRI_T20)
#else
-# define machine_is_colibri_tegra2() (0)
+# define machine_is_colibri_t20() (0)
#endif
#ifdef CONFIG_MACH_W21
--
1.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARM: tegra: fix colibri_t20 machine type
2015-03-23 17:43 [U-Boot] [PATCH] ARM: tegra: fix colibri_t20 machine type Marcel Ziswiler
@ 2015-03-23 19:37 ` Stephen Warren
2015-03-26 0:45 ` Marcel Ziswiler
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Warren @ 2015-03-23 19:37 UTC (permalink / raw)
To: u-boot
On 03/23/2015 11:43 AM, Marcel Ziswiler wrote:
> A while ago I got Russell to change the machine type of our Colibri T20
> from COLIBRI_TEGRA2 to COLIBRI_T20 which is also reflected in his
> machine registry:
>
> http://www.arm.linux.org.uk/developer/machines/list.php?id=3323
Only "half" of the references there seem to be updated; there are still
some mentions of e.g. CONFIG_MACH_COLIBRI_TEGRA2,
MACH_TYPE_COLIBRI_TEGRA2. Perhaps it's still in flux?
Even so, this change seems fine since it does better represent the name
of the board.
Acked-by: Stephen Warren <swarren@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARM: tegra: fix colibri_t20 machine type
2015-03-23 19:37 ` Stephen Warren
@ 2015-03-26 0:45 ` Marcel Ziswiler
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Ziswiler @ 2015-03-26 0:45 UTC (permalink / raw)
To: u-boot
On Mon, 2015-03-23 at 13:37 -0600, Stephen Warren wrote:
> Only "half" of the references there seem to be updated; there are still
> some mentions of e.g. CONFIG_MACH_COLIBRI_TEGRA2,
> MACH_TYPE_COLIBRI_TEGRA2. Perhaps it's still in flux?
Ah, yes. Now I remember. Some stuff can't easily be changed from within
that web interface but as Russell actually anyway got rid of most
machine IDs in the mainline kernel I decided to just leave it.
For us it is really very beneficial to actually still be able to boot
downstream L4T kernel with its working hardware accelerated
graphics/multimedia stack albeit it being proprietary/closed-source.
> Even so, this change seems fine since it does better represent the name
> of the board.
>
> Acked-by: Stephen Warren <swarren@nvidia.com>
Thanks. I will resubmit as I forgot to even add my signed-of-by (;-p).
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-26 0:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-23 17:43 [U-Boot] [PATCH] ARM: tegra: fix colibri_t20 machine type Marcel Ziswiler
2015-03-23 19:37 ` Stephen Warren
2015-03-26 0:45 ` Marcel Ziswiler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.