Pull all the duplicate configuration options into configs/mxs.h from the board configuration files. This reduces the files greatly and makes them somewhat more readable. Besides, we do no longer have such a horrible duplication of code. Note that the mx23evk grew in size slightly. This is due to the CONFIG_SYS_CBSIZE now being set to 1024 as it is on the rest of MXS systems. This patch also fixes the OCRAM size for i.MX23. The i.MX23 has only 32kB of OCRAM, while i.MX28 has 128kB of OCRAM. I verified the configuration didn't change for each of the boards, but I didn't boot-test it on the boards I do not have. I configured U-Boot for each board using the "make ... <board>_config" command and then ran "cpp -I include -dM include/config.h" , which dumped all the configuration options. I did this both before and after this patch and finally compared the results for each MXS board. Actually, the results do differ slightly, since the configs/mxs.h file now properly includes the correct iomux-mx23.h or iomux-mx28.h , so while comparing, I had to ignore these new defines. These have no impact on U-Boot configuration though. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Stefano Babic <sbabic@denx.de>master
Marek Vasut
12 years ago
committed by
Stefano Babic
parent
62c175fbb8
commit
5434caf5ba
@ -0,0 +1,191 @@ |
||||
/*
|
||||
* Copyright (C) 2013 Marek Vasut <marex@denx.de> |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
#ifndef __CONFIGS_MXS_H__ |
||||
#define __CONFIGS_MXS_H__ |
||||
|
||||
/*
|
||||
* Includes |
||||
*/ |
||||
|
||||
#if defined(CONFIG_MX23) && defined(CONFIG_MX28) |
||||
#error Select either CONFIG_MX23 or CONFIG_MX28 , never both! |
||||
#elif !defined(CONFIG_MX23) && !defined(CONFIG_MX28) |
||||
#error Select one of CONFIG_MX23 or CONFIG_MX28 ! |
||||
#endif |
||||
|
||||
#include <asm/arch/regs-base.h> |
||||
|
||||
#if defined(CONFIG_MX23) |
||||
#include <asm/arch/iomux-mx23.h> |
||||
#elif defined(CONFIG_MX28) |
||||
#include <asm/arch/iomux-mx28.h> |
||||
#endif |
||||
|
||||
/*
|
||||
* CPU specifics |
||||
*/ |
||||
|
||||
/* Ticks per second */ |
||||
#define CONFIG_SYS_HZ 1000 |
||||
|
||||
/* MXS uses FDT */ |
||||
#define CONFIG_OF_LIBFDT |
||||
|
||||
/* Startup hooks */ |
||||
#define CONFIG_BOARD_EARLY_INIT_F |
||||
#define CONFIG_ARCH_MISC_INIT |
||||
|
||||
/* SPL */ |
||||
#define CONFIG_SPL |
||||
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE |
||||
#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs" |
||||
#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" |
||||
#define CONFIG_SPL_LIBCOMMON_SUPPORT |
||||
#define CONFIG_SPL_LIBGENERIC_SUPPORT |
||||
#define CONFIG_SPL_GPIO_SUPPORT |
||||
|
||||
/* Memory sizes */ |
||||
#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */ |
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* Initial data */ |
||||
#define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */ |
||||
#define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */ |
||||
|
||||
/* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */ |
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x00000000 |
||||
#if defined(CONFIG_MX23) |
||||
#define CONFIG_SYS_INIT_RAM_SIZE (32 * 1024) |
||||
#elif defined(CONFIG_MX28) |
||||
#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024) |
||||
#endif |
||||
|
||||
/* Point initial SP in SRAM so SPL can use it too. */ |
||||
#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) |
||||
|
||||
/*
|
||||
* We need to sacrifice first 4 bytes of RAM here to avoid triggering some |
||||
* strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot |
||||
* binary. In case there was more of this mess, 0x100 bytes are skipped. |
||||
*/ |
||||
#define CONFIG_SYS_TEXT_BASE 0x40000100 |
||||
|
||||
/* U-Boot general configuration */ |
||||
#define CONFIG_SYS_LONGHELP |
||||
#ifndef CONFIG_SYS_PROMPT |
||||
#define CONFIG_SYS_PROMPT "=> " |
||||
#endif |
||||
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ |
||||
#define CONFIG_SYS_PBSIZE \ |
||||
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) |
||||
/* Print buffer size */ |
||||
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ |
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE |
||||
/* Boot argument buffer size */ |
||||
#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ |
||||
#define CONFIG_AUTO_COMPLETE /* Command auto complete */ |
||||
#define CONFIG_CMDLINE_EDITING /* Command history etc */ |
||||
#define CONFIG_SYS_HUSH_PARSER |
||||
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " |
||||
|
||||
/* Booting Linux */ |
||||
#define CONFIG_CMDLINE_TAG |
||||
#define CONFIG_SETUP_MEMORY_TAGS |
||||
|
||||
/*
|
||||
* Drivers |
||||
*/ |
||||
|
||||
/* APBH DMA */ |
||||
#define CONFIG_APBH_DMA |
||||
|
||||
/* GPIO */ |
||||
#define CONFIG_MXS_GPIO |
||||
|
||||
/* DUART Serial Driver */ |
||||
#define CONFIG_PL011_SERIAL |
||||
#define CONFIG_PL011_CLOCK 24000000 |
||||
#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } |
||||
#define CONFIG_CONS_INDEX 0 |
||||
/* Default baudrate can be overriden by board! */ |
||||
#ifndef CONFIG_BAUDRATE |
||||
#define CONFIG_BAUDRATE 115200 |
||||
#endif |
||||
|
||||
/* FEC Ethernet on SoC */ |
||||
#ifdef CONFIG_FEC_MXC |
||||
#define CONFIG_MII |
||||
#ifndef CONFIG_ETHPRIME |
||||
#define CONFIG_ETHPRIME "FEC0" |
||||
#endif |
||||
#ifndef CONFIG_FEC_XCV_TYPE |
||||
#define CONFIG_FEC_XCV_TYPE RMII |
||||
#endif |
||||
#endif |
||||
|
||||
/* I2C */ |
||||
#ifdef CONFIG_CMD_I2C |
||||
#define CONFIG_I2C_MXS |
||||
#define CONFIG_HARD_I2C |
||||
#ifndef CONFIG_SYS_I2C_SPEED |
||||
#define CONFIG_SYS_I2C_SPEED 400000 |
||||
#endif |
||||
#endif |
||||
|
||||
/* LCD */ |
||||
#ifdef CONFIG_VIDEO |
||||
#define CONFIG_CFB_CONSOLE |
||||
#define CONFIG_VIDEO_MXS |
||||
#define CONFIG_VIDEO_SW_CURSOR |
||||
#define CONFIG_VGA_AS_SINGLE_DEVICE |
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV |
||||
#endif |
||||
|
||||
/* MMC */ |
||||
#ifdef CONFIG_CMD_MMC |
||||
#define CONFIG_MMC |
||||
#define CONFIG_GENERIC_MMC |
||||
#define CONFIG_BOUNCE_BUFFER |
||||
#define CONFIG_MXS_MMC |
||||
#endif |
||||
|
||||
/* NAND */ |
||||
#ifdef CONFIG_CMD_NAND |
||||
#define CONFIG_NAND_MXS |
||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 |
||||
#define CONFIG_SYS_NAND_BASE 0x60000000 |
||||
#define CONFIG_SYS_NAND_5_ADDR_CYCLE |
||||
#endif |
||||
|
||||
/* SPI */ |
||||
#ifdef CONFIG_CMD_SPI |
||||
#define CONFIG_HARD_SPI |
||||
#define CONFIG_MXS_SPI |
||||
#define CONFIG_SPI_HALF_DUPLEX |
||||
#endif |
||||
|
||||
/* USB */ |
||||
#ifdef CONFIG_CMD_USB |
||||
#define CONFIG_USB_EHCI |
||||
#define CONFIG_USB_EHCI_MXS |
||||
#define CONFIG_EHCI_IS_TDI |
||||
#endif |
||||
|
||||
#endif /* __CONFIGS_MXS_H__ */ |
||||
Loading…
Reference in new issue