diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-mx31/mx31.h | 17 | ||||
| -rw-r--r-- | include/configs/mx31_3stack.h | 6 | ||||
| -rw-r--r-- | include/configs/mx35_3stack.h | 3 | ||||
| -rw-r--r-- | include/configs/mx35_3stack_mfg.h | 3 | ||||
| -rw-r--r-- | include/configs/mx35_3stack_mmc.h | 3 | ||||
| -rw-r--r-- | include/configs/mx51_3stack.h | 4 | ||||
| -rw-r--r-- | include/configs/mx51_3stack_android.h | 4 | ||||
| -rw-r--r-- | include/configs/mx51_bbg.h | 4 | ||||
| -rw-r--r-- | include/configs/mx51_bbg_android.h | 8 | ||||
| -rw-r--r-- | include/configs/mx51_bbg_iram.h | 207 | ||||
| -rw-r--r-- | include/configs/mx51_bbg_mfg.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53_arm2.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53_arm2_android.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53_arm2_ddr3.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53_arm2_ddr3_android.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53_evk.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53_evk_android.h | 4 |
17 files changed, 253 insertions, 34 deletions
diff --git a/include/asm-arm/arch-mx31/mx31.h b/include/asm-arm/arch-mx31/mx31.h index 53b9f27..3f8e3ca 100644 --- a/include/asm-arm/arch-mx31/mx31.h +++ b/include/asm-arm/arch-mx31/mx31.h @@ -24,21 +24,28 @@ #ifndef __ASM_ARCH_MX31_H #define __ASM_ARCH_MX31_H -extern u32 mx31_get_ipg_clk(void); -extern void mx31_gpio_mux(unsigned long mode); +#ifndef __ASSEMBLER__ + +enum mxc_clock { + MXC_ARM_CLK, + MXC_UART_CLK, +}; enum mx31_gpio_direction { MX31_GPIO_DIRECTION_IN, MX31_GPIO_DIRECTION_OUT, }; +extern int mxc_get_clock(enum mxc_clock clk); +extern void mx31_gpio_mux(unsigned long mode); + #ifdef CONFIG_MX31_GPIO extern int mx31_gpio_direction(unsigned int gpio, - enum mx31_gpio_direction direction); + enum mx31_gpio_direction direction); extern void mx31_gpio_set(unsigned int gpio, unsigned int value); #else static inline int mx31_gpio_direction(unsigned int gpio, - enum mx31_gpio_direction direction) + enum mx31_gpio_direction direction) { return 1; } @@ -50,4 +57,6 @@ static inline void mx31_gpio_set(unsigned int gpio, unsigned int value) void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void); +#endif + #endif /* __ASM_ARCH_MX31_H */ diff --git a/include/configs/mx31_3stack.h b/include/configs/mx31_3stack.h index d7629b2..6a09e0a 100644 --- a/include/configs/mx31_3stack.h +++ b/include/configs/mx31_3stack.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. * * Configuration settings for the MX31 3Stack Freescale board. * @@ -22,7 +22,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include <asm/arch/mx31-regs.h> +#include <asm/arch/mx31.h> /* High Level Configuration Options */ #define CONFIG_ARM1136 1 /* This is an arm1136 CPU core */ @@ -51,7 +51,7 @@ * Hardware drivers */ #define CONFIG_MXC_UART 1 -#define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_UART_BASE_ADDR 0x43f90000 #define CONFIG_MXC_SPI 1 diff --git a/include/configs/mx35_3stack.h b/include/configs/mx35_3stack.h index 89b9f39..43715be 100644 --- a/include/configs/mx35_3stack.h +++ b/include/configs/mx35_3stack.h @@ -68,7 +68,8 @@ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe -#define CONFIG_MX35_UART UART1_BASE_ADDR +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx35_3stack_mfg.h b/include/configs/mx35_3stack_mfg.h index ba962ef..87d1238 100644 --- a/include/configs/mx35_3stack_mfg.h +++ b/include/configs/mx35_3stack_mfg.h @@ -76,7 +76,8 @@ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe -#define CONFIG_MX35_UART UART1_BASE_ADDR +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h index c0c53fd..6104c09 100644 --- a/include/configs/mx35_3stack_mmc.h +++ b/include/configs/mx35_3stack_mmc.h @@ -71,7 +71,8 @@ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe -#define CONFIG_MX35_UART UART1_BASE_ADDR +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx51_3stack.h b/include/configs/mx51_3stack.h index e628ede..e39565b 100644 --- a/include/configs/mx51_3stack.h +++ b/include/configs/mx51_3stack.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX51_UART 1 -#define CONFIG_MX51_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h index 7935c76..a18944a 100644 --- a/include/configs/mx51_3stack_android.h +++ b/include/configs/mx51_3stack_android.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX51_UART 1 -#define CONFIG_MX51_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* * SPI Configs diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h index 99fd4ac..bdb3621 100644 --- a/include/configs/mx51_bbg.h +++ b/include/configs/mx51_bbg.h @@ -68,8 +68,8 @@ /* * Hardware drivers */ -#define CONFIG_MX51_UART 1 -#define CONFIG_MX51_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h index d4db1c9..a44e821 100644 --- a/include/configs/mx51_bbg_android.h +++ b/include/configs/mx51_bbg_android.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX51_UART 1 -#define CONFIG_MX51_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR #define CONFIG_CMD_PING @@ -157,8 +157,8 @@ "bootcmd_net=run bootargs_base bootargs_nfs; " \ "tftpboot ${loadaddr} ${kernel}; bootm\0" \ "bootcmd_android=run bootargs_base bootargs_android; " \ - "mmcinit;cp.b 0x100000 ${loadaddr} 0x250000; " \ - "cp.b 0x400000 ${rd_loadaddr} 0x4B000; " \ + "mmc read 0 ${loadaddr} 0x800 0x1280; " \ + "mmc read 0 ${rd_loadaddr} 0x2000 0x258; " \ "bootm ${loadaddr} ${rd_loadaddr}\0" \ "prg_uboot=tftpboot ${loadaddr} ${uboot}; " \ "protect off ${uboot_addr} 0xa003ffff; " \ diff --git a/include/configs/mx51_bbg_iram.h b/include/configs/mx51_bbg_iram.h new file mode 100644 index 0000000..b048d9b --- /dev/null +++ b/include/configs/mx51_bbg_iram.h @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de> + * + * (C) Copyright 2009-2010 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX51-3Stack Freescale board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +#include <asm/arch/mx51.h> + + /* High Level Configuration Options */ +#define CONFIG_ARMV7 1 /* This is armv7 Cortex-A8 CPU core */ + +#define CONFIG_MXC 1 +#define CONFIG_MX51_BBG 1 /* in a mx51 */ +#define CONFIG_FLASH_HEADER 1 +#define CONFIG_FLASH_HEADER_OFFSET 0x400 +#define CONFIG_FLASH_HEADER_BARKER 0xB1 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_MX51_HCLK_FREQ 24000000 /* RedBoot says 26MHz */ + +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_ARCH_MMU + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define BOARD_LATE_INIT + +/* + * Disabled for now due to build problems under Debian and a significant + * increase in the final file size: 144260 vs. 109536 Bytes. + */ + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (5 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR + +/* + * SPI Configs + * */ + +/* + * MMC Configs + * */ + +/* + * Eth Configs + */ + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} + +/*********************************************************** + * Command definition + ***********************************************************/ + +#define CONFIG_CMD_BDI /* bdinfo */ +#define CONFIG_CMD_BOOTD /* bootd */ +#define CONFIG_CMD_CONSOLE /* coninfo */ +#define CONFIG_CMD_FPGA /* FPGA configuration Support */ +#define CONFIG_CMD_IMI /* iminfo */ +#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */ +#define CONFIG_CMD_RUN /* run command in env variable */ +#define CONFIG_CMD_SOURCE /* "source" command support */ +#define CONFIG_CMD_XIMG /* Load part of Multi Image */ + +/* + * SPI Configs + * */ + +/* + * MMC Configs + * */ +/* + * Eth Configs + */ + + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_ENV + +#undef CONFIG_CMD_IMLS + +#define CONFIG_BOOTDELAY 3 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x90100000 /* loadaddr env var */ + +#define CONFIG_BOOTARGS "console=ttymxc0,115200 "\ + "rdinit=/linuxrc" + +#define CONFIG_BOOTCOMMAND "bootm ${loadaddr} 0x90800000" +#define CONFIG_ENV_IS_EMBEDDED +/* + * The MX51 3stack board seems to have a hardware "peculiarity" confirmed under + * U-Boot, RedBoot and Linux: the ethernet Rx signal is reaching the CS8900A + * controller inverted. The controller is capable of detecting and correcting + * this, but it needs 4 network packets for that. Which means, at startup, you + * will not receive answers to the first 4 packest, unless there have been some + * broadcasts on the network, or your board is on a hub. Reducing the ARP + * timeout from default 5 seconds to 200ms we speed up the initial TFTP + * transfer, should the user wish one, significantly. + */ +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "BBG U-Boot > " +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ + +#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10000 + +#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ + +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_CMDLINE_EDITING 1 + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (30 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_BASE_ADDR +/* TO1 boards */ +/* #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) */ +#define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#define iomem_valid_addr(addr, size) \ + (addr >= PHYS_SDRAM_1 && addr <= (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)) + +/*----------------------------------------------------------------------- + * FLASH and environment organization + */ +#define CONFIG_SYS_NO_FLASH + +/* Monitor at beginning of flash */ +/* #define CONFIG_FSL_ENV_IN_SF +*/ +/* #define CONFIG_FSL_ENV_IN_MMC */ + +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_IS_NOWHERE + +/* + * JFFS2 partitions + */ +/* +#undef CONFIG_JFFS2_CMDLINE +#define CONFIG_JFFS2_DEV "nand0" +*/ +#endif /* __CONFIG_H */ diff --git a/include/configs/mx51_bbg_mfg.h b/include/configs/mx51_bbg_mfg.h index becad73..baca67b 100644 --- a/include/configs/mx51_bbg_mfg.h +++ b/include/configs/mx51_bbg_mfg.h @@ -68,8 +68,8 @@ /* * Hardware drivers */ -#define CONFIG_MX51_UART 1 -#define CONFIG_MX51_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* * SPI Configs diff --git a/include/configs/mx53_arm2.h b/include/configs/mx53_arm2.h index f94191d..9a976b8 100644 --- a/include/configs/mx53_arm2.h +++ b/include/configs/mx53_arm2.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX53_UART 1 -#define CONFIG_MX53_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx53_arm2_android.h b/include/configs/mx53_arm2_android.h index 3e02620..4eed270 100644 --- a/include/configs/mx53_arm2_android.h +++ b/include/configs/mx53_arm2_android.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX53_UART 1 -#define CONFIG_MX53_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* * Android support Configs diff --git a/include/configs/mx53_arm2_ddr3.h b/include/configs/mx53_arm2_ddr3.h index f4cd6ba..ea13cfd 100644 --- a/include/configs/mx53_arm2_ddr3.h +++ b/include/configs/mx53_arm2_ddr3.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX53_UART 1 -#define CONFIG_MX53_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx53_arm2_ddr3_android.h b/include/configs/mx53_arm2_ddr3_android.h index dc97ba2..6fd0dff 100644 --- a/include/configs/mx53_arm2_ddr3_android.h +++ b/include/configs/mx53_arm2_ddr3_android.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX53_UART 1 -#define CONFIG_MX53_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* * Android support Configs diff --git a/include/configs/mx53_evk.h b/include/configs/mx53_evk.h index 0b1e75e..da0ac7f 100644 --- a/include/configs/mx53_evk.h +++ b/include/configs/mx53_evk.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX53_UART 1 -#define CONFIG_MX53_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx53_evk_android.h b/include/configs/mx53_evk_android.h index d892d33..6b6ee17 100644 --- a/include/configs/mx53_evk_android.h +++ b/include/configs/mx53_evk_android.h @@ -69,8 +69,8 @@ /* * Hardware drivers */ -#define CONFIG_MX53_UART 1 -#define CONFIG_MX53_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR /* * Android support Configs |