Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C431C4338F for ; Sat, 21 Aug 2021 17:51:13 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43C19611CB for ; Sat, 21 Aug 2021 17:51:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 43C19611CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43C3982D5B; Sat, 21 Aug 2021 19:50:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 1315382DDB; Sat, 21 Aug 2021 19:50:34 +0200 (CEST) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F06CE82D50 for ; Sat, 21 Aug 2021 19:50:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f177.google.com with SMTP id y9so10236291qtv.7 for ; Sat, 21 Aug 2021 10:50:27 -0700 (PDT) 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=4RDYbgRoLqnFb6iXW5Wm7SWIA0+SrSfdnohcSODwTY8=; b=giqvxxvzVRHixYU6k8BWVprQmkx1OwUaagV9TJkBPqx6DBjHyDaICXzCyr8/CL2NW1 qMQ0rGgGLNbnewLlm1BlbpZj+6ERlY0+auP/xCnj/rxhFsHdb4Kf7uIBXWSS6RP9YXTY TYyNa85/IWPeJJ2ubhOIcHt71n9mG/Jqd3Zwx3MOhVE86Fbaa/lw9QYbjIFlMdJLod+3 xe0m7kEQ0wfet+icDkimsPNxZ6+fgGcrxL40JqSlACOqhP3RkHhAjeKGI/P5no/h9twa /kN7LQdl14977Zl2Q3OWYoWCSHXcrjsPnp11g0Z9zOdrDQnLUisHWUUMWuv5Yh/VnRg/ HYHQ== X-Gm-Message-State: AOAM533vqyS4MB22pxM6Gt15uyHFw/Vqsoi/fxLz/MXHLSOEaScJz8o4 DwCnCozOrWnRor2jDUBaZs0jhek0x6rK X-Google-Smtp-Source: ABdhPJzg8LXGRMV4rKcWl4wd7jFZtvZY9BHSvzBovkddoCQfQ/M0TJfSj1BOKt/xsWrhWV7Gzf2KsA== X-Received: by 2002:a05:622a:c6:: with SMTP id p6mr5466463qtw.35.1629568226323; Sat, 21 Aug 2021 10:50:26 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2c26-3387-ab71-667f.res6.spectrum.com. [2603:6081:7b01:cbda:2c26:3387:ab71:667f]) by smtp.gmail.com with ESMTPSA id j184sm5298510qkd.74.2021.08.21.10.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Aug 2021 10:50:24 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Stefan Roese Subject: [PATCH 3/9] mvebu: Migrate CONFIG_DDR_32BIT/64BIT to Kconfig Date: Sat, 21 Aug 2021 13:50:13 -0400 Message-Id: <20210821175019.24180-3-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210821175019.24180-1-trini@konsulko.com> References: <20210821175019.24180-1-trini@konsulko.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Move CONFIG_DDR_32BIT/64BIT to Kconfig as a choice for Armada XP platforms. Make 64bit the default as this mirrors the current code. Cc: Marek BehĂșn Cc: Stefan Roese Signed-off-by: Tom Rini --- arch/arm/mach-mvebu/Kconfig | 13 +++++++++++++ configs/ds414_defconfig | 1 + include/configs/ds414.h | 3 --- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 89737a37ad9e..1daa64763b03 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -184,6 +184,19 @@ config TARGET_CRS3XX_98DX3236 endchoice +choice + prompt "DDR bus width" + default DDR_64BIT + depends on ARMADA_XP + +config DDR_64BIT + bool "64bit bus width" + +config DDR_32BIT + bool "32bit bus width" + +endchoice + config SYS_BOARD default "clearfog" if TARGET_CLEARFOG default "helios4" if TARGET_HELIOS4 diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index bfe2e5f4fe70..d3fb1dcd40b1 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DS414=y +CONFIG_DDR_32BIT=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x7E0000 CONFIG_ENV_SECT_SIZE=0x10000 diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 5d401281c7e6..66bbff71a948 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -67,9 +67,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -/* DS414 bus width is 32bits */ -#define CONFIG_DDR_32BIT - /* Default Environment */ #define CONFIG_LOADADDR 0x80000 #define CONFIG_BOOTCOMMAND \ -- 2.17.1