From patchwork Thu Mar 26 01:16:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 454838 X-Patchwork-Delegate: twarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id DF9D8140082 for ; Thu, 26 Mar 2015 12:17:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DB11A4A046; Thu, 26 Mar 2015 02:17:12 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5UK__PvuJFqy; Thu, 26 Mar 2015 02:17:12 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD8B14A036; Thu, 26 Mar 2015 02:17:11 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F06F64A036 for ; Thu, 26 Mar 2015 02:17:03 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CuO67-nVKRTw for ; Thu, 26 Mar 2015 02:17:03 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by theia.denx.de (Postfix) with ESMTPS id 184BD4A033 for ; Thu, 26 Mar 2015 02:16:59 +0100 (CET) Received: from localhost.net ([85.5.121.234]) by mrelay.perfora.net (mreueus002) with ESMTPSA (Nemesis) id 0MbAUv-1Ytpwf22cV-00Kl5M; Thu, 26 Mar 2015 02:16:50 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 26 Mar 2015 02:16:33 +0100 Message-Id: <1427332593-13296-1-git-send-email-marcel@ziswiler.com> X-Mailer: git-send-email 1.9.3 X-Provags-ID: V03:K0:6cONLrm7k2PndKh8PauU0Xhm4lQ3CLBWerfHwAACRr8ciAyRG1I afAkxA7a4JBHVurDeb3A1LbF03PS98j9CoU9F1BPykoVYA/iXJ2JBqBB24/5iAf/Cstwf7e RhmK0+EtVG4mKLME8JWM1VtTpMt/+z5dZF/2fVWkHO0yvaDS009W3zopL/NHvHHJ0ksDAz7 nQiRUl+BZpZFUx6RKqkNg== X-UI-Out-Filterresults: notjunk:1; Cc: Stephen Warren , Tom Rini , Marcel Ziswiler , Tom Warren Subject: [U-Boot] [PATCH v2] ARM: tegra: fix colibri_t20 machine type X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" A while ago I got Russell to change the machine type of our Colibri T20 from COLIBRI_TEGRA2 to COLIBRI_T20 which at least in parts is also reflected in his machine registry: http://www.arm.linux.org.uk/developer/machines/list.php?id=3323 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. Signed-off-by: Marcel Ziswiler Acked-by: Stephen Warren --- Changes in v2: - clarified commit message based on Stephen's comments - added my previously missing signed-off-by 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