From patchwork Tue Jul 9 14:14:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1129860 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="BtxBICWZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45jl2x5bdhz9sBt for ; Wed, 10 Jul 2019 00:25:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A415AC21F04; Tue, 9 Jul 2019 14:17:28 +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 03BB2C21E42; Tue, 9 Jul 2019 14:17:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 160F1C21E3E; Tue, 9 Jul 2019 14:15:14 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 632C3C21EDC for ; Tue, 9 Jul 2019 14:15:14 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id g15so9520975pgi.4 for ; Tue, 09 Jul 2019 07:15: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=QDxUl+1yjQ+UXNgYpV+4+kTnBpOjX1tIqXFKKCPXg54=; b=BtxBICWZe5PjdupJIgDUR5XGqzLqdiwFocr+pAID20y+wrEsphi+OEGz/zqDo1wxsa 5Y9LDHSR59rWMWBsUOUCLNZ54xe4b3TtRNLe7DRtxvCoxA0fzhInqh5bHfY56/CZRy/d yJhns7t2oYpu93tqmqT0bEuUVg8W9JMjUjBGiUUdxilzDjOtsv2E/H5vuhJsqa/JQ7V1 XAwlU2Wahffgj6cju0mta0c97BIuqCQs1HB29obXBtb4TMp23wyC6u5uSHftyjgn7viP Y9CjIhNDRdMoCDUVDBjYDpR9mY38WAPhmCNejaJuwTGmnExyrqIe9AG/Poyqm4Exxhb/ AzRw== 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=QDxUl+1yjQ+UXNgYpV+4+kTnBpOjX1tIqXFKKCPXg54=; b=aRRvOEdAdTJHzMhbBL+NSe4rvptkrK5TvgZF9AfYVW263nv2Gmibb7N+YEzanllxwT vgNfepnphtds66k4U1oGdDWYjie8FSyy/e1NnSHuUKQ5gxrLFgDX2MadtG1Sr/TrqgQe adK9ke5pTo+GVg3fqWKDeeKwI4hGGRgBNpmHCZcEjSWj/ulMM7x6wYHLkvjwPtUTNmud EhM4mnWwXtu2NQ3W5ZXYFIpMj12WGokrv0nC293mhLisYcSehRhAMarnK4RZUDkb7Ag/ 6XZUyEZK7Mlai4V/Qpei0+TgPgXh2FFdOB2yIC+9m1E1QPwdqiYj345zStkWTpma0eLg /Cgw== X-Gm-Message-State: APjAAAVGwdJauSLDRN12l3cZJqvT2Rl/FmJNSJBa1MX5e1T06EgF/wTx +mdI97KnELepmuNoyKea+7q528lG X-Google-Smtp-Source: APXvYqyUXDA8ldL5zGFMzL0Hm3Cy1EkdqHSrxqOn4M94WpNZiyxNZ2TyOzwZkrkKXJeOQF1OMKau8A== X-Received: by 2002:a63:ad07:: with SMTP id g7mr29092163pgf.405.1562681712894; Tue, 09 Jul 2019 07:15:12 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id f17sm17822063pgv.16.2019.07.09.07.15.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 07:15:12 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 9 Jul 2019 22:14:20 +0800 Message-Id: <20190709141429.21442-7-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190709141429.21442-1-kever.yang@rock-chips.com> References: <20190709141429.21442-1-kever.yang@rock-chips.com> Cc: andy.yan@rock-chips.com Subject: [U-Boot] [PATCH 06/15] rockchip: Kconfig: move ROCKCHIP_BOOT_MODE_REG to soc Kconfig 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" Rockchip SoCs have different ROCKCHIP_BOOT_MODE_REG value, move it to SoC's own Kconfig, and add address for rk3128 and rk3328 so that all SoCs have available address. Signed-off-by: Kever Yang --- arch/arm/mach-rockchip/Kconfig | 7 ------- arch/arm/mach-rockchip/rk3036/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3128/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3188/Kconfig | 3 +++ arch/arm/mach-rockchip/rk322x/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3288/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3328/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3368/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3399/Kconfig | 3 +++ arch/arm/mach-rockchip/rv1108/Kconfig | 3 +++ 10 files changed, 27 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 52b83fc611..127a04e348 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -225,13 +225,6 @@ config TPL_ROCKCHIP_BACK_TO_BROM config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address" - default 0x200081c8 if ROCKCHIP_RK3036 - default 0x20004040 if ROCKCHIP_RK3188 - default 0x110005c8 if ROCKCHIP_RK322X - default 0xff730094 if ROCKCHIP_RK3288 - default 0xff738200 if ROCKCHIP_RK3368 - default 0xff320300 if ROCKCHIP_RK3399 - default 0x10300580 if ROCKCHIP_RV1108 default 0 help The Soc will enter to different boot mode(defined in asm/arch-rockchip/boot_mode.h) diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig index 0f6b5c4629..51cd43b396 100644 --- a/arch/arm/mach-rockchip/rk3036/Kconfig +++ b/arch/arm/mach-rockchip/rk3036/Kconfig @@ -13,6 +13,9 @@ config TARGET_KYLIN_RK3036 endchoice +config ROCKCHIP_BOOT_MODE_REG + default 0x200081c8 + config SYS_SOC default "rk3036" diff --git a/arch/arm/mach-rockchip/rk3128/Kconfig b/arch/arm/mach-rockchip/rk3128/Kconfig index a82b7dc063..b867401c7f 100644 --- a/arch/arm/mach-rockchip/rk3128/Kconfig +++ b/arch/arm/mach-rockchip/rk3128/Kconfig @@ -13,6 +13,9 @@ config TARGET_EVB_RK3128 endchoice +config ROCKCHIP_BOOT_MODE_REG + default 0x100a0038 + config SYS_SOC default "rk3128" diff --git a/arch/arm/mach-rockchip/rk3188/Kconfig b/arch/arm/mach-rockchip/rk3188/Kconfig index a6fc691fb6..e24e68ea51 100644 --- a/arch/arm/mach-rockchip/rk3188/Kconfig +++ b/arch/arm/mach-rockchip/rk3188/Kconfig @@ -9,6 +9,9 @@ config TARGET_ROCK Expansion connectors provide access to display pins, I2C, SPI, UART and GPIOs. +config ROCKCHIP_BOOT_MODE_REG + default 0x20004040 + config SYS_SOC default "rk3188" diff --git a/arch/arm/mach-rockchip/rk322x/Kconfig b/arch/arm/mach-rockchip/rk322x/Kconfig index cffb53183b..60e99a7e3b 100644 --- a/arch/arm/mach-rockchip/rk322x/Kconfig +++ b/arch/arm/mach-rockchip/rk322x/Kconfig @@ -5,6 +5,9 @@ config TARGET_EVB_RK3229 bool "EVB_RK3229" select BOARD_LATE_INIT +config ROCKCHIP_BOOT_MODE_REG + default 0x110005c8 + config SYS_SOC default "rk322x" diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 0dc5123fb6..a03b36bff3 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -139,6 +139,9 @@ config ROCKCHIP_FAST_SPL voltage. This option is only available on boards which support it and have the required PMIC code. +config ROCKCHIP_BOOT_MODE_REG + default 0xff730094 + config SYS_SOC default "rk3288" diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig index 6c5c4303a3..8ad7f56cbf 100644 --- a/arch/arm/mach-rockchip/rk3328/Kconfig +++ b/arch/arm/mach-rockchip/rk3328/Kconfig @@ -12,6 +12,9 @@ config TARGET_EVB_RK3328 endchoice +config ROCKCHIP_BOOT_MODE_REG + default 0xff1005c8 + config SYS_SOC default "rk3328" diff --git a/arch/arm/mach-rockchip/rk3368/Kconfig b/arch/arm/mach-rockchip/rk3368/Kconfig index 31ef243a75..141d2f67aa 100644 --- a/arch/arm/mach-rockchip/rk3368/Kconfig +++ b/arch/arm/mach-rockchip/rk3368/Kconfig @@ -42,6 +42,9 @@ config TARGET_EVB_PX5 sensor STK3410. endchoice +config ROCKCHIP_BOOT_MODE_REG + default 0xff738200 + config SYS_SOC default "rk3368" diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 231ba14cca..f582577d97 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -64,6 +64,9 @@ config TARGET_CHROMEBOOK_BOB endchoice +config ROCKCHIP_BOOT_MODE_REG + default 0xff320300 + config SYS_SOC default "rk3399" diff --git a/arch/arm/mach-rockchip/rv1108/Kconfig b/arch/arm/mach-rockchip/rv1108/Kconfig index c5402ab1bd..a12216dccf 100644 --- a/arch/arm/mach-rockchip/rv1108/Kconfig +++ b/arch/arm/mach-rockchip/rv1108/Kconfig @@ -27,6 +27,9 @@ config TARGET_ELGIN_RV1108 endchoice +config ROCKCHIP_BOOT_MODE_REG + default 0x10300580 + config SYS_SOC default "rv1108"