From patchwork Mon Jul 22 11:59:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1134880 X-Patchwork-Delegate: ykai007@gmail.com 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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kLBgLHIt"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45shfG196mz9s00 for ; Mon, 22 Jul 2019 23:04:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A7F04C220A7; Mon, 22 Jul 2019 13:04:52 +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=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 0DCF3C21F29; Mon, 22 Jul 2019 12:04:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A51BC21F1D; Mon, 22 Jul 2019 12:04:36 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 24D58C21DEC for ; Mon, 22 Jul 2019 12:00:14 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id i70so6817400pgd.4 for ; Mon, 22 Jul 2019 05:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=x+qq8ghJUmoCunc/auis15CzyrTTwiQktw1TaduALX0=; b=kLBgLHIt7b2pnMef+Bu54TtIl3G4H6RPCNj4rVGrdCoEagYqBYRCSYHrvqQ0P8cdAS JLHuCQWk3CIQSPFt2MPEK6LwxOp5Dmc0QvkX3rZBh4rehrwxQOnZFvIqk9FKc/jEmyyt scp6sjSr6sIDGxeXYWErgmyeJVTVGCsbynxupDngtOeEiZWv8XpXkbKAwvcYMgE3/YhA tozOARen93AwpjTT/D4epvjatyhTkghuHsFM+1V7aBs4sZL8YmkEZ2RA9aA220+bIZoJ UOFZy6gTwqFU35SS1aCi5Jogrlc5nAmMBXsvT98RD500m3Y3AcOvQa25a3o58WSFw9c4 WoZA== 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; bh=x+qq8ghJUmoCunc/auis15CzyrTTwiQktw1TaduALX0=; b=qkA0jFWaY85vkuV+55hhnNBj384h0R85MWMX1LNhLBAqbeG71lMiGUla8me81uJipJ 4j0QpA8OfIdlr8/3z3S/FlIZqiq2XtWCAvFu5Fl9hOFUelPXvLaoj1UX0treqRMoGqh3 wdYwPhi7pmwfWrMbbWupIyC8uN7OiCfgzYMg7aHfe/X62ENJSdHEPv1DyU3M+Y+hGYEB dgi5BZqu/3XINKGBZCHY/ago/6I5oma900hWNjM+vvcfcSN0HtM0OHK25X9ZAerSoImC Sd/rw9zhgps35e1LNJK/79HqPn0LsQhOWSM2YbxkSEbJgw4SwkI9eleB7vWd+oqm7/3Q uSkw== X-Gm-Message-State: APjAAAWtIaJyvn4buTpxtoRZYxIYNwRR3nWZF++irZEV/kL2Y7u/VEAV YyYlr3xSAWt4Ji12Vr5cqmPZsL9l X-Google-Smtp-Source: APXvYqw8c28kaZ/8EOt2rRZ8sxEe07ZBceTBU8p4BqXEPy0e5IQBfGYz2GzbLx8nVrZBM2K7WVXenw== X-Received: by 2002:a17:90a:e397:: with SMTP id b23mr76976338pjz.117.1563796812696; Mon, 22 Jul 2019 05:00:12 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id u134sm37621218pfc.19.2019.07.22.05.00.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 05:00:12 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Mon, 22 Jul 2019 19:59:16 +0800 Message-Id: <20190722115942.24962-10-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190722115942.24962-1-kever.yang@rock-chips.com> References: <20190722115942.24962-1-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH 09/35] rockchip: rk3188: move spl_board_init() into rk3188.c 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" Clean up the rk3188.c so that we can re-use the common spl board file. Signed-off-by: Kever Yang --- arch/arm/mach-rockchip/rk3188-board-spl.c | 36 ----------------------- arch/arm/mach-rockchip/rk3188/rk3188.c | 36 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index 33fa7d0bb7..6370d3837e 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -114,42 +114,6 @@ void board_init_f(ulong dummy) debug("DRAM init failed: %d\n", ret); return; } -} - -static int setup_led(void) -{ -#ifdef CONFIG_SPL_LED - struct udevice *dev; - char *led_name; - int ret; - - led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led"); - if (!led_name) - return 0; - ret = led_get_by_label(led_name, &dev); - if (ret) { - debug("%s: get=%d\n", __func__, ret); - return ret; - } - ret = led_set_on(dev, 1); - if (ret) - return ret; -#endif - - return 0; -} - -void spl_board_init(void) -{ - int ret; - - ret = setup_led(); - if (ret) { - debug("LED ret=%d\n", ret); - hang(); - } preloader_console_init(); - - return; } diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index f7e12a95b2..7a0b10a27d 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -60,3 +60,39 @@ int arch_cpu_init(void) #endif return 0; } + +#ifdef CONFIG_SPL_BUILD +static int setup_led(void) +{ +#ifdef CONFIG_SPL_LED + struct udevice *dev; + char *led_name; + int ret; + + led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led"); + if (!led_name) + return 0; + ret = led_get_by_label(led_name, &dev); + if (ret) { + debug("%s: get=%d\n", __func__, ret); + return ret; + } + ret = led_set_on(dev, 1); + if (ret) + return ret; +#endif + + return 0; +} + +void spl_board_init(void) +{ + int ret; + + ret = setup_led(); + if (ret) { + debug("LED ret=%d\n", ret); + hang(); + } +} +#endif