From patchwork Tue Mar 4 22:34:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 326536 X-Patchwork-Delegate: daniel.schwierzeck@googlemail.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 B73D42C00D2 for ; Wed, 5 Mar 2014 09:35:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 72DC54B7BD; Tue, 4 Mar 2014 23:35:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 HiVPvbhppTTC; Tue, 4 Mar 2014 23:35:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE0B14B7BE; Tue, 4 Mar 2014 23:35:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 811314B7BE for ; Tue, 4 Mar 2014 23:35:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 qAx-xEwhqipM for ; Tue, 4 Mar 2014 23:35:00 +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 mail-bk0-f46.google.com (mail-bk0-f46.google.com [209.85.214.46]) by theia.denx.de (Postfix) with ESMTPS id 5E0844B7BD for ; Tue, 4 Mar 2014 23:34:56 +0100 (CET) Received: by mail-bk0-f46.google.com with SMTP id v15so362643bkz.33 for ; Tue, 04 Mar 2014 14:34:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=VHXbICCH9bRhF7TG6tlROis2/MvxZun8mcWKIMzPxRY=; b=oFOEWX3FnyoR0q3km69C35lZak/J2Y9b6LRmVIHDeOohZcP8bFoeDo230nIavYXlL6 icDWZ6nNNOSq4FacY2BGkF1NZBM58lXjWOjEnNudYebFd/nRkSB9Pjrk2zYJzJ888NLn T/S8UXPp8yxzIk+3M6sRRsMPYNp9ini3IrwDpnOqRHkJVNvMxBR08S8Mj7ZQtTD1DqBz Bc38KC5HD5D9wQqygvEbmk1PfPehF7wq51GaidzIn3Bx5sDhzAU/gdd32oZkBywMDbSS kHxmKatWadqvgtK/xxpOOacJOXib33pPdtfFemwt+Vmqu5iZolI6XceuOnAuyiLpIXhF 4v2Q== X-Received: by 10.204.201.16 with SMTP id ey16mr665508bkb.52.1393972496335; Tue, 04 Mar 2014 14:34:56 -0800 (PST) Received: from workstation.zombienet.local (p57A86DC7.dip0.t-ipconnect.de. [87.168.109.199]) by mx.google.com with ESMTPSA id xj2sm2610509bkb.15.2014.03.04.14.34.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 14:34:55 -0800 (PST) From: Daniel Schwierzeck To: u-boot@lists.denx.de Date: Tue, 4 Mar 2014 23:34:51 +0100 Message-Id: <1393972491-29420-1-git-send-email-daniel.schwierzeck@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [U-Boot] [PATCH RESEND] MIPS: fix types u64 and __u64 to unsigned long long X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Linux MIPS uses asm-generic/int-ll64.h in asm/types.h. Thus u64 and __u64 are defined as unsigned long long. Port this over to U-Boot. Signed-off-by: Daniel Schwierzeck --- This fixes all warnings on qemu_mips64 introduced by patch http://patchwork.ozlabs.org/patch/324673/. --- arch/mips/include/asm/types.h | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index d4bb859..aebafdb 100644 --- a/arch/mips/include/asm/types.h +++ b/arch/mips/include/asm/types.h @@ -27,18 +27,12 @@ typedef unsigned short __u16; typedef __signed__ int __s32; typedef unsigned int __u32; -#if (_MIPS_SZLONG == 64) - -typedef __signed__ long __s64; -typedef unsigned long __u64; - -#else - #if defined(__GNUC__) __extension__ typedef __signed__ long long __s64; __extension__ typedef unsigned long long __u64; -#endif - +#else +typedef __signed__ long long __s64; +typedef unsigned long long __u64; #endif #endif /* __ASSEMBLY__ */ @@ -61,19 +55,8 @@ typedef unsigned short u16; typedef __signed int s32; typedef unsigned int u32; -#if (_MIPS_SZLONG == 64) - -typedef __signed__ long s64; -typedef unsigned long u64; - -#else - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) typedef __signed__ long long s64; typedef unsigned long long u64; -#endif - -#endif #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ || defined(CONFIG_64BIT)