From patchwork Mon Jan 23 03:25:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 718359 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 3v6GvB5PRyz9sdm for ; Mon, 23 Jan 2017 14:26: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="eepNPJfW"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0F2794B63C; Mon, 23 Jan 2017 04:26:39 +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 dHHmGAtsHmeD; Mon, 23 Jan 2017 04:26:38 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 42F894B027; Mon, 23 Jan 2017 04:26:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 768EB4AB68 for ; Mon, 23 Jan 2017 04:26:21 +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 W35ZLoee8wtU for ; Mon, 23 Jan 2017 04:26:21 +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-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by theia.denx.de (Postfix) with ESMTPS id 6BE734AAD2 for ; Mon, 23 Jan 2017 04:26:13 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id 75so12468453pgf.3 for ; Sun, 22 Jan 2017 19:26:13 -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=2fbLd/j6UHyfnjix96qkiUfQRVEyXMgcQFpUc5qZ4FQ=; b=eepNPJfW7MPjz1poiZpKD0UFHNYzjThJlszrUnwAC/vGkGYTHW+QHLLhl06WJj9Ajx UUYqZZ0m8OMLUFWTgAf+NXD26sUKXaGo1ispcJwnEGYthICSSjtIdfuLjHMSmvrFfdn6 JBUCnultofWH2T+3RIgFdJIrBxhZjedQq4Dl4LOJQha3hMo01oCt4Dm8bddkQ1u66mnr 1EypWN7j0STXYx/726mT/NVX3Hga/Bas4VAgbuqfIOW5nqGs+R0R2qsQStHa3DY+JlPX NRJvwXTwhqvcmKKAZrjIJxRlLjW41JcvYFiahzhMTDisKyuYsAh9O2FcUgY0dMHyuP0b VUTg== 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=2fbLd/j6UHyfnjix96qkiUfQRVEyXMgcQFpUc5qZ4FQ=; b=aqCK1nbLbNPIH7WqYnyZkQIUrQsmWzg9tKz+5EWM7vafhPGbHOXXLmdKXctxrkAzyj ZAAtNBwfMUr/RxeAkVJMqDbtVyJ+6AQD+hYvKBjeFszJe/Kv8ZPyF83TVrHYBKjjDcRv ToO78cEXqF4z98A6FEgaVo1hWnS6GAGywIqZYFXkaX5kuka0aKtim1/gRYJGxqjehl9M lHdq41f4ioO+AQRZtfZnBpFC4WmmujGBRpyMTZ64gjorsqf8/G9W9c+Azzd6A4XK1I1o mwXK98NjyH+CiBuMwLA7dwbCRbrsnaADdfejalvqt7jXnIoVab03UDoe5JOJX6b3Wxcs ZTdw== X-Gm-Message-State: AIkVDXJrXQmXYbsyz04xl7EmqcZC/JsdV8YFpSSHyu/FRyqUecmymezvab2OqOQ6u6QAEg== X-Received: by 10.99.109.143 with SMTP id i137mr29901004pgc.11.1485141971912; Sun, 22 Jan 2017 19:26:11 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id p25sm32382704pfd.0.2017.01.22.19.26.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jan 2017 19:26:11 -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:25:52 -0800 Message-Id: <1485141956-3667-4-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485141956-3667-1-git-send-email-dwesterg@gmail.com> References: <1485141956-3667-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v2 3/7] arm: socfpga: update cyclone5 socdk 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 --- configs/socfpga_cyclone5_defconfig | 1 + include/configs/socfpga_cyclone5_socdk.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 8b050b9..cba1e9c 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socdk.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 7ced6a6..96b2b87 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -36,31 +36,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