From patchwork Sun Feb 19 04:07:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 729793 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 3vRcTj2n32z9s8D for ; Mon, 20 Feb 2017 19:38:17 +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="a7k0Bqgh"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74869B3AE3; Mon, 20 Feb 2017 09:27:34 +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 14_vqGnwCrZQ; Mon, 20 Feb 2017 09:27:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B128AB39B7; Mon, 20 Feb 2017 09:20:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 26B604A068 for ; Sun, 19 Feb 2017 05:08: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 gEwrut2c8ogT for ; Sun, 19 Feb 2017 05:08: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-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by theia.denx.de (Postfix) with ESMTPS id 60D454A026 for ; Sun, 19 Feb 2017 05:08:14 +0100 (CET) Received: by mail-pg0-f67.google.com with SMTP id a123so5772640pgc.3 for ; Sat, 18 Feb 2017 20:08:14 -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=0k6p2DYvcbe+UPUMpudexOn8Aplp2vinvc0Eua1BT60=; b=a7k0BqghDW2MkgcB8oJ4UNb+jQjDvFIGkxYdS7kmq4vb8HBJxyzO1hDsjMUnpkSGw1 i3bz6dVAK3APpDtLOwZQ4lIww/o0M96cmsh7r+sn+/QrJUS29rjjqZtgEgV2TGDOtF3C s753q/nnkouh15izh2TPhvLFIIk9JCZHYk6687Q4MNJeTH9OZ8NsVAuldeguIPlxEE9n 3jK3ZKAAPCucKTpygN5W5n3gq75jFl9LWc9VJzheKBffxOzuf3vvA7XKVl5bYlNL4y0Q vLdqrF95N25Nv6JGL7QBXGPQafZ+M/WWX3Ih0GT32574pTjJ0pRB9p1sqA6epr1zoF+Z VctQ== 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=0k6p2DYvcbe+UPUMpudexOn8Aplp2vinvc0Eua1BT60=; b=oLmGZHVjVCHC3MJqQZhyEz+R8NiXfI4o0FuVo9rrAhAP6pbc6f3fNg89lBq7q22Q88 y0K26EhPRgmvHODwcKxvuU2PD3HMY9avpsNnCYUUzK7Fy+AzNKO9JP/fqJiwky2et+OG x3cVPxk6dWq5j1k6pfVvHGzIK7ugP9LsnYFWIhM5y0i6W3Esntm596C1NZHjEHSNemJh p7jZAns18RTk/6W7S4sBPUGEt/xNaaoZEZdMKuESKuptGS5ejEt5AEfmXouh9Aqf5lKa TQfNpxV7h1iiA7ulUEPtMUXYvg1bwwu4YSi9BGU/FsSpjzGDUtx0qgCuMIrHUYm+4uHx BrVg== X-Gm-Message-State: AMke39nHkGbr1DGVt+eXMy9LFR5s/t3aZY+bLJKcBMo0IIQaazs9GCD9EQVvmUFY0E+qHw== X-Received: by 10.99.51.76 with SMTP id z73mr19593547pgz.137.1487477292705; Sat, 18 Feb 2017 20:08:12 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([134.134.139.76]) by smtp.gmail.com with ESMTPSA id q26sm3979814pfg.47.2017.02.18.20.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 20:08:12 -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 Date: Sat, 18 Feb 2017 20:07:55 -0800 Message-Id: <1487477280-21077-4-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487477280-21077-1-git-send-email-dwesterg@gmail.com> References: <1487477280-21077-1-git-send-email-dwesterg@gmail.com> Subject: [U-Boot] [PATCH v3 3/8] arm: socfpga: A5 SoCDK 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 A5 socdk headers and instead uses the common environment provided in socfpga_common.h which now uses distro boot. Add support to boot from the custom a2 type partition. Change default devicetree name to match devicetree name in upstream kernel source. Signed-off-by: Dalon Westergreen --- Changes in v2: - Remove unneeded CONFIG_BOOTFILE - Fix dtb name --- configs/socfpga_arria5_defconfig | 3 +++ include/configs/socfpga_arria5_socdk.h | 32 -------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 43c51fe..a49f6fa 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" +CONFIG_DEFAULT_FDT_FILE="socfpga_arria5_socdk.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y @@ -64,3 +65,5 @@ CONFIG_G_DNL_MANUFACTURER="altera" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_USE_TINY_PRINTF=y +ONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE=0xa2 diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 9b1f753..b60d007 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -16,13 +16,6 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* Booting Linux */ -#define CONFIG_BOOTFILE "zImage" -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) -#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET -#define CONFIG_BOOTCOMMAND "run ramboot" -#else -#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" -#endif #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR @@ -34,31 +27,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