From patchwork Wed Aug 9 23:14:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 800026 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UaTxQ22Q"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xSRvQ1s4Mz9s4q for ; Thu, 10 Aug 2017 09:15:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0B3A3C21C26; Wed, 9 Aug 2017 23:15:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BD504C21C59; Wed, 9 Aug 2017 23:15:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 97E53C21C5C; Wed, 9 Aug 2017 23:14:56 +0000 (UTC) Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by lists.denx.de (Postfix) with ESMTPS id 238DCC21D94 for ; Wed, 9 Aug 2017 23:14:53 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id c15so7293049qta.3 for ; Wed, 09 Aug 2017 16:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z0dtmVcLtkpVehMvnuzMDFaNfUArBiPQKmeQkqGtR3A=; b=UaTxQ22QT4bf01qZ+jKjlyaU4bGbW2KkqUVKElVTDCzqSsK8Jza0m2Okkr7UYN7CRb 08fZZXU/1tTrtxcIvJoltqDJiRiOuOYu+hHcprU1+79v/ZaijCct03jd9gVGqIL2Osya WcpkVh/TTR/FenViyO1/Skccy8xdstwgwHPfmLL7eCO3FZ4tB/mKCQN4zqQXHGH7/gbT syMIvn8Nn8Li1TdXz6KgHOJwYxTNBVF8CsU/aDapO/venZxKSC7t5VxthmJil+7yF5ev qIzIrO52XgZXF7ZdUNKJPRFIaZNnuATRNtV2kNlaXOm/r1bLn55Rh5hllaQP24uid4RI 92RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z0dtmVcLtkpVehMvnuzMDFaNfUArBiPQKmeQkqGtR3A=; b=qIX9jLBTPO5KBy+zNWUTisbf0CU0BIFle8ot1iIA/+vvLNXFBfJLWoV+Vg4YupIXwT K3gINHEi6isKGwZ9RDMm4Ua7g3d0ergI25hJhf+TX6qTpMZYVYSZQzJTHtD2EPJMIPLC 1fsF4xNFaac2+dVGk4Hi+fT2FD2CVaq/kj4BSOdvMOSVVQxuT2MwM4BQLQkBvCvof/Dq OM1F8kysgl/FWBpXuPXSO6m13mbjLVH0t/74CL/mnrHFK1djtMG69MOijoD52EQzMtn9 /1ObRkqhGCmoJLiwX1/5iAseStg8/okemeqZ/tU1f+c5J3C5XF/ZI09wFg6Q2zj8u8gK jnnA== X-Gm-Message-State: AHYfb5jSEOpz55lEsC+fmV1u6Y5wDkhdRTZb+MrosGVXOZpOJawuomhy NY53n5K0VXxrUogHPxU= X-Received: by 10.237.37.70 with SMTP id w6mr13924047qtc.215.1502320491724; Wed, 09 Aug 2017 16:14:51 -0700 (PDT) Received: from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a]) by smtp.gmail.com with ESMTPSA id n69sm2634888qke.52.2017.08.09.16.14.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2017 16:14:50 -0700 (PDT) From: Rob Clark To: U-Boot Mailing List Date: Wed, 9 Aug 2017 19:14:31 -0400 Message-Id: <20170809231441.22691-2-robdclark@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170809231441.22691-1-robdclark@gmail.com> References: <20170809231441.22691-1-robdclark@gmail.com> Cc: Stefan Agner , Andre Przywara , Andreas Dannenberg , Jagan Teki , "Cooper Jr., Franklin" Subject: [U-Boot] [PATCH 1/5] Kconfig: add option to build with -fshort-wchar X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" UEFI expects strings to be UTF-16. So add an option so that when EFI_LOADER is enabled, we can use the expected unicode string size. Signed-off-by: Rob Clark --- Kconfig | 8 ++++++++ Makefile | 4 ++++ lib/efi_loader/Kconfig | 1 + 3 files changed, 13 insertions(+) diff --git a/Kconfig b/Kconfig index c1451bceda..7319f1fa94 100644 --- a/Kconfig +++ b/Kconfig @@ -53,6 +53,14 @@ config CC_OPTIMIZE_FOR_SIZE This option is enabled by default for U-Boot. +config CC_SHORT_WCHAR + bool "Use 16b wchar" + default n + help + Enabling this option will pass "-fshort-wchar" to gcc, for + 16bit unicode strings. This is used by EFI_LOADER, as the + UEFI spec defines strings to be UTF-16. + config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA diff --git a/Makefile b/Makefile index 50a002e72f..91b11f5a7b 100644 --- a/Makefile +++ b/Makefile @@ -590,6 +590,10 @@ else KBUILD_CFLAGS += -O2 endif +ifdef CONFIG_CC_SHORT_WCHAR +KBUILD_CFLAGS += -fshort-wchar +endif + KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index d2b6327119..e28ef51ad4 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -1,6 +1,7 @@ config EFI_LOADER bool "Support running EFI Applications in U-Boot" depends on (ARM || X86) && OF_LIBFDT + select CC_SHORT_WCHAR default y help Select this option if you want to run EFI applications (like grub2)