From patchwork Mon Nov 16 11:15:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ariel D'Alessandro X-Patchwork-Id: 544970 X-Patchwork-Delegate: sjg@chromium.org 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 E7BAE14145F for ; Mon, 16 Nov 2015 22:16:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=vanguardiasur_com_ar.20150623.gappssmtp.com header.i=@vanguardiasur_com_ar.20150623.gappssmtp.com header.b=Tvu1wReB; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3EF74B694; Mon, 16 Nov 2015 12:16:11 +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 diQsl8jHWUhi; Mon, 16 Nov 2015 12:16:11 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D8B44B6B1; Mon, 16 Nov 2015 12:16:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7F58F4B65B for ; Mon, 16 Nov 2015 12:16:05 +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 n9JswLNAJOsg for ; Mon, 16 Nov 2015 12:16:05 +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-qk0-f182.google.com (mail-qk0-f182.google.com [209.85.220.182]) by theia.denx.de (Postfix) with ESMTPS id 0AF114B66A for ; Mon, 16 Nov 2015 12:15:56 +0100 (CET) Received: by qkfo3 with SMTP id o3so108175291qkf.1 for ; Mon, 16 Nov 2015 03:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur_com_ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h64JljKtWxY4yrWQSeONNttcRl/lrM6HzbWs3plqsrI=; b=Tvu1wReBm4tvMEMv3jbzGIjb7YoLyx1BhfZ620Te7pYtgQHXCZmNXwXYW6ubq343gH TEbeJIbGfwlPvm/XVSAOZAyxwVhvnm7i7nvRVazpHQDsPg7e8VJY6gS1bxZBJZSYONQ2 ZXZIlvwDXeZgkL5ppa22mFQjaBJBaJ50lIPDzJvZH0zsFz82YlafmNgOUmHsrwO/qxqX f3tT3EJK6m5yQe9+perm+NWMgKObvl8ytWNbzGUwsiBgvkajxmYSAzyXyXmYTSRl3GcJ 7cm1aVEurr+NwJcY5X4WKJpDabJVMJA/4X06L+fk380L5BZEHpP0PYZnqY4w4P8XfaED RtJw== 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=h64JljKtWxY4yrWQSeONNttcRl/lrM6HzbWs3plqsrI=; b=KG6fEozVAhwGVKY8hIPNPrqoyk+CXjx06GhFBuoGjOYXqFCHfAdlbXPIGqMtSxfWcq Sne28nSzojTDVgoWkO3XMhv1uhNsc3nM9FcuADbYNwZgzB+DZw6xCTa5HK49b73QCg95 f1OFqkAr+sgDcbWLWLP4TCbPiPNb7FfdO8e5w73HAIuuN682pHI8dQOaHE+qo6pBmWmP YNpm3UWwxSwd2J/vSNZay6dBT4VR7L8GePDv7hYVJCITEGmHATTxwnt85CpBUYd1Z7TG 7BHuvgLHVUD/IF036b0V3kkt6j7nCH5DVaE/iVKZiIQX/4vkDI6FRrPY9zxFkLMZA6KH 1Bqg== X-Gm-Message-State: ALoCoQlJAEo4hGX8m15k270tVB9ePM9dCdw5LExNe/ABjq8b9fSdaFmZ6ktKv/aMg9UvvnXSniVJ X-Received: by 10.140.25.166 with SMTP id 35mr35824406qgt.96.1447672555673; Mon, 16 Nov 2015 03:15:55 -0800 (PST) Received: from arch-ntbk.localdomain ([181.164.115.249]) by smtp.gmail.com with ESMTPSA id h124sm4329074qhh.25.2015.11.16.03.15.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Nov 2015 03:15:54 -0800 (PST) From: Ariel D'Alessandro To: u-boot@lists.denx.de Date: Mon, 16 Nov 2015 08:15:51 -0300 Message-Id: <1447672551-2930-3-git-send-email-ariel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447672551-2930-1-git-send-email-ariel@vanguardiasur.com.ar> References: <1447672551-2930-1-git-send-email-ariel@vanguardiasur.com.ar> Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 2/2] rockchip: move SYS_MALLOC_SIMPLE to mach-rockchip Kconfig 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" Commit 1eb0c03c2198a7ec9de456b83dacdc4831b96cbf added SPL_SYS_MALLOC_SIMPLE Kconfig option and changed the way it is evaluated. Thus, the definitions of CONFIG_SYS_MALLOC_SIMPLE in rk3***_common.h board configs are now incorrect because CONFIG_SPL_BUILD is enabled so CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) will look for SPL_SYS_MALLOC_SIMPLE instead of SYS_MALLOC_SIMPLE. This commit fix this enabling SPL_SYS_MALLOC_SIMPLE with the new Kconfig option by default in rockchip-mach. Signed-off-by: Ariel D'Alessandro Acked-by: Simon Glass --- arch/arm/mach-rockchip/Kconfig | 3 +++ include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 6dddbab..607cb71 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -31,6 +31,9 @@ config ROCKCHIP_MAX_INIT_SIZE config SYS_MALLOC_F default y +config SPL_SYS_MALLOC_SIMPLE + default y + config SPL_DM default y diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index b7f78d5..4d3610f 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -27,10 +27,6 @@ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_MEM32 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MALLOC_SIMPLE -#endif - #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_LOAD_ADDR 0x60800800 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 5ba084d..74c7ee1 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -34,10 +34,6 @@ #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SPL_BOARD_INIT -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MALLOC_SIMPLE -#endif - #define CONFIG_SYS_TEXT_BASE 0x00100000 #define CONFIG_SYS_INIT_SP_ADDR 0x00100000 #define CONFIG_SYS_LOAD_ADDR 0x00800800