From patchwork Tue Mar 3 15:03:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 445754 X-Patchwork-Delegate: trini@ti.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 8A0D414008F for ; Wed, 4 Mar 2015 02:03:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AFE644B65B; Tue, 3 Mar 2015 16:03:38 +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 FCAvvohJCO5r; Tue, 3 Mar 2015 16:03:38 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF90D4B617; Tue, 3 Mar 2015 16:03:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74E084B61C for ; Tue, 3 Mar 2015 16:03:26 +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 jlNto7SCpgrC for ; Tue, 3 Mar 2015 16:03:26 +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-ie0-f201.google.com (mail-ie0-f201.google.com [209.85.223.201]) by theia.denx.de (Postfix) with ESMTPS id 0D85C4B617 for ; Tue, 3 Mar 2015 16:03:22 +0100 (CET) Received: by iecrd18 with SMTP id rd18so11882436iec.1 for ; Tue, 03 Mar 2015 07:03:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZbV2nFP94ejSPSfAFLnBRtWxk+nr55q6DskonepoJ0E=; b=bpcYI7o3waxwvmes6dRRM6HKRi9HYBUJpv7he2v0/KRI6wWZHWXL+BvmOxM/mHnYjX Gh3gbVICKodlqdf4dFnxJZz/aMPapkrOwvIWBcRaLErzcJGG4WzozM86LaOxAz1FbO6l YPtdN2BpqZZV8QtEaetHjHGiJyReJ0cfpM6lHj/ZquGhQX/4sWgYh2tvm4TF3vsmplCI frV89jTZ/oqzcCAaHZlRrCJNzmojjdrcpco7EWxxI+QCkg/PQwjrjT+oOq8eqHeJfjkB QChN9+zhuV/40NH+VBdl9pi+sDqfD15SCBYUoo5Y2QD4Ff411FScCG/WGBrUA61uzwsh 4aDw== X-Gm-Message-State: ALoCoQlR9Al5s8n2dkIa1j1Jw4YxN2cJKNtNJKxWvZHwh55zWWdHeteS/7sb71l9NQ8AefFpJyxA X-Received: by 10.50.85.18 with SMTP id d18mr22119330igz.3.1425395001842; Tue, 03 Mar 2015 07:03:21 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id 26si43240yhb.6.2015.03.03.07.03.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2015 07:03:21 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id QYtKJ1ms.1; Tue, 03 Mar 2015 07:03:21 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 115D22207AA; Tue, 3 Mar 2015 08:03:21 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Tue, 3 Mar 2015 08:03:01 -0700 Message-Id: <1425394982-16196-6-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1425394982-16196-1-git-send-email-sjg@chromium.org> References: <1425394982-16196-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Masahiro Yamada Subject: [U-Boot] [PATCH v6 5/6] Make export interface support CONFIG_SYS_MALLOC_SIMPLE 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" When CONFIG_SYS_MALLOC_SIMPLE is defined, free() is a static inline. Make sure that the export interface still builds in this case. Signed-off-by: Simon Glass --- Changes in v6: None Changes in v5: None Changes in v4: - Add new patch to make the export interface support CONFIG_SYS_MALLOC_SIMPLE Changes in v3: None Changes in v2: None include/_exports.h | 2 ++ include/exports.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/_exports.h b/include/_exports.h index 5944703..279017e 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -23,7 +23,9 @@ EXPORT_FUNC(dummy, void, free_hdlr, void) #endif EXPORT_FUNC(malloc, void *, malloc, size_t) +#ifndef CONFIG_SYS_MALLOC_SIMPLE EXPORT_FUNC(free, void, free, void *) +#endif EXPORT_FUNC(udelay, void, udelay, unsigned long) EXPORT_FUNC(get_timer, unsigned long, get_timer, unsigned long) EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list) diff --git a/include/exports.h b/include/exports.h index 205affe..1a01e43 100644 --- a/include/exports.h +++ b/include/exports.h @@ -15,7 +15,9 @@ int printf(const char* fmt, ...); void install_hdlr(int, interrupt_handler_t, void*); void free_hdlr(int); void *malloc(size_t); +#ifndef CONFIG_SYS_MALLOC_SIMPLE void free(void*); +#endif void __udelay(unsigned long); unsigned long get_timer(unsigned long); int vprintf(const char *, va_list);