From patchwork Wed Jan 25 04:13:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 719521 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 3v7Wsf4cDPz9s4q for ; Wed, 25 Jan 2017 15:14:46 +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="NIOIMs8a"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0484DB38D7; Wed, 25 Jan 2017 05:14:42 +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 XFHxM2-0mZs9; Wed, 25 Jan 2017 05:14:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D8449B38F6; Wed, 25 Jan 2017 05:14:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1CCD7B38BF for ; Wed, 25 Jan 2017 05:14:22 +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 aIbyHsz7hry2 for ; Wed, 25 Jan 2017 05:14:22 +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-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by theia.denx.de (Postfix) with ESMTPS id 8992AB38C0 for ; Wed, 25 Jan 2017 05:14:16 +0100 (CET) Received: by mail-pg0-f68.google.com with SMTP id 194so18435017pgd.0 for ; Tue, 24 Jan 2017 20:14:16 -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=AW2jWccvRnMY+ic6rpwHGeu21xAe1GWSFV06ygBShlQ=; b=NIOIMs8aZ7FK9Hzz8s/H5FujU4Dr4xcIQuY2xUEX99cp9PemFkemktPMaCr3mEP6c4 QgXVNI02M0fv++v3P9ly/QPn/s7aFOAzoCeOYvU2JI7lLT8HZsP5waLMQko2jL7mwHmj EoHkFmcDg0udVGuQQ3wLTGlEpuE1BUQlOzLr3N1pgAR+FN4iszkI8qI6EkidpucAwBkX S8gL79PBKZlUoW83wAFYZggw/NnQYG2dIB7yNdnuruQtlQ2oRsaaN5ZgsaHNN5DCgp7O B9SjsQp1vcuyX3alV9sIloiXBtCy8pbT+6JBdbRFd+NHg3mEl3B5s4noFBYGuglYdxaN C6NQ== 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=AW2jWccvRnMY+ic6rpwHGeu21xAe1GWSFV06ygBShlQ=; b=jRGG6f5Nw+RH+zRPpsftKArjUtdmN30IMPjFIMA93tlyE4ous9mnxtmVEFELsKFNr0 ADmEhDSkqmbMduVMUArkQu8T7gwf7IiF1pHIil/oKr0dMf93KdODluol+MUBq8LcIoCo isvW1N9Pa105A6vPm4SD9X3en+3KZKwVXW9U9CX/bQnDOJ+Iuh4eMQkWA+nX0HjOgXWI cIOBuOkPGqSfNXQi2UrwenYpA7GmIxv0Oy4Z+Ev6WeCcOT4WKn3RD7LVkr5xr/1OaSR1 uociUGMu99SgG+MjMNL+XkGIl+feYqvYfIOfwisfcq14z2VzMxfNjKUNRjP4n8dBHIf3 neAQ== X-Gm-Message-State: AIkVDXJ4PGNH2IfVX8O/8wevQuZsbmnZuCPH8tKllmsPKcVzDVzpAq0yYXB0ajhBSKNAYQ== X-Received: by 10.99.129.193 with SMTP id t184mr44486938pgd.129.1485317654814; Tue, 24 Jan 2017 20:14:14 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (fmdmzpr01-ext.fm.intel.com. [192.55.54.36]) by smtp.gmail.com with ESMTPSA id z77sm48047297pfk.47.2017.01.24.20.14.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 20:14:14 -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 Date: Tue, 24 Jan 2017 20:13:57 -0800 Message-Id: <1485317642-4887-3-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485317642-4887-1-git-send-email-dwesterg@gmail.com> References: <1485317642-4887-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v5 2/7] arm: socfpga: update de0 nano default 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 --- configs/socfpga_de0_nano_soc_defconfig | 3 +-- include/configs/socfpga_de0_nano_soc.h | 19 +------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index af41e1e..4837809 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y @@ -20,7 +21,6 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y @@ -35,7 +35,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 6b9546e..97216ea 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_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} - ${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" \ - /* The rest of the configuration is shared */ #include