From patchwork Sat Apr 4 08:39:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 458143 X-Patchwork-Delegate: hdegoede@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id DBD0814012F for ; Sat, 4 Apr 2015 19:40:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA5284A03B; Sat, 4 Apr 2015 10:40:01 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IU7hxkS8kx_b; Sat, 4 Apr 2015 10:40:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8933BB37B1; Sat, 4 Apr 2015 10:40:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ABBF64A039 for ; Sat, 4 Apr 2015 10:39:59 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F0b_ojO7uK6j for ; Sat, 4 Apr 2015 10:39:59 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by theia.denx.de (Postfix) with ESMTPS id 2A26D4A036 for ; Sat, 4 Apr 2015 10:39:55 +0200 (CEST) Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t348dmT3014803 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sat, 4 Apr 2015 04:39:49 -0400 Received: from shalem.localdomain.com (vpn1-7-150.ams2.redhat.com [10.36.7.150]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t348dkWH018655; Sat, 4 Apr 2015 04:39:47 -0400 From: Hans de Goede To: Ian Campbell Date: Sat, 4 Apr 2015 10:39:45 +0200 Message-Id: <1428136785-15129-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] sunxi: Fix Orangepi_mini dtb filename X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" The Orangepi_mini is different enough from the regular Orangepi that it needs its own dtb, but when it got added a copy and paste error was made and it got the same dtb filename, fix this. While at it also add a short description of both Orangepi boards to the defconfig files for them. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- configs/Orangepi_defconfig | 7 +++++++ configs/Orangepi_mini_defconfig | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index 28fadcd..01d1b2c 100644 --- a/configs/Orangepi_defconfig +++ b/configs/Orangepi_defconfig @@ -1,3 +1,10 @@ +# The Orangepi is a development board using the Allwinner A20 SoC, with 1G +# RAM, microsd slot, HDMI, 1Gbit ethernet, USB wifi, Micro USB (otg), sata, +# 4 USB A ports, ir receiver and a headphones jack. +# +# Also see: +# http://linux-sunxi.org/Xunlong_Orange_Pi +# http://www.orangepi.org/ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" CONFIG_FDTFILE="sun7i-a20-orangepi.dtb" diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index 330679b..5364589 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -1,6 +1,14 @@ +# The Orangepi mini is a development board using the Allwinner A20 SoC, +# with 1G RAM, 2 microsd slots (use the top side one for booting), HDMI, +# 1Gbit ethernet, USB wifi, Micro USB (otg), sata, 4 USB A ports, +# ir receiver and a headphones jack. +# +# Also see: +# http://linux-sunxi.org/Xunlong_Orange_Pi_Mini +# http://www.orangepi.org/ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-orangepi.dtb" +CONFIG_FDTFILE="sun7i-a20-orangepi-mini.dtb" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_MMC0_CD_PIN="PH10" CONFIG_MMC3_CD_PIN="PH11"