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 <eric.nel...@boundarydevices.com> >
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: 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 <config_distro_defaults.h> +#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 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 -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de =====================================================================
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 <config_distro_defaults.h> +#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
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
