From patchwork Sat Feb 18 20:51:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 729763 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 3vRcGw3gS0z9s8D for ; Mon, 20 Feb 2017 19:28:56 +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="a8JLcMmk"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9472FB3E11; Mon, 20 Feb 2017 09:23:15 +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 x6HgmfIgvpxg; Mon, 20 Feb 2017 09:23:15 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3ACC7B3A86; Mon, 20 Feb 2017 09:18:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BBFBB4A068 for ; Sat, 18 Feb 2017 21:52:07 +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 W57nhbTDXg5Z for ; Sat, 18 Feb 2017 21:52:07 +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-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by theia.denx.de (Postfix) with ESMTPS id 39F554A026 for ; Sat, 18 Feb 2017 21:52:05 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id o64so6706443pfb.1 for ; Sat, 18 Feb 2017 12:52:05 -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=Aq0J7q+b0WMZtxWpYIMZ6CExjgD5siTR49wrtfMeoWc=; b=a8JLcMmk+n+cYxFBWLRlqrsci8uCBdSUQ3k8BVMkVwzK4rwMNyHOFcFI11Vppsif/d lxT/7FZHsqc1gRHerCe8M7KYXBej+jBmqQIz7p1pyBjXb6TNv2clLnQEwPehVKzx06Ni 0NDS3Oig7QYjHX2LQ3FI7LMWunCcKXfpvV8Bsfs/9zc1NgvkeL25qYjl1j/wdEVxC/PT i1ijBIU9rfcCGKhOlarR3beApF0JQn/qBCOfdH23ecuCg8nAktQWhqz4pROcqIGbdD+0 XEN5s6oBJbchQfe3riOvRuIrSXdHqLquwiRQqPQ5WJCL4vFiaEeAz7soVPrnmWZd4Z1B G2Hw== 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=Aq0J7q+b0WMZtxWpYIMZ6CExjgD5siTR49wrtfMeoWc=; b=CKbxHLGwFSSrbLh9wmGr/9JJ7VITj/qLH0r1O/c8kgZN1ORR1awzDnOVR3y7nClVC+ 68Owjl4FjRNrMU+9bgEDMMsj+PB54q21nmUMNmqUJi6JCu0BDHBvx48kr5u0yaNAJqGv vtvSdjuGl44ZXBV8yqaIuEugoj1USizL/OOaNSH4qk5Zdmqu93kNRW28LkU0LP8jGLoq S7nJcGcfRqg4kpeHjeOesVFX2NMnglD0r1SJI2BUg//38ZatY6aWfCCAg5HwAR9t8km8 Yahto7qWhsRiNh9UQjNbTscVIflmH70T5/hyXYIyepRwvPWa2kdqyWo1O5rcIUhkslQn LrKw== X-Gm-Message-State: AMke39lCOhRLSP8H6Yl89VnBZVEzgjcigJ+cb61rRSF3peo09MCobsnHOG2w4n/1W1FMTw== X-Received: by 10.84.224.202 with SMTP id k10mr20735911pln.27.1487451124326; Sat, 18 Feb 2017 12:52:04 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id h17sm26755791pfh.62.2017.02.18.12.52.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 12:52:03 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, dinguyen@kernel.org, sr@denx.de, mailinglists@kunz-im-inter.net, agust@denx.de, tien.fong.chee@intel.com, pavel@denx.de Date: Sat, 18 Feb 2017 12:51:42 -0800 Message-Id: <1487451108-4277-3-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487451108-4277-1-git-send-email-dwesterg@gmail.com> References: <1487451108-4277-1-git-send-email-dwesterg@gmail.com> Subject: [U-Boot] [PATCH 2/8] arm: socfpga: DE0 use environment in common header 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" This removes the default environment from the de0 headers and instead uses the common environment provided in socfpga_common.h which now uses distro boot. In addition to the above, add support to boot from the custom a2 type partition Signed-off-by: Dalon Westergreen --- configs/socfpga_de0_nano_soc_defconfig | 3 +++ include/configs/socfpga_de0_nano_soc.h | 19 ------------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index af41e1e..b122135 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_nano_soc.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y @@ -58,3 +59,5 @@ CONFIG_G_DNL_MANUFACTURER="terasic" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_USE_TINY_PRINTF=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE=0xa2 \ No newline at end of file diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index f655972..4b86df7 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -17,8 +17,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) -#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR @@ -30,23 +28,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