From patchwork Thu Jan 26 20:31:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 720364 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 3v8YVz0wNXz9ryk for ; Fri, 27 Jan 2017 07:32:11 +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="UuOibRbi"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A946E4AA22; Thu, 26 Jan 2017 21:32:09 +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 N7QMEf1Wj13U; Thu, 26 Jan 2017 21:32:09 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A650B3865; Thu, 26 Jan 2017 21:32:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E4F17A75C3 for ; Thu, 26 Jan 2017 21:31:40 +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 K3VQKAHImsSf for ; Thu, 26 Jan 2017 21:31:40 +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-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by theia.denx.de (Postfix) with ESMTPS id 772B7B3865 for ; Thu, 26 Jan 2017 21:31:33 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id 194so23156251pgd.0 for ; Thu, 26 Jan 2017 12:31:33 -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=GdPK2YdK15RpbuMyGIKo9L0Aucy1HZAfydge4YBW59o=; b=UuOibRbi42rgA++1clxABtZlKEVSq4jTLbYSVRy2SngvK6N0ca3S05yDacPNw5guZU cFMl2zA+YKGSAaLowRoPBaG8hldPC1+AgFApX5Ck0T/B0Zt0jFn1wqNQb2Vx90rNPR0L 8OZB5zKU4WYQnv/qRzh2RH7kVRfnXfqNLoDKhCXqDMwIicenTaFM2YJgnGuQ9XGzWdXw g5TXql09Y8Q5TtKWd9j9TkTA57yZh9+cw16QdI3Ng1BMXeduF0l95J3KGpjMtouZc4/7 UPuuIqwaaycaTd8718HtEMHd6hQokwIsZwIK2xcH6TqHtY/TPrMBnV7WKhcVj3UTdzid B80Q== 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=GdPK2YdK15RpbuMyGIKo9L0Aucy1HZAfydge4YBW59o=; b=WElLvklH9koGb91hnMpVnhrWD1hO4ta45h8LaAHYKk/avrIv8NRgxtHM+npXE9r11g JELJKMkdTBo5EkwA/uUXDOuXJ1HLNFzWm8NMkN5q8+i6nlE8vVMamlonnfQEiShPTL6l BtRyo4+F2H5btdyAX4J2XT3PTBM9fYmOC3p2FQNwK2n2CtoKxpsleJRtAGtzz/ItHITo ChRYZMIszcxU7v6YBlrPJ4JbLIu/cxADD7IWnII8qgnxKbKXAjD3BXhGVPkbmto5tnkF A0ZN22LaRU0dwsncirWBpHRInMxoxlN8cSXaLoxWPDYkCoOyzj72KQo10pfQ1UsAnsN0 oNaQ== X-Gm-Message-State: AIkVDXKyhRElS6scb7Qe1l9Gk8hLCAFWEav4t3ErlJ3Wtm7/ionrH8329rO5IK2X+A+9Nw== X-Received: by 10.84.238.1 with SMTP id u1mr6884818plk.174.1485462691841; Thu, 26 Jan 2017 12:31:31 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id d68sm5445831pfj.92.2017.01.26.12.31.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 12:31:31 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, dinguyen@kernel.org, chin.liang.see@intel.com, sr@denx.de, agraf@suse.de, agust@denx.de Date: Thu, 26 Jan 2017 12:31:09 -0800 Message-Id: <1485462671-27830-6-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485462671-27830-1-git-send-email-dwesterg@gmail.com> References: <1485462671-27830-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v7 5/7] arm: socfpga: Update DE1 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 Acked-by: Marek Vasut Acked-by: Dinh Nguyen --- configs/socfpga_de1_soc_defconfig | 1 + include/configs/socfpga_de1_soc.h | 19 +------------------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 032deef..d78e8a1 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de1_soc.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index deec647..3142bd1 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* 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,23 +32,6 @@ #define CONFIG_ENV_IS_IN_MMC -/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "bootimage=zImage\0" \ - "fdtaddr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdtaddr} ${fdtimage}\0" \ - /* The rest of the configuration is shared */ #include