From patchwork Sun Feb 19 20:21:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 729810 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 3vRcnq04tDz9s8X for ; Mon, 20 Feb 2017 19:52:15 +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="daNkbIdo"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 86888B3BAD; Mon, 20 Feb 2017 09:32:32 +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 s8G7M7nR7cmS; Mon, 20 Feb 2017 09:32:32 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 278D7B3BAE; Mon, 20 Feb 2017 09:22:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C2EE64AAA7 for ; Sun, 19 Feb 2017 21:21: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 owHAxyo3-PVh for ; Sun, 19 Feb 2017 21:21: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 49BFB4A08A for ; Sun, 19 Feb 2017 21:21:20 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id v184so10167238pgv.1 for ; Sun, 19 Feb 2017 12:21:20 -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=/vaJ2A9dMdcwgFRFydNJSMkcnEgiYbVVUP21uzwgNDY=; b=daNkbIdoHmTAgE+PSMwu+wxtSChx0P9WR2HTbUXdd1Cdehb1K0rwiqUdP/Y4SfuSao 6UX55GYef8GxXU5RHldAefbi1fMAJlEACkGgG/ufnrR9y42sFMJYqdLclBzwYbZ4sO1H bBkBJCD7bMpoxoyVKIWVms1PoTAANq2nbZQdpS6D9jeGA9mGobg7NzCIdjKDFOyTWyOK RXnvGv8Dz336TOvy3B2WxkNTZuvslTcfI8Lj5uKD1SpuHuUjdtVakvWpVfB7UmoK5ZMR QTVNjtNQAujGvNfr2IjUZkZzEQnFRbO8am+eJg8jYw6dIg6uSDnX2vXLhzOHQXvfhwdV cAjQ== 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=/vaJ2A9dMdcwgFRFydNJSMkcnEgiYbVVUP21uzwgNDY=; b=OH/xwxFDoPLrSphaAjKARW6Be3JnBdMweT4xRhId16OTb9Gl1iksxC4Ojozo++IkNl 7UM1SAKi7RJPb1GU7fYrfNTEKPG1cOUwr0lz7TvA/2CJOP9KbR1a5HopHdy4oDG2h+TJ qj43WqusufndKXT9OmOShTXqqoqLtYuwOf63piHr6NSAWYInfbIhs1PjlYq6tRFYXqsV yUd8CeUNg5b4haj2/B+9zZ+rZCU7LzrPbFMalO8YNOtjyWZ4ZclxZutdqkAS+EQi1pP9 pdE7M/48Z6KOu+Uca8yzJrag/d0XiqkpQa2EJeya3CEMIqRY0e1yeJpo02Y47ZkDGrNw MYNg== X-Gm-Message-State: AMke39kT1UAO56i/AZYOIKTtihj4nDFMExMsMHM05pfRUpEhVG6qptFzGKcgt2OSFjH52w== X-Received: by 10.99.175.67 with SMTP id s3mr1551006pgo.185.1487535678828; Sun, 19 Feb 2017 12:21:18 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (jfdmzpr03-ext.jf.intel.com. [134.134.139.72]) by smtp.gmail.com with ESMTPSA id l13sm9169783pfk.69.2017.02.19.12.21.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 12:21:18 -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: Sun, 19 Feb 2017 12:21:00 -0800 Message-Id: <1487535664-9314-5-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487535664-9314-1-git-send-email-dwesterg@gmail.com> References: <1487535664-9314-1-git-send-email-dwesterg@gmail.com> Subject: [U-Boot] [PATCH v4 4/8] arm: socfpga: C5 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 C5 SoCDK 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. Change default devicetree name to match devicetree name in upstream kernel source. Signed-off-by: Dalon Westergreen Acked-by: Marek Vasut --- Changes in v2: - Remove unneeded CONFIG_BOOTFILE --- configs/socfpga_cyclone5_defconfig | 3 +++ include/configs/socfpga_cyclone5_socdk.h | 32 -------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 8b050b9..c8b8084 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 @@ -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 +CONFIG_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_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 4100ef9..dfe4980 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_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