From patchwork Thu Nov 22 09:07:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 151743 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp531435eds; Thu, 22 Nov 2018 01:22:54 -0800 (PST) X-Google-Smtp-Source: AFSGD/UZcsV3HhGlo34PTF2K/IXdqf3enH/5r9ZQ3e9CMRrs0+qef288Ovk0hjwVCtyFSCEc1S0N X-Received: by 2002:a50:b5a5:: with SMTP id a34mr8575992ede.52.1542878573990; Thu, 22 Nov 2018 01:22:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542878573; cv=none; d=google.com; s=arc-20160816; b=WFvMOvaETzCBMwdOupK/J0DhRywVc9eqAtQwxWPKZN2VPQJl3z5PyUZQGLAZnWGHGA G4RW9QyVR29Syanr8YI1qNuzml2qgdbfcnYzQCSu5FpXkM7ufkBG5KmUESnBR8HRTgEi w6mcNTQS9wHfo2uchCvljFkjfr7WxltO6+l1ScpVvPQHufzt5RImLkqL81X53XCKo7l3 1M0Hsj3NWgut86vdwcC7IG2Q2hiS7MWCG7JxTCV9h5O753+5mJSPuVcoHVlQ6VtfJNxo fXubijLIYdUh0TByBvAJB7TZCk2N3PMCtpyS1+MkzGycZ6ymc7x2h7UCn2W1NLiurWph UbVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=SMzjIYNYGt3ZqjAImwSllVZG3gTwyDSuJJXWx/81Nts=; b=fSkR+XL45VDpYYCjbBlS/qGxKrsGLfpRZ5e1F7nXQV8eBuuuGRPGFGpYNsJglkuO7L q8f3NtR+Nnsx9sbrIbZmkzre7JYpPXxQLyTRlf0SzRBu5k5XNdZriLWrg0TfAGV2GO0T vn+dRUtCsnPo5xez9/DdseUeQws6+TtDO2t8NZgopQFoLbeyfJ1eJLxZODFMB3fB2j7s EnSTnTDHL/rIUp2Fe3yV/EZzpEHaTMxwxS8ttoKUJvqXc1xKvmBR8+PruCP7NJ9/X8AM xXkdegNyLCXYu9+bnGnjb3jFqF9My2xVLvxG/8Ym7PuOHdie6WUYRx0NhrZ9tkJyqrQe vRGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=TTQYImQc; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id t20si3757004edw.353.2018.11.22.01.22.53; Thu, 22 Nov 2018 01:22:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=TTQYImQc; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 9A2E5C21F68; Thu, 22 Nov 2018 09:21:29 +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 B1081C2209A; Thu, 22 Nov 2018 09:08:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5D7F2C22086; Thu, 22 Nov 2018 09:08:09 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 55687C22003 for ; Thu, 22 Nov 2018 09:08:03 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id 125so8169013wmh.0 for ; Thu, 22 Nov 2018 01:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d9vpINDJQenQvezN/So+zRTZM+XePHq1IqgUHTXr3rY=; b=TTQYImQcSNbJExH/Ms0YlOHRuf3S83DFNLtG/oqWGSj0AWE9IgOqssIDlmXFZAXChG 0FG2L14somcTYtCLMjeTk37tAK4KvHxqyNfcL7ziQOupWrLZz4nc+ZU1lNS+XOuPsk5f H1mTzeJdTwR3ueCrvSkbWPLgg4znRfl3mvCXk2hPpJhiZKXAWzMl5KttQCLSoMMqsgyi 4zgYCAhcKC5PzLShBOPcqjPZ9IAnHfSnT5nXazN0eU48WDthYpackArLssLhJLHXPwqe cXVGL+4BHKC/B9JEL2QXI8KGnN1c5H1vSwt6NrsINsJOGoISGHhWksfW+IFyXjTCZ/au TpQw== 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:mime-version:content-transfer-encoding; bh=d9vpINDJQenQvezN/So+zRTZM+XePHq1IqgUHTXr3rY=; b=sSYzZfyujpfqOHOgqxpiOeIfe/zOTfHm6C/+ZfqE+TsquL5iteWyLwgjEr1NjQQxvM 0k+1+uEUV5qNVFreDHck5ypLjgUlo8wdNp7k6ukHXF0Uclc/qvjmNWzTmwg2mgL7D/BP yUWtWk5FWSEZUgRhsOr6sM9BRjdd2zspsWdZLn3SERID2iDo75xXWOOk3ihpsWuyFPb+ DYM498M9BlU3AQy0NnwLroScPpITEP3COziQCJaikBEPiTFGPqYGQ58bE4RNkEEmcUAs cJ4a75WUgMz477lSnGCd8S5NyFqNbwJrbtCYfX1yf5P4jAmsQSi/3EvZv1MXfvO6pN9U oOmA== X-Gm-Message-State: AGRZ1gJvhXpL8oAqG7vJLRNDi+hq8YHLGDRXjg0xAP+Q/0S3FGiHZXM8 QlnQTdFek35zOFzeAWImMOOXWv7WanqYEQ== X-Received: by 2002:a1c:9183:: with SMTP id t125mr8562999wmd.79.1542877682596; Thu, 22 Nov 2018 01:08:02 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id y9sm13856434wrq.55.2018.11.22.01.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Nov 2018 01:08:02 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Date: Thu, 22 Nov 2018 10:07:39 +0100 Message-Id: <20181122090740.29739-19-narmstrong@baylibre.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122090740.29739-1-narmstrong@baylibre.com> References: <20181122090740.29739-1-narmstrong@baylibre.com> MIME-Version: 1.0 Cc: linux-amlogic@lists.infradead.org, trini@konsulko.com Subject: [U-Boot] [PATCH u-boot v2 18/19] ARM: meson: factorize common code out amlogic's boards 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jerome Brunet Now we have moved all the Amlogic board support to common generic board code, we can move the identical board_init() and ft_board_setup() functions to weak functions into the board-common mach-meson file. Signed-off-by: Jerome Brunet Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/board-common.c | 17 +++++++++++++++++ board/amlogic/odroid-c2/odroid-c2.c | 12 ------------ board/amlogic/p212/p212.c | 12 ------------ board/amlogic/q200/q200.c | 12 ------------ board/amlogic/s400/s400.c | 12 ------------ 5 files changed, 17 insertions(+), 48 deletions(-) diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 6340445053..8c4f3074fb 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -14,6 +14,11 @@ DECLARE_GLOBAL_DATA_PTR; +__weak int board_init(void) +{ + return 0; +} + int dram_init(void) { const fdt64_t *val; @@ -34,6 +39,18 @@ int dram_init(void) return 0; } +__weak int meson_ft_board_setup(void *blob, bd_t *bd) +{ + return 0; +} + +int ft_board_setup(void *blob, bd_t *bd) +{ + meson_init_reserved_memory(blob); + + return meson_ft_board_setup(blob, bd); +} + void meson_board_add_reserved_memory(void *fdt, u64 start, u64 size) { int ret; diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c index d784d6bd09..62f0f4c871 100644 --- a/board/amlogic/odroid-c2/odroid-c2.c +++ b/board/amlogic/odroid-c2/odroid-c2.c @@ -17,11 +17,6 @@ #define EFUSE_MAC_OFFSET 52 #define EFUSE_MAC_SIZE 6 -int board_init(void) -{ - return 0; -} - int misc_init_r(void) { u8 mac_addr[EFUSE_MAC_SIZE]; @@ -46,10 +41,3 @@ int misc_init_r(void) return 0; } - -int ft_board_setup(void *blob, bd_t *bd) -{ - meson_init_reserved_memory(blob); - - return 0; -} diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index 33992a2279..546c4d9c86 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -18,11 +18,6 @@ #define EFUSE_MAC_OFFSET 52 #define EFUSE_MAC_SIZE 6 -int board_init(void) -{ - return 0; -} - int misc_init_r(void) { u8 mac_addr[EFUSE_MAC_SIZE]; @@ -48,10 +43,3 @@ int misc_init_r(void) return 0; } - -int ft_board_setup(void *blob, bd_t *bd) -{ - meson_init_reserved_memory(blob); - - return 0; -} diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c index b59c11bd35..6db1b26e08 100644 --- a/board/amlogic/q200/q200.c +++ b/board/amlogic/q200/q200.c @@ -18,11 +18,6 @@ #define EFUSE_MAC_OFFSET 52 #define EFUSE_MAC_SIZE 6 -int board_init(void) -{ - return 0; -} - int misc_init_r(void) { u8 mac_addr[EFUSE_MAC_SIZE]; @@ -53,10 +48,3 @@ int misc_init_r(void) return 0; } - -int ft_board_setup(void *blob, bd_t *bd) -{ - meson_init_reserved_memory(blob); - - return 0; -} diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c index c2b50f6c17..02a0e9286c 100644 --- a/board/amlogic/s400/s400.c +++ b/board/amlogic/s400/s400.c @@ -13,21 +13,9 @@ #include #include -int board_init(void) -{ - return 0; -} - int misc_init_r(void) { meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0); return 0; } - -int ft_board_setup(void *blob, bd_t *bd) -{ - meson_init_reserved_memory(blob); - - return 0; -}