From patchwork Wed Jan 25 04:14:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 719522 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 3v7Wsr1nBWz9s4q for ; Wed, 25 Jan 2017 15:14: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="FXkVGbyF"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D8A40B38F6; Wed, 25 Jan 2017 05:14:49 +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 WW1llRefa-Km; Wed, 25 Jan 2017 05:14:49 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B5E0CB3909; Wed, 25 Jan 2017 05:14:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BDD1CB3906 for ; Wed, 25 Jan 2017 05:14: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 f04_VzcSEeCK for ; Wed, 25 Jan 2017 05:14:32 +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 10C21B38E9 for ; Wed, 25 Jan 2017 05:14:24 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id y143so13423112pfb.1 for ; Tue, 24 Jan 2017 20:14:23 -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=h+z8SITc5QxAA/wUg72r+xCABIo43euPjI/T10VfuK0=; b=FXkVGbyF+298W444gvdUSEUSl5gyukv0xzbDqOnk6Sa9QdeeC7YNHB5Hs+f0vlcDuT q7Om+Ny3xq11DgXpxkP3BJajlr0nRsZcz/RwA3VSvQPjw2oTspeUPDgkT7xBShOGm/ba PZkS/QFiFNk74GIokqvueLhxA6gbgTKxiYs7VRJKDLciHTX7SqTSWL1lRlq7YAiVG06I d6zibZyJHLnD1l5zFqfHixtgipJYaQSn5M4aIFYrbT/s2vs4QkJ1OF+HDuD1iQplRJOA r5MnOKviSkeB8jFkKI1gUqf7K5F+7GPsjX8yOt47v5EL0G0RtHrKyVe/66uKv01r+qjI Ra3w== 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=h+z8SITc5QxAA/wUg72r+xCABIo43euPjI/T10VfuK0=; b=p+6m4ddtN0W/T7SDRw/+RbN/Qhtbc5WMQNei32z8c3+YiQF3jiOOOLAnXEmzLeSNQA z9JV6OEDDhSejLTKKrLL43TCcm1+r8ILrVJ7U8s1DOj/KYqI8azr2ydc/+qx9it+IxlY WHk0GoJIRpSjEaArEmV2CphfhzsPJpFrGIqIFedNJ/cA6cf/0TW2YfgD6UuLUIxuk+5X 3aZOstFR9nPuFcXsRg78JyshtZObOO8UdlWjar216hs8Au6csXAXg/V7g92qc1SjXKCS rpzoy+mRxSFKpUFW3171wtG5xLR7JYp1A5t2b9BZ0wom4RWZf5gn/wg5AmoF7Z9IhPvr d7qQ== X-Gm-Message-State: AIkVDXJ3AOL8E+1d2j1TtZT+24UIjcqHhI8oxO0/ZLGXXB/TXJq3ErlvqsHdZEjUbxoTfg== X-Received: by 10.98.3.3 with SMTP id 3mr30140126pfd.95.1485317662550; Tue, 24 Jan 2017 20:14:22 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (fmdmzpr01-ext.fm.intel.com. [192.55.54.36]) by smtp.gmail.com with ESMTPSA id z77sm48047297pfk.47.2017.01.24.20.14.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 20:14:22 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, dinguyen@kernel.org, chin.liang.see@intel.com, sr@denx.de Date: Tue, 24 Jan 2017 20:14:01 -0800 Message-Id: <1485317642-4887-7-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485317642-4887-1-git-send-email-dwesterg@gmail.com> References: <1485317642-4887-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v5 6/7] arm: socfpga: Update SoCKit 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_sockit_defconfig | 1 + include/configs/socfpga_sockit.h | 27 +-------------------------- 2 files changed, 2 insertions(+), 26 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 3fceb31..c51cc72 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 @@ -32,31 +32,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