From patchwork Mon Jan 23 03:51:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 718370 X-Patchwork-Delegate: marek.vasut@gmail.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 3v6HTt54jHz9t0G for ; Mon, 23 Jan 2017 14:53:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bRhgeF8d"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 511934B731; Mon, 23 Jan 2017 04:52:52 +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 RlHHnzS5T_9T; Mon, 23 Jan 2017 04:52:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E02104ADB1; Mon, 23 Jan 2017 04:52:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79FCC4B578 for ; Mon, 23 Jan 2017 04:52:27 +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 KwkqF1LXf-u3 for ; Mon, 23 Jan 2017 04:52:27 +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-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by theia.denx.de (Postfix) with ESMTPS id 7BE524AF38 for ; Mon, 23 Jan 2017 04:52:18 +0100 (CET) Received: by mail-pf0-f196.google.com with SMTP id e4so9099421pfg.0 for ; Sun, 22 Jan 2017 19:52:17 -0800 (PST) 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=KQoFzYf6k1a2tGdPakLFHujfaSr9P/rzJeUYw9cXALU=; b=bRhgeF8dOyIdOOZtIP5K7MBZbkfeCiVK/4HUgfFI5zkSKm4W2WONxppc3nFbRAJE3X V2DCf2KxBxiVpx1QTYZhgkyf5bWE/O/GmKP8J3uXu0yrK8ZyeMvRWu2rJn1xMQAtvv98 w8AbvGMMv62vDFUorhMqQad8EVehWwUjomK6cpsm0nufPZOrNF9Y5ZxpQl7HVGDqg8J7 xZ3qj+OVuUKl7Z1KmUNBxO+aGx/QFWXsu76DktX0T78O0Wr3NCv5wBiAgfaXmq+tyd4G BQZ0+UcgXVo6plqrXgEMov4GNJH7YuNai/85aIlI5XvxUALiF93pE+twr9pJVDRc9ue5 s+Mw== 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=KQoFzYf6k1a2tGdPakLFHujfaSr9P/rzJeUYw9cXALU=; b=CZpUDEXwkYpptfdrn6qQ7p1bp4DZBN/Xkntkq1bMu4T5j+8Xhkkos18f1anGVqNQzz FlYSVY1btdexr88DGIxjMeSAxwiOPOaDccQP5LYv6VB9H1O1VTXwJ4NMlSo+8pif1ezm c602QN4V0CJbQD+8bn3UdB/RDV1DDqdAgDclpAUhRTnelEv0yjRMX/5xKkf7QARfLlth TvikPgW2msJz8quNIcrxR0S1bHXm1t43/b/YE2wpR4EL0jrE7T+g+uSBLBx/Jnmwha2v PvpD8Aff0g2BENrbedwIGJMiM4L/wRYi3R0//SMIov1e27SFkwDfEbNzvU+Yh10yJqrM kpHQ== X-Gm-Message-State: AIkVDXKTnoW+SzbxBJcp7r1vH60noHiaOQMuBc1CiQAUtxm3ug/vxKN92Ms+/rm6sj2BPw== X-Received: by 10.98.117.10 with SMTP id q10mr29465955pfc.31.1485143536622; Sun, 22 Jan 2017 19:52:16 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id s8sm32424755pfj.30.2017.01.22.19.52.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jan 2017 19:52:16 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, sr@denx.de, dinguyen@kernel.org, chin.liang.see@intel.com Date: Sun, 22 Jan 2017 19:51:53 -0800 Message-Id: <1485143514-27229-7-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485143514-27229-1-git-send-email-dwesterg@gmail.com> References: <1485143514-27229-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v3 6/7] arm: socfpga: Update SoCKit environment 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" From: Dalon Westergreen Remove the default environment as it is now in a common header. Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name. Signed-off-by: Dalon Westergreen --- configs/socfpga_sockit_defconfig | 1 + include/configs/socfpga_sockit.h | 27 +-------------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index d0c2bda..130c4e2 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit" +CONFIG_DEFAULT_FDT_FILE="socfpga.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 3fceb31..c51cc72 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 @@ -32,31 +32,6 @@ #define CONFIG_ENV_IS_IN_MMC -/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=n\0" \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ - "qspiload=sf probe && mtdparts default && run ubiload\0" \ - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "ubiload=ubi part UBI && ubifsmount ubi0 && " \ - "ubifsload ${loadaddr} /boot/${bootimage} && " \ - "ubifsload ${fdt_addr} /boot/${fdtimage}\0" - /* The rest of the configuration is shared */ #include