From patchwork Thu Apr 13 14:30:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 750457 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 lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w3k1245nkz9s1h for ; Fri, 14 Apr 2017 00:38:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UmiRiaS/"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 55F7FC21C5A; Thu, 13 Apr 2017 14:37:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DC62CC21C49; Thu, 13 Apr 2017 14:36:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 01014C21C58; Thu, 13 Apr 2017 14:35:58 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id 3AE59C21C52 for ; Thu, 13 Apr 2017 14:35:54 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 79so11848384pgf.0 for ; Thu, 13 Apr 2017 07:35:54 -0700 (PDT) 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=p+7uNb1VI4OQmQANHIpx/34byfen4RdvufeQlqliZfE=; b=UmiRiaS/etY/h73qdr99C0E43ga6zhzkaj8o4mmxtQqnTKzplSajaybZ0Oxlui9M2x HT6RKWSUJWtnqv70WvzyWgTDlZbQqZyhk4wABKoc4Zvp9eoo33DF20jpJJlXqZROPI+9 6nI389sBk1+qhBU8FVQA47N7juZsuYGg2qpjoLB7psSHPLRmzV3cm5E4QoJ4ljI6xoXR 2yUcPWbz7CJzLj03qC7Wa2DGIUg8K5wA4vQklODYOiYQ0l+EtldftzlkT/wlddDbrhKS MX5W+aaH7YiNJhcz45qY//bVF6XXFSr43GlqNJ++mwHa1FoXOnFAswfWuhiJq6MBYI0w 2vMA== 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=p+7uNb1VI4OQmQANHIpx/34byfen4RdvufeQlqliZfE=; b=VtYcIOfjkYAwAWSLzT78a7LFZt6P5tzCUKYxHCPqIXZgacrBYh/Ga8zuE0ibW00qzg 46IQYiIEfVmVwXQepYTLV6yJhYbNAqbAl4fYcEVIT1C0hcl2dEi9YXeRnzxyIUI3fT+3 X7Ru5fNKUU8pTjLc9AwfBwFjh26dtvKHWEPe8gU1HlGz34xYKqRqf6mYru1qIyzPBxrI mffapQYothPP2pHBcNhwP48jXiXRXBVzKFiLO5u9iG/eUDB9vhVWLDhuWjS8JYHISbl+ LFhF/M2Z5Kdjw3fem+fVAe9SGLkgv7wzaJeeU4nWCuLeqi/1Y+Ujb1zbjIbqkfz2/Mjo oxCA== X-Gm-Message-State: AN3rC/7UyZHVvKu3EXfGs8mZB093lOAZdk0YhtZMaaI+G2ZQ9rzl0O6l IdLrkwXmUfOOwg== X-Received: by 10.84.229.71 with SMTP id d7mr4754921pln.92.1492094152943; Thu, 13 Apr 2017 07:35:52 -0700 (PDT) Received: from dwesterg-mobl1.amr.corp.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id m29sm36741253pfj.32.2017.04.13.07.35.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Apr 2017 07:35:52 -0700 (PDT) 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, ley.foon.tan@intel.com Date: Thu, 13 Apr 2017 07:30:34 -0700 Message-Id: <1492093836-11174-7-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492093836-11174-1-git-send-email-dwesterg@gmail.com> References: <1492093836-11174-1-git-send-email-dwesterg@gmail.com> Subject: [U-Boot] [PATCH v5 6/8] arm: socfpga: SoCKit use environment in common header X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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 SoCKit headers and instead uses the common environment provided in socfpga_common.h which now uses distro boot. 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_sockit_defconfig | 1 + include/configs/socfpga_sockit.h | 28 ---------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index d0c2bda..bf60783 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_sockit.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 326310b..c9fc5c9 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -16,9 +16,6 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* 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,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