From patchwork Tue Nov 14 14:15:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 837867 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; 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="piRWdzhC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ybqLD2xKTz9s81 for ; Wed, 15 Nov 2017 01:16:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2AAB3C21C51; Tue, 14 Nov 2017 14:15:57 +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_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 9A5C5C21C4F; Tue, 14 Nov 2017 14:15:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A02E9C21C4C; Tue, 14 Nov 2017 14:15:53 +0000 (UTC) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by lists.denx.de (Postfix) with ESMTPS id 301CFC21C45 for ; Tue, 14 Nov 2017 14:15:53 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id b189so14889292wmd.5 for ; Tue, 14 Nov 2017 06:15:53 -0800 (PST) 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; bh=cFiCZaLwI9APWZLVc99Gi5IdkknPDMBJ8S+4OxpzfU0=; b=piRWdzhCQPk3zE2xbZmGGJdVMaEXPITY5rfKg3SK9p6KdJDDpnXSTTwATUDWzzJpfI iSVo9Si/rJBzpDTVRyyKFGwRBN42iqWM4J9Hpf6qEYoXItWR7kBktBB6UQOTC3Tc7Y/4 BBIhmV1Sk235gQzVydqqnxXl7+SPoJVagQLGlOcfrND3SbqVGL1mtfhVJwcmyWLyGm4l RmL2Cs/1fZBjWGpIsz45QfvMrfUQPW6U9zt/RciTDXOIZPK7l/MR0cZwDcRsnZGKEGMK xvcZfzTnNo5PG28mDOyxmVFzOVbRysPzhucNo8kexMjiRmg+EhbrlRm4qOuS3RsAM7TD 2Bog== 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; bh=cFiCZaLwI9APWZLVc99Gi5IdkknPDMBJ8S+4OxpzfU0=; b=DYYQl7Gi5CJvGVa5Ft0K5srgO+H8izvrbVZurMfSz8mcMu9DP0V9ZnY69NrIDquuU7 KSSOYOG6ubAttKu2l8U68gy58zuCahVbpIIImrE3w7XFupHsOIkUcRHDszLiH5Tp99Vr ypJ9tNYnJd1OLpBMEH6YN81IEAel91VcAbpyPmtDiDV8sWtNAsqsWC1EVeJZPBzRGdE1 vF2VTShwmRCQzzsMdNIjZn+44wmOR8isPFUXPXsnwA79zazZ3C/H64PJmI2DvZgEM0T4 TrfM7eIKTC2gaSAEdlBTVimJ8AyhaXwGUWXo5v+cb+L5fZyRZ7STTH/KZjzkDKOgPhax ZVMg== X-Gm-Message-State: AJaThX5fX6TmQZJ7u4i1WzQAxKnr1l31YoSrLEeTj40TfxUKDDIZ1ts5 OA1cJic+lzEQktqfEmAPG0Jk9ahB X-Google-Smtp-Source: AGs4zMZYzrmc2kfp79GTHrJMzlyT021VkntI8S2lff1msmH74gtXZdtMJ4RL+uH50JWYbSUre64LDQ== X-Received: by 10.28.18.1 with SMTP id 1mr10402038wms.88.1510668952436; Tue, 14 Nov 2017 06:15:52 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id s12sm44946229wrc.89.2017.11.14.06.15.50 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 14 Nov 2017 06:15:50 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Tue, 14 Nov 2017 15:15:31 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH v2 0/9] arm: zynq: ps7* consolidation 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" Hi, this series is trying to cleanup ps7_init* file that we don't need to have the same copy of the same functions in different locations. This work is done based on solution from Topic.nl for miami boards where format was changed a little bit to save one word in config data segment. At the same time older method of simply copying files to particular folder is still working. Please test this in your board to make sure I didn't break anything. I have tested it on zybo/zc702/zc706. Thanks, Michal Changes in v2: - Fix indentation by using tabs instead of spaces - Add own opcode for write operation - Change commit message (was Convert EMIT_WRITE to EMIT_MASKWRITE) - requested by Mike Michal Simek (9): arm: zynq: Add missing ps7_post_config declaration arm: zynq: Enable debug uart on zc706 arm: zynq: Remove ps7_debug code arm: zynq: Move ps7_* to separate file arm: zynq: Get rid of ps7_reset_apu() for syzygy board arm: zynq: Move common ps7_init* initialization to arch code arm: zynq: Add ps7GetSiliconVersion() to ps7_spl_init arm: zynq: Add support for EMIT_WRITE operation arm: zynq: Convert all board to use arch ps7_init code arch/arm/mach-zynq/Makefile | 2 +- arch/arm/mach-zynq/include/mach/ps7_init_gpl.h | 48 ++++ arch/arm/mach-zynq/include/mach/sys_proto.h | 3 - .../arm/mach-zynq/ps7_spl_init.c | 37 ++- arch/arm/mach-zynq/spl.c | 18 +- .../opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c | 138 +--------- .../opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.h | 81 ------ board/topic/zynq/Makefile | 2 +- board/topic/zynq/ps7_init_gpl.h | 34 --- board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c | 2 +- .../topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c | 2 +- .../topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c | 285 +------------------- board/xilinx/zynq/zynq-microzed/ps7_init_gpl.h | 117 --------- board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c | 289 +------------------- board/xilinx/zynq/zynq-zc702/ps7_init_gpl.h | 117 --------- board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c | 285 +------------------- board/xilinx/zynq/zynq-zc706/ps7_init_gpl.h | 117 --------- board/xilinx/zynq/zynq-zed/ps7_init_gpl.c | 285 +------------------- board/xilinx/zynq/zynq-zed/ps7_init_gpl.h | 117 --------- board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c | 292 +-------------------- board/xilinx/zynq/zynq-zybo/ps7_init_gpl.h | 98 ------- configs/zynq_zc706_defconfig | 5 + 23 files changed, 100 insertions(+), 2276 deletions(-) create mode 100644 arch/arm/mach-zynq/include/mach/ps7_init_gpl.h rename board/topic/zynq/ps7_init_common.c => arch/arm/mach-zynq/ps7_spl_init.c (76%) delete mode 100644 board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.h delete mode 100644 board/topic/zynq/ps7_init_gpl.h delete mode 100644 board/xilinx/zynq/zynq-microzed/ps7_init_gpl.h delete mode 100644 board/xilinx/zynq/zynq-zc702/ps7_init_gpl.h delete mode 100644 board/xilinx/zynq/zynq-zc706/ps7_init_gpl.h delete mode 100644 board/xilinx/zynq/zynq-zed/ps7_init_gpl.h delete mode 100644 board/xilinx/zynq/zynq-zybo/ps7_init_gpl.h