From patchwork Tue May 26 12:11:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 476436 X-Patchwork-Delegate: sbabic@denx.de 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 868161402A7 for ; Tue, 26 May 2015 22:11:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E7104B760; Tue, 26 May 2015 14:11:24 +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 7C2IL_m17CUo; Tue, 26 May 2015 14:11:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 189A44B73E; Tue, 26 May 2015 14:11:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 591974B742 for ; Tue, 26 May 2015 14:11:12 +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 H9sBl1a7niQA for ; Tue, 26 May 2015 14:11:12 +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 mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTPS id 0411A4B739 for ; Tue, 26 May 2015 14:11:08 +0200 (CEST) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3lwvJr3FVjz3hhff; Tue, 26 May 2015 14:11:08 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) by mail.mnet-online.de (Postfix) with ESMTP id 3lwvJr0sWxzvjDQ; Tue, 26 May 2015 14:11:08 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id D108D4540871; Tue, 26 May 2015 14:11:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KHh_31NYXn3R; Tue, 26 May 2015 14:11:05 +0200 (CEST) Received: from [192.168.178.20] (papero.fritz.box [192.168.178.20]) by babic.homelinux.org (Postfix) with ESMTP id E16B045405A7; Tue, 26 May 2015 14:11:04 +0200 (CEST) Message-ID: <556462D9.9090607@denx.de> Date: Tue, 26 May 2015 14:11:05 +0200 From: Stefano Babic User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Peter Robinson , Fabio Estevam , Stefano Babic , u-boot@lists.denx.de References: <1432312253-18040-1-git-send-email-pbrobinson@gmail.com> In-Reply-To: <1432312253-18040-1-git-send-email-pbrobinson@gmail.com> Subject: Re: [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Hi Peter, On 22/05/2015 18:30, Peter Robinson wrote: > There's a lot of common options in the i.MX6 boards that are repeated across a > lot of the devices. There's a mx6_common.h which is little used but makes sense > to be the central location for all the options we want across all mx6 boards to > ensure a consistent set of features. This is a first pass at moving those options > and unifying the common options to a standard default. > > Changes since v2: > * Rebase on imx-uboot master > * Check that CONFIG_MX6 hasn't already been defined > * Check that CONFIG_SYS_TEXT_BASE/CONFIG_BOOTDELAY haven't already been defined > * Don't accidentily drop CONFIG_EFI_PARTITION from tbs2910.h > > Changes since v1: > * Move CONFIG_SYS_NO_FLASH changes from patch 7 to patch 2 and reorder includes > so we don't need to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS > * Add CONFIG_CMD_GPIO to mx6_common.f (patch 5) > * Use the default for all CONFIG_SYS_PROMPT_HUSH_PS2 (patch 7) > * Drop LZO change (patch 8) > > Peter Robinson (10): > novena: standardise mx6_common.h include > imx6: move all standard includes to mx6_common.h > imx6: move generic imx6 options to mx6_common.h > imx6: move standard ATAG configs to mx6_common.h > imx6: move MXC_GPIO define to mx6_common.h > imx6: centralise common boot options in mx6_common.h > imx6: move generic miscellaneous and overwrite options > imx6: standardise filesystem and boot options > imx6: generic MMC config options to mx6_common > mx6: standardise CONFIG_CMD_CACHE > > Reviewed-by: Eric Nelson > There are still a couple of issues applying the patchset. The solidrun mx6cuboxi is broken, and building mars and riot boards report warnings due to duplicated BOOT_DELAY - rather config_distro has no protection if BOOT_DELAY is already set. I can fix all these issues with the following changes: If nobody complains, I can apply your patchset introducing theses fixes. Or would you send a V3 that fixes them, too ? Best regards, Stefano Babic diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index cb81e63..56950e0 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -13,8 +13,6 @@ #ifndef __RIOTBOARD_CONFIG_H #define __RIOTBOARD_CONFIG_H -#include "mx6_common.h" - #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_CONSOLE_DEV "ttymxc1" #define CONFIG_MMCROOT "/dev/mmcblk1p2" @@ -149,6 +147,7 @@ #define CONFIG_IMX_VIDEO_SKIP #include +#include "mx6_common.h" /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt, * 1M script, 1M pxe and the ramdisk at the end */ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index c0f7f8b..3204191 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -192,12 +192,21 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256 -#define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_CMDLINE_EDITING +/* Physical Memory Map */ +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + + /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC