From patchwork Sat Mar 22 23:12:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 332848 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 6D30F2C0086 for ; Sun, 23 Mar 2014 10:13:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 37EC84B5D2; Sun, 23 Mar 2014 00:13:22 +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 LwpZ1Ns1o12M; Sun, 23 Mar 2014 00:13:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 41F014B5D6; Sun, 23 Mar 2014 00:13:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B935D4B5D6 for ; Sun, 23 Mar 2014 00:13:16 +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 Nasy8hiIHmEh for ; Sun, 23 Mar 2014 00:13:12 +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-f202.google.com (mail-ie0-f202.google.com [209.85.223.202]) by theia.denx.de (Postfix) with ESMTPS id 8BF884B5D2 for ; Sun, 23 Mar 2014 00:13:07 +0100 (CET) Received: by mail-ie0-f202.google.com with SMTP id lx4so720158iec.5 for ; Sat, 22 Mar 2014 16:13:04 -0700 (PDT) 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; bh=oCESSPwXJRUSVIqePIMie8mdegbg8NRxGRnd1ou41q8=; b=ljUgDEDNQ+OG7r3eEw8z89QRg9elWojFCfv0DLFo+0R7xoenAP79eWFZsuYfo8sGsm HCG8GNdmWuxANJATU5+EWHfh2IasfWbmb+xyispGrWDMxsXuxMi6GuWxsBV/jAchtO3N nS87s6KkFHsWRnXrCKa79tTwHqQhqCMnthruoD4cT+fFBo/+G3odDR+pkTXx0dfOPW06 tXqEpCOqNrc5gquFS/rlZ5SggYr7x2I6C7fGIpeQsIUSiWvTL42kX79avcMXdm0fX8v+ 5Kri0Tvxhhc4VRpywruda9jB9GOLuoK9vLwT/1O7e+ChNtTz4MhLy+8b0OE8TT3tTJPJ NWvw== X-Gm-Message-State: ALoCoQlASnVEEkV8n8A+yMmD4cPwdhpBt7PnQl2X524loWuWc7rVxvKZlst11OD9iHgwUmi9X5FWKfe70qYaYcwcog+06KzHStOtUDBCmSaQZzu8KDiTBM0+kmPuDxvwY76jwAt3TJJK9e2bIki5x1vjvuE1tfjRTBU26y19bwddjImGGX8R4kwoe9faHv7Ksl9xXy74nss6 X-Received: by 10.182.104.200 with SMTP id gg8mr9566229obb.45.1395529983488; Sat, 22 Mar 2014 16:13:03 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id jf10si1545329igb.0.2014.03.22.16.13.03 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Mar 2014 16:13:03 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id F18E531C29C; Sat, 22 Mar 2014 16:13:02 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 91F5B220C8F; Sat, 22 Mar 2014 17:13:02 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 22 Mar 2014 17:12:58 -0600 Message-Id: <1395529979-18783-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.9.1.423.g4596e3a Subject: [U-Boot] [PATCH 1/2] sandbox: Provide a build option to avoid using SDL 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 Some machines do not have SDL libraries installed, and it is still useful to build sandbox without LCD/keyboard support. Add an option for this, used as follows: make sandbox_config all NO_SDL=1 Signed-off-by: Simon Glass --- arch/sandbox/config.mk | 6 ++++++ include/configs/sandbox.h | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index e094ae2..c3f889f 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -18,3 +18,9 @@ cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \ $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map CONFIG_ARCH_DEVICE_TREE := sandbox + +# Define this to avoid linking with SDL, which requires SDL libraries +# This can solve 'sdl-config: Command not found' errors +ifneq ($(NO_SDL),) +PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL +endif diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 04171bd..8019753 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -140,8 +140,6 @@ #define CONFIG_CROS_EC #define CONFIG_CMD_CROS_EC #define CONFIG_CROS_EC_SANDBOX -#define CONFIG_KEYBOARD -#define CONFIG_CROS_EC_KEYB #define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_BOARD_LATE_INIT @@ -149,7 +147,12 @@ #define CONFIG_SOUND_SANDBOX #define CONFIG_CMD_SOUND +#ifndef SANDBOX_NO_SDL #define CONFIG_SANDBOX_SDL +#endif + +/* LCD and keyboard require SDL support */ +#ifdef CONFIG_SANDBOX_SDL #define CONFIG_LCD #define CONFIG_VIDEO_SANDBOX_SDL #define CONFIG_CMD_BMP @@ -158,9 +161,18 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define LCD_BPP LCD_COLOR16 +#define CONFIG_CROS_EC_KEYB +#define CONFIG_KEYBOARD + #define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial,cros-ec-keyb\0" \ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" +#else + +#define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial\0" \ + "stdout=serial,lcd\0" \ + "stderr=serial,lcd\0" +#endif #define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2