From patchwork Tue Dec 29 12:22:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 561544 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 1A5AC1400CB for ; Tue, 29 Dec 2015 23:24:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=YJLKFTym; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CFAE64BA35; Tue, 29 Dec 2015 13:24:37 +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 fyRcwBcko2S5; Tue, 29 Dec 2015 13:24:37 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C32DC4B95A; Tue, 29 Dec 2015 13:24:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EE82B4B990 for ; Tue, 29 Dec 2015 13:24:25 +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 MMiWzTPCOxqO for ; Tue, 29 Dec 2015 13:24:25 +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-oi0-f54.google.com (mail-oi0-f54.google.com [209.85.218.54]) by theia.denx.de (Postfix) with ESMTPS id 1C4CC4B9E3 for ; Tue, 29 Dec 2015 13:24:19 +0100 (CET) Received: by mail-oi0-f54.google.com with SMTP id o124so187009085oia.1 for ; Tue, 29 Dec 2015 04:24:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=upOjEdrOGxlirq5BajC+uBpxDIkVgXQmujTquJwavek=; b=YJLKFTym4WuvFKtvm4ZLiXj1PcRkGGnUH7lX6fgeY23iuBN70Y68ugxD9WkkcLJ7zn UsKmP/hm6l9j/XlqSPn1tOwGTEGv2iB3CmSN3MRn3FyBYXieMsEfNcJA4E/5xkARShLT 466TRGhR7bKwmUau3lp7P/QadKmsKYr2tZK7Nqi92xvUNDopJ6saWZFHhb1H1NIOK781 O1K+3LKB1Q5nf9VDKsv/fkl9J2xyyg1V2+WvwYLuRRS9rqjTRkHIuERV5CyNJTeS63az L/aR0vk+ZwEAjK8GXWJYvkI+5JoYLCXGxKM/2z6LUXtG9LGow7RgiHzXtHsBrBNCe/o6 jUrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=upOjEdrOGxlirq5BajC+uBpxDIkVgXQmujTquJwavek=; b=hZEpPdmYan8aIPuSNNrHsWIX2PXljMfjWLji5Acn9QFVk2HCa+UvcfHE5igfsyX9+T xVk2UVPP108druC6M9Kc+4L84w+1UFQbuji+zTsMyNujzkXhSaRJeCWkvF7XXGNo+Cx9 Uxlug8I9eetVoYS01eUe65ewaZ7V1wPkUinw11+CgnBpIolaf7wao+GAiHTPiBXxViYa 0c5UXMNRV1pwUOAaWte38VMwyMZVMwWM75WbMtyo1lnS48OyFv+hcT+/plfzB0+TKNDB a+dgcmo31t8fjq9VUUb1DZ0+WjZG6X2XbzehxmFoUNwUGgKGCkGQq/LKBWrpK246gspF zFxg== X-Gm-Message-State: ALoCoQlXhQonH2Y8QUk3mVHHbrEagzsbxTqcN3zs21Nv4PGMcJm9dk5JbiUVRrKCZXHuOMN19JCNqmt5GCmbF6uaDG3QCwqlqg== X-Received: by 10.202.85.195 with SMTP id j186mr36481340oib.74.1451391858771; Tue, 29 Dec 2015 04:24:18 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id m11sm20970427oif.19.2015.12.29.04.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Dec 2015 04:24:15 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id AA3462214C4; Tue, 29 Dec 2015 05:24:13 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Tue, 29 Dec 2015 05:22:45 -0700 Message-Id: <1451391772-6203-4-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1451391772-6203-1-git-send-email-sjg@chromium.org> References: <1451391772-6203-1-git-send-email-sjg@chromium.org> Cc: Jeffy Chen Subject: [U-Boot] [PATCH 03/10] rockchip: Fix the configuration for chromebook_jerry 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" Various updates did not make it through to this board. Also the instructions for building a SPI image are no-longer correct. Fix these so that Jerry can boot to a prompt again. Signed-off-by: Simon Glass --- configs/chromebook_jerry_defconfig | 4 ++++ doc/README.rockchip | 7 ++++--- include/configs/chromebook_jerry.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index da47707..a515d8d 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -27,7 +27,9 @@ CONFIG_RESET=y CONFIG_DM_MMC=y CONFIG_ROCKCHIP_DWMMC=y CONFIG_PINCTRL=y +# CONFIG_PINCTRL_FULL is not set CONFIG_SPL_PINCTRL=y +# CONFIG_SPL_PINCTRL_FULL is not set CONFIG_ROCKCHIP_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y @@ -41,5 +43,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_USE_PRIVATE_LIBGCC=y +CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y +CONFIG_ROCKCHIP_SPI=y diff --git a/doc/README.rockchip b/doc/README.rockchip index b455f6f..9a2ebca 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -135,9 +135,10 @@ Booting from SPI To write an image that boots from SPI flash (e.g. for the Haier Chromebook): - ./chromebook_jerry/tools/mkimage -n rk3036 -T rkspi -d chromebook_jerry/spl/u-boot-spl-dtb.bin out - dd if=spl.bin of=out.bin bs=128K conv=sync - cat chromebook_jerry/u-boot-dtb.img out.bin + ./chromebook_jerry/tools/mkimage -n rk3288 -T rkspi \ + -d chromebook_jerry/spl/u-boot-spl-dtb.bin spl.bin && \ + dd if=spl.bin of=spl-out.bin bs=128K conv=sync && \ + cat spl-out.bin chromebook_jerry/u-boot-dtb.img >out.bin && \ dd if=out.bin of=out.bin.pad bs=4M conv=sync This converts the SPL image to the required SPI format by adding the Rockchip diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index 058325c..e29d776 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -13,5 +13,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD +#define CONFIG_SPI_FLASH_GIGADEVICE #endif