From patchwork Wed Sep 11 11:28:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1160923 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="OMDWJQaU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46T0B73Fx9z9sCJ for ; Wed, 11 Sep 2019 21:32:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 267D5C21C93; Wed, 11 Sep 2019 11:30: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=RCVD_IN_MSPIKE_H2, 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 0A6B1C21D74; Wed, 11 Sep 2019 11:30:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CFDFFC21DD4; Wed, 11 Sep 2019 11:28:52 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 85419C21E4F for ; Wed, 11 Sep 2019 11:28:52 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id q14so24075476wrm.9 for ; Wed, 11 Sep 2019 04:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ZMg3ORpQdPseAqwscpo3H+tlNF2vSCipKDzJkCSjPWc=; b=OMDWJQaUKNin2xeDdkPLVTK1hVaaB/hi/RORhAwcd7u7JGdrJpfIL3+Tpd8ZXnoah+ g8Yx5Vc/FgO9teRdxm+QRAIFNv29tOA4rdRVAm+teQlxnfKwXb7p3yw/+OBfu9P8rhpJ N6OhkmNXyAdi2t3jDpFtN9sXzBe8X6yRPULdckwBCVbWQjmuiXYwTGtqB8b01bpgPkMI WXipMI6i9WiP+G7aY1hZaqyfw3DpfwHFsai/ks9GtDgsRZ9DTAOAiKvbPASWzB5Upisf YBawPCUNiLxEHM0qvX60ro0YorL8+VMTBMgfQC+0aIrN0om//cMUGO/m1LuT0SMSXL60 d0CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=ZMg3ORpQdPseAqwscpo3H+tlNF2vSCipKDzJkCSjPWc=; b=HPHU+dXat2q3JGFaW1hsUO+FL1Kk5bN0bTPJqdMWPSDPrAn42Xge3Gu2bzWhdrzo6X wiaWJQx9kodWxsATWp4MXuktuDKOrPFS3yZUXu83hg0/9/NQOqnm/VNANHFrZKvV0P4M syvfqo6vEo4mAd76bg8eejVWJ4mISAf5zg6hvGI53oBlNX40B6omgZ+JrtSsRVeKKWSQ 4Dbw63r5DwUobIsawgOiBSW3SWggpIRAAW8u13crbFUVrIFcSzcURjQ54+C/VhOPmOWy CmKKMUQTc58D9ujYURsBG2WN6KWJNE31rIs6uJL+1VBIf2mI10M6TiZwaylW6luHyIJ5 Rdqg== X-Gm-Message-State: APjAAAVBZCYxIevEEW8rbWkkwAn8cJtVszRV2/alg4BxeawEoq1iTh5N Xe3VuYyQ46Do7q42yFnd/7vfaZ5/JwY7Pg== X-Google-Smtp-Source: APXvYqxFkbgBObUJ11PdjEJE0Gue2Vfo9cqRzymCdQkNvHJPnrLWKS9NojXLnHUNTFC0caK6+r/CVg== X-Received: by 2002:adf:ec8b:: with SMTP id z11mr1483475wrn.207.1568201331967; Wed, 11 Sep 2019 04:28:51 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id c132sm3033575wme.27.2019.09.11.04.28.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2019 04:28:51 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Wed, 11 Sep 2019 13:28:38 +0200 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Subject: [U-Boot] [PATCH 5/5] ARM: zynq: Remove all Xilinx private commands 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" All platforms have been moved to distro boot that's why remove the rest of configurations to have unified boot flow. Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 54 ++--------------------------------- 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 4b12be30c8aa..b6c9f2c8dd5b 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -152,12 +152,6 @@ # define BOOT_TARGET_DEVICES_NOR(func) #endif -#define BOOTENV_DEV_XILINX(devtypeu, devtypel, instance) \ - "bootcmd_xilinx=run $modeboot\0" - -#define BOOTENV_DEV_NAME_XILINX(devtypeu, devtypel, instance) \ - "xilinx " - #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \ "bootcmd_qspi=sf probe 0 0 0 && " \ "sf read ${scriptaddr} ${script_offset_f} ${script_size_f} && " \ @@ -189,8 +183,7 @@ BOOT_TARGET_DEVICES_NOR(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_PXE(func) \ - BOOT_TARGET_DEVICES_DHCP(func) \ - func(XILINX, xilinx, na) + BOOT_TARGET_DEVICES_DHCP(func) #include #endif /* CONFIG_SPL_BUILD */ @@ -198,59 +191,18 @@ /* Default environment */ #ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ - "fit_image=fit.itb\0" \ - "load_addr=0x2000000\0" \ - "fit_size=0x800000\0" \ - "flash_off=0x100000\0" \ - "nor_flash_off=0xE2100000\0" \ "fdt_high=0x20000000\0" \ "initrd_high=0x20000000\0" \ "scriptaddr=0x20000\0" \ "script_offset_f=0xFC0000\0" \ "script_size_f=0x40000\0" \ - "loadbootenv_addr=0x2000000\0" \ "fdt_addr_r=0x1f00000\0" \ "pxefile_addr_r=0x2000000\0" \ "kernel_addr_r=0x2000000\0" \ "scriptaddr=0x3000000\0" \ "ramdisk_addr_r=0x3100000\0" \ - "bootenv=uEnv.txt\0" \ - "bootenv_dev=mmc\0" \ - "loadbootenv=load ${bootenv_dev} 0 ${loadbootenv_addr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from ${bootenv_dev} ...; " \ - "env import -t ${loadbootenv_addr} $filesize\0" \ - "bootenv_existence_test=test -e ${bootenv_dev} 0 /${bootenv}\0" \ - "setbootenv=if env run bootenv_existence_test; then " \ - "if env run loadbootenv; then " \ - "env run importbootenv; " \ - "fi; " \ - "fi; \0" \ - "sd_loadbootenv=setenv bootenv_dev mmc && " \ - "run setbootenv \0" \ - "usb_loadbootenv=setenv bootenv_dev usb && usb start && run setbootenv \0" \ - "preboot=if test $modeboot = sdboot; then " \ - "run sd_loadbootenv; " \ - "echo Checking if uenvcmd is set ...; " \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...; " \ - "run uenvcmd; " \ - "fi; " \ - "fi; \0" \ - "norboot=echo Copying FIT from NOR flash to RAM... && " \ - "cp.b ${nor_flash_off} ${load_addr} ${fit_size} && " \ - "bootm ${load_addr}\0" \ - "sdboot=echo Copying FIT from SD to RAM... && " \ - "load mmc 0 ${load_addr} ${fit_image} && " \ - "bootm ${load_addr}\0" \ - "jtagboot=echo TFTPing FIT to RAM... && " \ - "tftpboot ${load_addr} ${fit_image} && " \ - "bootm ${load_addr}\0" \ - "usbboot=if usb start; then " \ - "echo Copying FIT from USB to RAM... && " \ - "load usb 0 ${load_addr} ${fit_image} && " \ - "bootm ${load_addr}; fi\0" \ - DFU_ALT_INFO \ - BOOTENV + DFU_ALT_INFO \ + BOOTENV #endif /* Miscellaneous configurable options */