From d5f739dc39bee8229c0ca253f9a1182d433dfc45 Mon Sep 17 00:00:00 2001 From: Terry Lv Date: Fri, 24 Aug 2012 13:37:23 +0800 Subject: ENGR00221332: U_BOOT: remove "boot" and "enable" from configs' name Remove "boot" and "enable" from some configs' name. Affacted configs: mx6q_sabreauto_boot_weimnor mx6q_sabreauto_mfg_enable_weimnor mx6solo_sabreauto_boot_weimnor mx6solo_sabreauto_mfg_enable_weimnor mx6q_sabreauto_mfg_enable_spi-nor mx6solo_sabreauto_mfg_enable_spi-nor mx6q_sabreauto_nand_boot Currently, various u-boot are built in nightlybuild, to make it easier, we naming u-boot binary name and config as ___. Then it is easier to be parsed, also easier to be maintained in nightlybuild and u-boot git. Signed-off-by: Terry Lv --- Makefile | 14 +- include/configs/mx6q_sabreauto_boot_weimnor.h | 369 --------------------- .../configs/mx6q_sabreauto_mfg_enable_spi-nor.h | 299 ----------------- .../configs/mx6q_sabreauto_mfg_enable_weimnor.h | 300 ----------------- include/configs/mx6q_sabreauto_nand.h | 271 +++++++++++++++ include/configs/mx6q_sabreauto_nand_boot.h | 271 --------------- include/configs/mx6q_sabreauto_spi-nor_mfg.h | 299 +++++++++++++++++ include/configs/mx6q_sabreauto_weimnor.h | 369 +++++++++++++++++++++ include/configs/mx6q_sabreauto_weimnor_mfg.h | 300 +++++++++++++++++ include/configs/mx6solo_sabreauto_boot_weimnor.h | 354 -------------------- .../configs/mx6solo_sabreauto_mfg_enable_spi-nor.h | 289 ---------------- .../configs/mx6solo_sabreauto_mfg_enable_weimnor.h | 289 ---------------- include/configs/mx6solo_sabreauto_spi-nor_mfg.h | 289 ++++++++++++++++ include/configs/mx6solo_sabreauto_weimnor.h | 354 ++++++++++++++++++++ include/configs/mx6solo_sabreauto_weimnor_mfg.h | 289 ++++++++++++++++ 15 files changed, 2178 insertions(+), 2178 deletions(-) delete mode 100644 include/configs/mx6q_sabreauto_boot_weimnor.h delete mode 100644 include/configs/mx6q_sabreauto_mfg_enable_spi-nor.h delete mode 100644 include/configs/mx6q_sabreauto_mfg_enable_weimnor.h create mode 100644 include/configs/mx6q_sabreauto_nand.h delete mode 100644 include/configs/mx6q_sabreauto_nand_boot.h create mode 100644 include/configs/mx6q_sabreauto_spi-nor_mfg.h create mode 100644 include/configs/mx6q_sabreauto_weimnor.h create mode 100644 include/configs/mx6q_sabreauto_weimnor_mfg.h delete mode 100644 include/configs/mx6solo_sabreauto_boot_weimnor.h delete mode 100644 include/configs/mx6solo_sabreauto_mfg_enable_spi-nor.h delete mode 100644 include/configs/mx6solo_sabreauto_mfg_enable_weimnor.h create mode 100644 include/configs/mx6solo_sabreauto_spi-nor_mfg.h create mode 100644 include/configs/mx6solo_sabreauto_weimnor.h create mode 100644 include/configs/mx6solo_sabreauto_weimnor_mfg.h diff --git a/Makefile b/Makefile index 1f9e5fd..a6a4cd4 100644 --- a/Makefile +++ b/Makefile @@ -3340,16 +3340,16 @@ mx6q_sabrelite_android_config \ mx6q_sabrelite_mfg_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx6q_sabrelite freescale mx6 -mx6q_sabreauto_mfg_enable_weimnor_config \ -mx6q_sabreauto_boot_weimnor_config \ -mx6solo_sabreauto_mfg_enable_weimnor_config \ -mx6solo_sabreauto_boot_weimnor_config \ +mx6q_sabreauto_weimnor_mfg_config \ +mx6q_sabreauto_weimnor_config \ +mx6solo_sabreauto_weimnor_mfg_config \ +mx6solo_sabreauto_weimnor_config \ mx6solo_sabreauto_config \ mx6solo_sabreauto_mfg_config \ mx6q_sabreauto_mfg_config \ -mx6q_sabreauto_mfg_enable_spi-nor_config \ -mx6solo_sabreauto_mfg_enable_spi-nor_config \ -mx6q_sabreauto_nand_boot_config \ +mx6q_sabreauto_spi-nor_mfg_config \ +mx6solo_sabreauto_spi-nor_mfg_config \ +mx6q_sabreauto_nand_config \ mx6q_sabreauto_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx6q_sabreauto freescale mx6 diff --git a/include/configs/mx6q_sabreauto_boot_weimnor.h b/include/configs/mx6q_sabreauto_boot_weimnor.h deleted file mode 100644 index 8f14369..0000000 --- a/include/configs/mx6q_sabreauto_boot_weimnor.h +++ /dev/null @@ -1,369 +0,0 @@ -/* - * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Q SABRE-AI 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 - - /* High Level Configuration Options */ -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6Q -#define CONFIG_MX6Q_SABREAUTO -#define CONFIG_FLASH_HEADER -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP -/* Must define. Otherwise emi_slow_clk would be dead */ -#define CONFIG_CMD_WEIMNOR -#define CONFIG_FLASH_HEADER_OFFSET 0x1000 - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_MMC -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#define CONFIG_CMD_SATA -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "uboot=u-boot.bin\0" \ - "kernel=uImage\0" \ - "nfsroot=/opt/eldk/arm\0" \ - "bootargs_base=setenv bootargs console=ttymxc3,115200"\ - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ - "bootcmd_net=run bootargs_base bootargs_nfs; " \ - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ - "bootargs_mmc=setenv bootargs ${bootargs} " \ - "root=/dev/mmcblk0p1 rootwait\0" \ - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ - "mmc dev 2; " \ - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ - "bootcmd=run bootcmd_nor\0" \ - "bootargs_nor=setenv bootargs ${bootargs} root=/dev/nfs "\ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ - "bootcmd_nor=run bootargs_base bootargs_nor; "\ - "cp.l 0x8080000 ${loadaddr} 0x400000; bootm\0" - - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 1 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_PHY_MICREL_KSZ9021 -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x30 -#endif - -/* - * SPI Configs - * SPI NOR AND WEIM NOR share PINs, so cannot be enabled both at sametime - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * MMC Configs - */ -#ifdef CONFIG_CMD_MMC - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_IMX_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 4 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 - #define CONFIG_SYS_MMC_ENV_DEV 2 - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - - /* detect whether SD1, 2, 3, or 4 is boot device */ - #define CONFIG_DYNAMIC_MMC_DEVNO - - /* SD3 and SD4 are 8 bit */ - #define CONFIG_MMC_8BIT_PORTS 0xC - /* Setup target delay in DDR mode for each SD port */ - #define CONFIG_GET_DDR_TARGET_DELAY -#endif - -/* - * SATA Configs - */ -#ifdef CONFIG_CMD_SATA - #define CONFIG_DWC_AHSATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 - #define CONFIG_DWC_AHSATA_PORT_ID 0 - #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR - #define CONFIG_LBA48 - #define CONFIG_LIBATA - - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_FLASH_BASE CS0_BASE_ADDR -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning*/ -#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */ - -#define CONFIG_ENV_SECT_SIZE 0x00020000 /*128KiB sector size */ -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE - -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE - -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x0040000) - -/*----------------------------------------------------------------------- -* CFI FLASH driver setup -*/ -#define CONFIG_SYS_FLASH_CFI 1/* Flash memory is CFI compliant */ -#define CONFIG_FLASH_CFI_DRIVER 1/* Use drivers/cfi_flash.c */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1/* Use buffered writes*/ -#define CONFIG_SYS_FLASH_PROTECTION 1/* Use hardware sector protection */ - -/* Monitor at beginning of flash */ -/* #define CONFIG_FSL_ENV_IN_MMC*/ -/* #define CONFIG_FSL_ENV_IN_NAND */ -/* #define CONFIG_FSL_ENV_IN_SATA */ -#define CONFIG_FSL_ENV_IN_FLASH - -#if defined(CONFIG_FSL_ENV_IN_NAND) - #define CONFIG_ENV_IS_IN_NAND 1 - #define CONFIG_ENV_OFFSET 0x100000 -#elif defined(CONFIG_FSL_ENV_IN_MMC) - #define CONFIG_ENV_IS_IN_MMC 1 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_SATA) - #define CONFIG_ENV_IS_IN_SATA 1 - #define CONFIG_SATA_ENV_DEV 0 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_SF) - #define CONFIG_ENV_IS_IN_SPI_FLASH 1 - #define CONFIG_ENV_SPI_CS 1 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_FLASH) - #define CONFIG_ENV_IS_IN_FLASH 1 -#else - #define CONFIG_ENV_IS_NOWHERE 1 -#endif - -#ifdef CONFIG_SPLASH_SCREEN - /* - * Framebuffer and LCD - */ - #define CONFIG_LCD - #define CONFIG_IPU_V3H - #define CONFIG_VIDEO_MX5 - #define CONFIG_IPU_CLKRATE 260000000 - #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE - #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE - #define CONFIG_SYS_CONSOLE_IS_IN_ENV - #define LCD_BPP LCD_COLOR16 - #define CONFIG_CMD_BMP - #define CONFIG_BMP_8BPP - #define CONFIG_FB_BASE (TEXT_BASE + 0x300000) - #define CONFIG_SPLASH_SCREEN_ALIGN - #define CONFIG_SYS_WHITE_ON_BLACK -#endif -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_mfg_enable_spi-nor.h b/include/configs/mx6q_sabreauto_mfg_enable_spi-nor.h deleted file mode 100644 index 82b0857..0000000 --- a/include/configs/mx6q_sabreauto_mfg_enable_spi-nor.h +++ /dev/null @@ -1,299 +0,0 @@ -/* - * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Q Armadillo2 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 - - /* High Level Configuration Options */ -#define CONFIG_MFG -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6Q -#define CONFIG_MX6Q_SABREAUTO -#define CONFIG_FLASH_HEADER -#define CONFIG_FLASH_HEADER_OFFSET 0x400 -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_SPI -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_SF -#define CONFIG_CMD_MMC -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#define CONFIG_CMD_SATA -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 0 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ -#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) - -#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc spi-nor" -#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "uboot=u-boot.bin\0" \ - "kernel=uImage\0" \ - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO MFG 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 1 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_PHY_MICREL_KSZ9021 -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x1f -#endif - -/* - * SPI Configs - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * MMC Configs - */ -#ifdef CONFIG_CMD_MMC - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_IMX_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 4 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 - #define CONFIG_SYS_MMC_ENV_DEV 2 - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - - /* detect whether SD1, 2, 3, or 4 is boot device */ - #define CONFIG_DYNAMIC_MMC_DEVNO - - /* SD3 and SD4 are 8 bit */ - #define CONFIG_MMC_8BIT_PORTS 0xC - /* Setup target delay in DDR mode for each SD port */ - #define CONFIG_GET_DDR_TARGET_DELAY -#endif - -/* - * SATA Configs - */ -#ifdef CONFIG_CMD_SATA - #define CONFIG_DWC_AHSATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 - #define CONFIG_DWC_AHSATA_PORT_ID 0 - #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR - #define CONFIG_LBA48 - #define CONFIG_LIBATA - - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_MMC */ -/* #define CONFIG_FSL_ENV_IN_SATA */ -/* #define CONFIG_FSL_ENV_IN_SF */ - -#define CONFIG_ENV_SECT_SIZE (128 * 1024) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_NOWHERE 1 - -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_mfg_enable_weimnor.h b/include/configs/mx6q_sabreauto_mfg_enable_weimnor.h deleted file mode 100644 index 33690e5..0000000 --- a/include/configs/mx6q_sabreauto_mfg_enable_weimnor.h +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Q Armadillo2 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 - - /* High Level Configuration Options */ -#define CONFIG_MFG -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6Q -#define CONFIG_MX6Q_SABREAUTO -#define CONFIG_FLASH_HEADER -#define CONFIG_FLASH_HEADER_OFFSET 0x400 -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_SPI -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_SF -#define CONFIG_CMD_MMC -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#define CONFIG_CMD_SATA -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 0 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ -#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) - -#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc " \ - "weim-nor" -#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "uboot=u-boot.bin\0" \ - "kernel=uImage\0" \ - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO MFG 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 1 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_PHY_MICREL_KSZ9021 -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x1f -#endif - -/* - * SPI Configs - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * MMC Configs - */ -#ifdef CONFIG_CMD_MMC - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_IMX_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 4 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 - #define CONFIG_SYS_MMC_ENV_DEV 2 - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - - /* detect whether SD1, 2, 3, or 4 is boot device */ - #define CONFIG_DYNAMIC_MMC_DEVNO - - /* SD3 and SD4 are 8 bit */ - #define CONFIG_MMC_8BIT_PORTS 0xC - /* Setup target delay in DDR mode for each SD port */ - #define CONFIG_GET_DDR_TARGET_DELAY -#endif - -/* - * SATA Configs - */ -#ifdef CONFIG_CMD_SATA - #define CONFIG_DWC_AHSATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 - #define CONFIG_DWC_AHSATA_PORT_ID 0 - #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR - #define CONFIG_LBA48 - #define CONFIG_LIBATA - - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_MMC */ -/* #define CONFIG_FSL_ENV_IN_SATA */ -/* #define CONFIG_FSL_ENV_IN_SF */ - -#define CONFIG_ENV_SECT_SIZE (128 * 1024) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_NOWHERE 1 - -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_nand.h b/include/configs/mx6q_sabreauto_nand.h new file mode 100644 index 0000000..ea85f2f --- /dev/null +++ b/include/configs/mx6q_sabreauto_nand.h @@ -0,0 +1,271 @@ +/* + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Q Armadillo2 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 + + /* High Level Configuration Options */ +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6Q +#define CONFIG_MX6Q_ARM2 +#define CONFIG_FLASH_HEADER +#define CONFIG_FLASH_HEADER_OFFSET 0x400 +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_CLKO_SET + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 3 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ +#define CONFIG_RD_LOADADDR 0x11000000 + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "bootargs=noinitrd console=ttymxc3,115200n8 " \ + "ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rootwait rw "\ + "mtdparts=gpmi-nand:20m(boot),20m(kernel),-(rootfs)\0"\ + "bootcmd=nand read ${loadaddr} 0x1400000 0x400000;bootm\0" + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6Q ARD 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 0 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x1f +#endif + +/* + * SPI Configs + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ +#define CONFIG_CMD_NAND + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_NAND + +#define CONFIG_ENV_SECT_SIZE (8 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE + +#if defined(CONFIG_FSL_ENV_IN_NAND) + #define CONFIG_ENV_IS_IN_NAND 1 + #define CONFIG_ENV_OFFSET 0x100000 +#elif defined(CONFIG_FSL_ENV_IN_MMC) + #define CONFIG_ENV_IS_IN_MMC 1 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_SATA) + #define CONFIG_ENV_IS_IN_SATA 1 + #define CONFIG_SATA_ENV_DEV 0 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_SF) + #define CONFIG_ENV_IS_IN_SPI_FLASH 1 + #define CONFIG_ENV_SPI_CS 1 + #define CONFIG_ENV_OFFSET (768 * 1024) +#else + #define CONFIG_ENV_IS_NOWHERE 1 +#endif + +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_nand_boot.h b/include/configs/mx6q_sabreauto_nand_boot.h deleted file mode 100644 index ea85f2f..0000000 --- a/include/configs/mx6q_sabreauto_nand_boot.h +++ /dev/null @@ -1,271 +0,0 @@ -/* - * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Q Armadillo2 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 - - /* High Level Configuration Options */ -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6Q -#define CONFIG_MX6Q_ARM2 -#define CONFIG_FLASH_HEADER -#define CONFIG_FLASH_HEADER_OFFSET 0x400 -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_CLKO_SET - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ -#define CONFIG_RD_LOADADDR 0x11000000 - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "bootargs=noinitrd console=ttymxc3,115200n8 " \ - "ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rootwait rw "\ - "mtdparts=gpmi-nand:20m(boot),20m(kernel),-(rootfs)\0"\ - "bootcmd=nand read ${loadaddr} 0x1400000 0x400000;bootm\0" - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6Q ARD 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 0 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x1f -#endif - -/* - * SPI Configs - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ -#define CONFIG_CMD_NAND - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_NAND - -#define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE - -#if defined(CONFIG_FSL_ENV_IN_NAND) - #define CONFIG_ENV_IS_IN_NAND 1 - #define CONFIG_ENV_OFFSET 0x100000 -#elif defined(CONFIG_FSL_ENV_IN_MMC) - #define CONFIG_ENV_IS_IN_MMC 1 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_SATA) - #define CONFIG_ENV_IS_IN_SATA 1 - #define CONFIG_SATA_ENV_DEV 0 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_SF) - #define CONFIG_ENV_IS_IN_SPI_FLASH 1 - #define CONFIG_ENV_SPI_CS 1 - #define CONFIG_ENV_OFFSET (768 * 1024) -#else - #define CONFIG_ENV_IS_NOWHERE 1 -#endif - -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_spi-nor_mfg.h b/include/configs/mx6q_sabreauto_spi-nor_mfg.h new file mode 100644 index 0000000..82b0857 --- /dev/null +++ b/include/configs/mx6q_sabreauto_spi-nor_mfg.h @@ -0,0 +1,299 @@ +/* + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Q Armadillo2 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 + + /* High Level Configuration Options */ +#define CONFIG_MFG +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6Q +#define CONFIG_MX6Q_SABREAUTO +#define CONFIG_FLASH_HEADER +#define CONFIG_FLASH_HEADER_OFFSET 0x400 +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_SPI +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_SF +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#define CONFIG_CMD_SATA +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 0 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ +#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) + +#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc spi-nor" +#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO MFG 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 1 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_PHY_MICREL_KSZ9021 +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x1f +#endif + +/* + * SPI Configs + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_USDHC_NUM 4 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 2 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether SD1, 2, 3, or 4 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + /* SD3 and SD4 are 8 bit */ + #define CONFIG_MMC_8BIT_PORTS 0xC + /* Setup target delay in DDR mode for each SD port */ + #define CONFIG_GET_DDR_TARGET_DELAY +#endif + +/* + * SATA Configs + */ +#ifdef CONFIG_CMD_SATA + #define CONFIG_DWC_AHSATA + #define CONFIG_SYS_SATA_MAX_DEVICE 1 + #define CONFIG_DWC_AHSATA_PORT_ID 0 + #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR + #define CONFIG_LBA48 + #define CONFIG_LIBATA + + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_MMC */ +/* #define CONFIG_FSL_ENV_IN_SATA */ +/* #define CONFIG_FSL_ENV_IN_SF */ + +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_IS_NOWHERE 1 + +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_weimnor.h b/include/configs/mx6q_sabreauto_weimnor.h new file mode 100644 index 0000000..8f14369 --- /dev/null +++ b/include/configs/mx6q_sabreauto_weimnor.h @@ -0,0 +1,369 @@ +/* + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Q SABRE-AI 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 + + /* High Level Configuration Options */ +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6Q +#define CONFIG_MX6Q_SABREAUTO +#define CONFIG_FLASH_HEADER +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP +/* Must define. Otherwise emi_slow_clk would be dead */ +#define CONFIG_CMD_WEIMNOR +#define CONFIG_FLASH_HEADER_OFFSET 0x1000 + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#define CONFIG_CMD_SATA +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 3 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + "nfsroot=/opt/eldk/arm\0" \ + "bootargs_base=setenv bootargs console=ttymxc3,115200"\ + "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ + "bootcmd_net=run bootargs_base bootargs_nfs; " \ + "tftpboot ${loadaddr} ${kernel}; bootm\0" \ + "bootargs_mmc=setenv bootargs ${bootargs} " \ + "root=/dev/mmcblk0p1 rootwait\0" \ + "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ + "mmc dev 2; " \ + "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ + "bootcmd=run bootcmd_nor\0" \ + "bootargs_nor=setenv bootargs ${bootargs} root=/dev/nfs "\ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ + "bootcmd_nor=run bootargs_base bootargs_nor; "\ + "cp.l 0x8080000 ${loadaddr} 0x400000; bootm\0" + + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 1 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_PHY_MICREL_KSZ9021 +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x30 +#endif + +/* + * SPI Configs + * SPI NOR AND WEIM NOR share PINs, so cannot be enabled both at sametime + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_USDHC_NUM 4 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 2 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether SD1, 2, 3, or 4 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + /* SD3 and SD4 are 8 bit */ + #define CONFIG_MMC_8BIT_PORTS 0xC + /* Setup target delay in DDR mode for each SD port */ + #define CONFIG_GET_DDR_TARGET_DELAY +#endif + +/* + * SATA Configs + */ +#ifdef CONFIG_CMD_SATA + #define CONFIG_DWC_AHSATA + #define CONFIG_SYS_SATA_MAX_DEVICE 1 + #define CONFIG_DWC_AHSATA_PORT_ID 0 + #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR + #define CONFIG_LBA48 + #define CONFIG_LIBATA + + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_FLASH_BASE CS0_BASE_ADDR +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ +#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning*/ +#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */ + +#define CONFIG_ENV_SECT_SIZE 0x00020000 /*128KiB sector size */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE + +/* Address and size of Redundant Environment Sector */ +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE + +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x0040000) + +/*----------------------------------------------------------------------- +* CFI FLASH driver setup +*/ +#define CONFIG_SYS_FLASH_CFI 1/* Flash memory is CFI compliant */ +#define CONFIG_FLASH_CFI_DRIVER 1/* Use drivers/cfi_flash.c */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1/* Use buffered writes*/ +#define CONFIG_SYS_FLASH_PROTECTION 1/* Use hardware sector protection */ + +/* Monitor at beginning of flash */ +/* #define CONFIG_FSL_ENV_IN_MMC*/ +/* #define CONFIG_FSL_ENV_IN_NAND */ +/* #define CONFIG_FSL_ENV_IN_SATA */ +#define CONFIG_FSL_ENV_IN_FLASH + +#if defined(CONFIG_FSL_ENV_IN_NAND) + #define CONFIG_ENV_IS_IN_NAND 1 + #define CONFIG_ENV_OFFSET 0x100000 +#elif defined(CONFIG_FSL_ENV_IN_MMC) + #define CONFIG_ENV_IS_IN_MMC 1 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_SATA) + #define CONFIG_ENV_IS_IN_SATA 1 + #define CONFIG_SATA_ENV_DEV 0 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_SF) + #define CONFIG_ENV_IS_IN_SPI_FLASH 1 + #define CONFIG_ENV_SPI_CS 1 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_FLASH) + #define CONFIG_ENV_IS_IN_FLASH 1 +#else + #define CONFIG_ENV_IS_NOWHERE 1 +#endif + +#ifdef CONFIG_SPLASH_SCREEN + /* + * Framebuffer and LCD + */ + #define CONFIG_LCD + #define CONFIG_IPU_V3H + #define CONFIG_VIDEO_MX5 + #define CONFIG_IPU_CLKRATE 260000000 + #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE + #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE + #define CONFIG_SYS_CONSOLE_IS_IN_ENV + #define LCD_BPP LCD_COLOR16 + #define CONFIG_CMD_BMP + #define CONFIG_BMP_8BPP + #define CONFIG_FB_BASE (TEXT_BASE + 0x300000) + #define CONFIG_SPLASH_SCREEN_ALIGN + #define CONFIG_SYS_WHITE_ON_BLACK +#endif +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6q_sabreauto_weimnor_mfg.h b/include/configs/mx6q_sabreauto_weimnor_mfg.h new file mode 100644 index 0000000..33690e5 --- /dev/null +++ b/include/configs/mx6q_sabreauto_weimnor_mfg.h @@ -0,0 +1,300 @@ +/* + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Q Armadillo2 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 + + /* High Level Configuration Options */ +#define CONFIG_MFG +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6Q +#define CONFIG_MX6Q_SABREAUTO +#define CONFIG_FLASH_HEADER +#define CONFIG_FLASH_HEADER_OFFSET 0x400 +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_SPI +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_SF +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#define CONFIG_CMD_SATA +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 0 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ +#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) + +#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc " \ + "weim-nor" +#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO MFG 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 1 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_PHY_MICREL_KSZ9021 +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x1f +#endif + +/* + * SPI Configs + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_USDHC_NUM 4 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 2 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether SD1, 2, 3, or 4 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + /* SD3 and SD4 are 8 bit */ + #define CONFIG_MMC_8BIT_PORTS 0xC + /* Setup target delay in DDR mode for each SD port */ + #define CONFIG_GET_DDR_TARGET_DELAY +#endif + +/* + * SATA Configs + */ +#ifdef CONFIG_CMD_SATA + #define CONFIG_DWC_AHSATA + #define CONFIG_SYS_SATA_MAX_DEVICE 1 + #define CONFIG_DWC_AHSATA_PORT_ID 0 + #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR + #define CONFIG_LBA48 + #define CONFIG_LIBATA + + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 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_MMC */ +/* #define CONFIG_FSL_ENV_IN_SATA */ +/* #define CONFIG_FSL_ENV_IN_SF */ + +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_IS_NOWHERE 1 + +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6solo_sabreauto_boot_weimnor.h b/include/configs/mx6solo_sabreauto_boot_weimnor.h deleted file mode 100644 index 1ebed71..0000000 --- a/include/configs/mx6solo_sabreauto_boot_weimnor.h +++ /dev/null @@ -1,354 +0,0 @@ -/* - * Copyright (C) 2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Solo SABRE-AI 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 - - /* High Level Configuration Options */ -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6DL -#define CONFIG_MX6SOLO_DDR3 -#define CONFIG_DDR_32BIT -#define CONFIG_MX6Q_SABREAUTO -#define CONFIG_FLASH_HEADER -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP -/* Must define. Otherwise emi_slow_clk would be dead */ -#define CONFIG_CMD_WEIMNOR -#define CONFIG_FLASH_HEADER_OFFSET 0x1000 - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_MMC -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 3 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "uboot=u-boot.bin\0" \ - "kernel=uImage\0" \ - "nfsroot=/opt/eldk/arm\0" \ - "bootargs_base=setenv bootargs console=ttymxc3,115200 "\ - "nosmp arm_freq=800\0" \ - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ - "bootcmd_net=run bootargs_base bootargs_nfs; " \ - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ - "bootargs_mmc=setenv bootargs ${bootargs} " \ - "root=/dev/mmcblk0p1 rootwait\0" \ - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ - "mmc dev 2; " \ - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ - "bootcmd=run bootcmd_nor\0" \ - "bootargs_nor=setenv bootargs ${bootargs} root=/dev/nfs "\ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ - "bootcmd_nor=run bootargs_base bootargs_nor; "\ - "cp.l 0x8080000 ${loadaddr} 0x400000; bootm\0" - - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6SOLO SABREAUTO 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 1 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x30 -#endif - -/* - * SPI Configs - * SPI NOR AND WEIM NOR share PINs, so cannot be enabled both at sametime - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * MMC Configs - */ -#ifdef CONFIG_CMD_MMC - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_IMX_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 4 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 - #define CONFIG_SYS_MMC_ENV_DEV 2 - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - - /* detect whether SD1, 2, 3, or 4 is boot device */ - #define CONFIG_DYNAMIC_MMC_DEVNO - - /* SD3 and SD4 are 8 bit */ - #define CONFIG_MMC_8BIT_PORTS 0xC - /* Setup target delay in DDR mode for each SD port */ - #define CONFIG_GET_DDR_TARGET_DELAY -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#ifdef CONFIG_DDR_32BIT -#define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) -#else -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 1024 * 1024) -#endif -#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_FLASH_BASE CS0_BASE_ADDR -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning*/ -#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */ - -#define CONFIG_ENV_SECT_SIZE 0x00020000 /*128KiB sector size */ -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE - -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE - -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x0040000) - -/*----------------------------------------------------------------------- -* CFI FLASH driver setup -*/ -#define CONFIG_SYS_FLASH_CFI 1/* Flash memory is CFI compliant */ -#define CONFIG_FLASH_CFI_DRIVER 1/* Use drivers/cfi_flash.c */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1/* Use buffered writes*/ -#define CONFIG_SYS_FLASH_PROTECTION 1/* Use hardware sector protection */ - -/* Monitor at beginning of flash */ -/* #define CONFIG_FSL_ENV_IN_MMC*/ -/* #define CONFIG_FSL_ENV_IN_NAND */ - -#define CONFIG_FSL_ENV_IN_FLASH - -#if defined(CONFIG_FSL_ENV_IN_NAND) - #define CONFIG_ENV_IS_IN_NAND 1 - #define CONFIG_ENV_OFFSET 0x100000 -#elif defined(CONFIG_FSL_ENV_IN_MMC) - #define CONFIG_ENV_IS_IN_MMC 1 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_SF) - #define CONFIG_ENV_IS_IN_SPI_FLASH 1 - #define CONFIG_ENV_SPI_CS 1 - #define CONFIG_ENV_OFFSET (768 * 1024) -#elif defined(CONFIG_FSL_ENV_IN_FLASH) - #define CONFIG_ENV_IS_IN_FLASH 1 -#else - #define CONFIG_ENV_IS_NOWHERE 1 -#endif - -#ifdef CONFIG_SPLASH_SCREEN - /* - * Framebuffer and LCD - */ - #define CONFIG_LCD - #define CONFIG_IPU_V3H - #define CONFIG_VIDEO_MX5 - #define CONFIG_IPU_CLKRATE 260000000 - #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE - #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE - #define CONFIG_SYS_CONSOLE_IS_IN_ENV - #define LCD_BPP LCD_COLOR16 - #define CONFIG_CMD_BMP - #define CONFIG_BMP_8BPP - #define CONFIG_FB_BASE (TEXT_BASE + 0x300000) - #define CONFIG_SPLASH_SCREEN_ALIGN - #define CONFIG_SYS_WHITE_ON_BLACK -#endif -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6solo_sabreauto_mfg_enable_spi-nor.h b/include/configs/mx6solo_sabreauto_mfg_enable_spi-nor.h deleted file mode 100644 index 5f53485..0000000 --- a/include/configs/mx6solo_sabreauto_mfg_enable_spi-nor.h +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (C) 2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Solo SABRE-AI 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 - - /* High Level Configuration Options */ -#define CONFIG_MFG -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6DL -#define CONFIG_MX6SOLO_DDR3 -#define CONFIG_DDR_32BIT -#define CONFIG_MX6Q_SABREAUTO -#define CONFIG_FLASH_HEADER -#define CONFIG_FLASH_HEADER_OFFSET 0x400 -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_SPI -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_SF -#define CONFIG_CMD_MMC -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 0 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ -#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) - -#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\ - "nosmp arm_freq=800 spi-nor" -#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "uboot=u-boot.bin\0" \ - "kernel=uImage\0" \ - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6SOLO SABREAUTO MFG 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 1 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_PHY_MICREL_KSZ9021 -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x30 -#endif - -/* - * SPI Configs - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * MMC Configs - */ -#ifdef CONFIG_CMD_MMC - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_IMX_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 4 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 - #define CONFIG_SYS_MMC_ENV_DEV 2 - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - - /* detect whether SD1, 2, 3, or 4 is boot device */ - #define CONFIG_DYNAMIC_MMC_DEVNO - - /* SD3 and SD4 are 8 bit */ - #define CONFIG_MMC_8BIT_PORTS 0xC - /* Setup target delay in DDR mode for each SD port */ - #define CONFIG_GET_DDR_TARGET_DELAY -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#ifdef CONFIG_DDR_32BIT -#define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) -#else -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 1024 * 1024) -#endif -#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_MMC */ -/* #define CONFIG_FSL_ENV_IN_SATA */ -/* #define CONFIG_FSL_ENV_IN_SF */ - -#define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_NOWHERE 1 - -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6solo_sabreauto_mfg_enable_weimnor.h b/include/configs/mx6solo_sabreauto_mfg_enable_weimnor.h deleted file mode 100644 index 5fe8788..0000000 --- a/include/configs/mx6solo_sabreauto_mfg_enable_weimnor.h +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (C) 2012 Freescale Semiconductor, Inc. - * - * Configuration settings for the MX6Solo SABRE-AI 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 - - /* High Level Configuration Options */ -#define CONFIG_MFG -#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ -#define CONFIG_MXC -#define CONFIG_MX6DL -#define CONFIG_MX6SOLO_DDR3 -#define CONFIG_DDR_32BIT -#define CONFIG_MX6Q_SABREAUTO -#define CONFIG_FLASH_HEADER -#define CONFIG_FLASH_HEADER_OFFSET 0x400 -#define CONFIG_MX6_CLK32 32768 - -#define CONFIG_SKIP_RELOCATE_UBOOT - -#define CONFIG_ARCH_CPU_INIT -#undef CONFIG_ARCH_MMU /* disable MMU first */ -#define CONFIG_L2_OFF /* disable L2 cache first*/ - -#define CONFIG_MX6_HCLK_FREQ 24000000 - -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SYS_64BIT_VSPRINTF - -#define BOARD_LATE_INIT - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 - -/* - * Hardware drivers - */ -#define CONFIG_MXC_UART -#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR - -/* 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 - ***********************************************************/ - -#include - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET -#define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_NET_MULTI 1 -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS - -#define CONFIG_CMD_SPI -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IMXOTP - -/* Enable below configure when supporting nand */ -#define CONFIG_CMD_SF -#define CONFIG_CMD_MMC -#define CONFIG_CMD_ENV -#define CONFIG_CMD_REGUL - -#define CONFIG_CMD_CLOCK -#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ - -#undef CONFIG_CMD_IMLS - -#define CONFIG_CMD_IMX_DOWNLOAD_MODE - -#define CONFIG_BOOTDELAY 0 - -#define CONFIG_PRIME "FEC0" - -#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ -#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) - -#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\ - "nosmp arm_freq=800 weim-nor" -#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "uboot=u-boot.bin\0" \ - "kernel=uImage\0" \ - -#define CONFIG_ARP_TIMEOUT 200UL - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX6SOLO SABREAUTO MFG 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 0x10000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x10010000 - -#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 - -#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_MIIBASE -1 -#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#define CONFIG_MXC_FEC -#define CONFIG_FEC0_PHY_ADDR 1 -#define CONFIG_ETH_PRIME -#define CONFIG_RMII -#define CONFIG_PHY_MICREL_KSZ9021 -#define CONFIG_CMD_MII -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_IPADDR 192.168.1.103 -#define CONFIG_SERVERIP 192.168.1.101 -#define CONFIG_NETMASK 255.255.255.0 - -/* - * OCOTP Configs - */ -#ifdef CONFIG_CMD_IMXOTP - #define CONFIG_IMX_OTP - #define IMX_OTP_BASE OCOTP_BASE_ADDR - #define IMX_OTP_ADDR_MAX 0x7F - #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA -#endif - -/* - * I2C Configs - */ -#ifdef CONFIG_CMD_I2C - #define CONFIG_HARD_I2C 1 - #define CONFIG_I2C_MXC 1 - #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR - #define CONFIG_SYS_I2C_SPEED 100000 - #define CONFIG_SYS_I2C_SLAVE 0x30 -#endif - -/* - * SPI Configs - */ -#ifdef CONFIG_CMD_SF - #define CONFIG_FSL_SF 1 - #define CONFIG_SPI_FLASH_IMX_M25PXX 1 - #define CONFIG_SPI_FLASH_CS 1 - #define CONFIG_IMX_ECSPI - #define IMX_CSPI_VER_2_3 1 - #define MAX_SPI_BYTES (64 * 4) -#endif - -/* Regulator Configs */ -#ifdef CONFIG_CMD_REGUL - #define CONFIG_ANATOP_REGULATOR - #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" - #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" -#endif - -/* - * MMC Configs - */ -#ifdef CONFIG_CMD_MMC - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_IMX_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 4 - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 - #define CONFIG_SYS_MMC_ENV_DEV 2 - #define CONFIG_DOS_PARTITION 1 - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - - /* detect whether SD1, 2, 3, or 4 is boot device */ - #define CONFIG_DYNAMIC_MMC_DEVNO - - /* SD3 and SD4 are 8 bit */ - #define CONFIG_MMC_8BIT_PORTS 0xC - /* Setup target delay in DDR mode for each SD port */ - #define CONFIG_GET_DDR_TARGET_DELAY -#endif - -/* - * GPMI Nand Configs - */ -/* #define CONFIG_CMD_NAND */ - -#ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_GPMI - #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK - #define CONFIG_GPMI_NFC_V2 - - #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR - #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR - - #define NAND_MAX_CHIPS 8 - #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 - - /* NAND is the unique module invoke APBH-DMA */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_V2 - #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR -#endif - -/*----------------------------------------------------------------------- - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR -#ifdef CONFIG_DDR_32BIT -#define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) -#else -#define PHYS_SDRAM_1_SIZE (2u * 1024 * 1024 * 1024) -#endif -#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_MMC */ -/* #define CONFIG_FSL_ENV_IN_SATA */ -/* #define CONFIG_FSL_ENV_IN_SF */ - -#define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_NOWHERE 1 - -#endif /* __CONFIG_H */ diff --git a/include/configs/mx6solo_sabreauto_spi-nor_mfg.h b/include/configs/mx6solo_sabreauto_spi-nor_mfg.h new file mode 100644 index 0000000..5f53485 --- /dev/null +++ b/include/configs/mx6solo_sabreauto_spi-nor_mfg.h @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Solo SABRE-AI 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 + + /* High Level Configuration Options */ +#define CONFIG_MFG +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6DL +#define CONFIG_MX6SOLO_DDR3 +#define CONFIG_DDR_32BIT +#define CONFIG_MX6Q_SABREAUTO +#define CONFIG_FLASH_HEADER +#define CONFIG_FLASH_HEADER_OFFSET 0x400 +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_SPI +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_SF +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 0 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ +#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) + +#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\ + "nosmp arm_freq=800 spi-nor" +#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6SOLO SABREAUTO MFG 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 1 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_PHY_MICREL_KSZ9021 +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x30 +#endif + +/* + * SPI Configs + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_USDHC_NUM 4 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 2 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether SD1, 2, 3, or 4 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + /* SD3 and SD4 are 8 bit */ + #define CONFIG_MMC_8BIT_PORTS 0xC + /* Setup target delay in DDR mode for each SD port */ + #define CONFIG_GET_DDR_TARGET_DELAY +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#ifdef CONFIG_DDR_32BIT +#define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) +#else +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 1024 * 1024) +#endif +#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_MMC */ +/* #define CONFIG_FSL_ENV_IN_SATA */ +/* #define CONFIG_FSL_ENV_IN_SF */ + +#define CONFIG_ENV_SECT_SIZE (8 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_IS_NOWHERE 1 + +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6solo_sabreauto_weimnor.h b/include/configs/mx6solo_sabreauto_weimnor.h new file mode 100644 index 0000000..1ebed71 --- /dev/null +++ b/include/configs/mx6solo_sabreauto_weimnor.h @@ -0,0 +1,354 @@ +/* + * Copyright (C) 2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Solo SABRE-AI 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 + + /* High Level Configuration Options */ +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6DL +#define CONFIG_MX6SOLO_DDR3 +#define CONFIG_DDR_32BIT +#define CONFIG_MX6Q_SABREAUTO +#define CONFIG_FLASH_HEADER +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP +/* Must define. Otherwise emi_slow_clk would be dead */ +#define CONFIG_CMD_WEIMNOR +#define CONFIG_FLASH_HEADER_OFFSET 0x1000 + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 3 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + "nfsroot=/opt/eldk/arm\0" \ + "bootargs_base=setenv bootargs console=ttymxc3,115200 "\ + "nosmp arm_freq=800\0" \ + "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ + "bootcmd_net=run bootargs_base bootargs_nfs; " \ + "tftpboot ${loadaddr} ${kernel}; bootm\0" \ + "bootargs_mmc=setenv bootargs ${bootargs} " \ + "root=/dev/mmcblk0p1 rootwait\0" \ + "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ + "mmc dev 2; " \ + "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ + "bootcmd=run bootcmd_nor\0" \ + "bootargs_nor=setenv bootargs ${bootargs} root=/dev/nfs "\ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ + "bootcmd_nor=run bootargs_base bootargs_nor; "\ + "cp.l 0x8080000 ${loadaddr} 0x400000; bootm\0" + + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6SOLO SABREAUTO 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 1 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x30 +#endif + +/* + * SPI Configs + * SPI NOR AND WEIM NOR share PINs, so cannot be enabled both at sametime + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_USDHC_NUM 4 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 2 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether SD1, 2, 3, or 4 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + /* SD3 and SD4 are 8 bit */ + #define CONFIG_MMC_8BIT_PORTS 0xC + /* Setup target delay in DDR mode for each SD port */ + #define CONFIG_GET_DDR_TARGET_DELAY +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#ifdef CONFIG_DDR_32BIT +#define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) +#else +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 1024 * 1024) +#endif +#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_FLASH_BASE CS0_BASE_ADDR +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ +#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning*/ +#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */ + +#define CONFIG_ENV_SECT_SIZE 0x00020000 /*128KiB sector size */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE + +/* Address and size of Redundant Environment Sector */ +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE + +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x0040000) + +/*----------------------------------------------------------------------- +* CFI FLASH driver setup +*/ +#define CONFIG_SYS_FLASH_CFI 1/* Flash memory is CFI compliant */ +#define CONFIG_FLASH_CFI_DRIVER 1/* Use drivers/cfi_flash.c */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1/* Use buffered writes*/ +#define CONFIG_SYS_FLASH_PROTECTION 1/* Use hardware sector protection */ + +/* Monitor at beginning of flash */ +/* #define CONFIG_FSL_ENV_IN_MMC*/ +/* #define CONFIG_FSL_ENV_IN_NAND */ + +#define CONFIG_FSL_ENV_IN_FLASH + +#if defined(CONFIG_FSL_ENV_IN_NAND) + #define CONFIG_ENV_IS_IN_NAND 1 + #define CONFIG_ENV_OFFSET 0x100000 +#elif defined(CONFIG_FSL_ENV_IN_MMC) + #define CONFIG_ENV_IS_IN_MMC 1 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_SF) + #define CONFIG_ENV_IS_IN_SPI_FLASH 1 + #define CONFIG_ENV_SPI_CS 1 + #define CONFIG_ENV_OFFSET (768 * 1024) +#elif defined(CONFIG_FSL_ENV_IN_FLASH) + #define CONFIG_ENV_IS_IN_FLASH 1 +#else + #define CONFIG_ENV_IS_NOWHERE 1 +#endif + +#ifdef CONFIG_SPLASH_SCREEN + /* + * Framebuffer and LCD + */ + #define CONFIG_LCD + #define CONFIG_IPU_V3H + #define CONFIG_VIDEO_MX5 + #define CONFIG_IPU_CLKRATE 260000000 + #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE + #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE + #define CONFIG_SYS_CONSOLE_IS_IN_ENV + #define LCD_BPP LCD_COLOR16 + #define CONFIG_CMD_BMP + #define CONFIG_BMP_8BPP + #define CONFIG_FB_BASE (TEXT_BASE + 0x300000) + #define CONFIG_SPLASH_SCREEN_ALIGN + #define CONFIG_SYS_WHITE_ON_BLACK +#endif +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6solo_sabreauto_weimnor_mfg.h b/include/configs/mx6solo_sabreauto_weimnor_mfg.h new file mode 100644 index 0000000..5fe8788 --- /dev/null +++ b/include/configs/mx6solo_sabreauto_weimnor_mfg.h @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX6Solo SABRE-AI 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 + + /* High Level Configuration Options */ +#define CONFIG_MFG +#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */ +#define CONFIG_MXC +#define CONFIG_MX6DL +#define CONFIG_MX6SOLO_DDR3 +#define CONFIG_DDR_32BIT +#define CONFIG_MX6Q_SABREAUTO +#define CONFIG_FLASH_HEADER +#define CONFIG_FLASH_HEADER_OFFSET 0x400 +#define CONFIG_MX6_CLK32 32768 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_ARCH_MMU /* disable MMU first */ +#define CONFIG_L2_OFF /* disable L2 cache first*/ + +#define CONFIG_MX6_HCLK_FREQ 24000000 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART4_BASE_ADDR + +/* 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 + ***********************************************************/ + +#include + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_SPI +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMXOTP + +/* Enable below configure when supporting nand */ +#define CONFIG_CMD_SF +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGUL + +#define CONFIG_CMD_CLOCK +#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ + +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_IMX_DOWNLOAD_MODE + +#define CONFIG_BOOTDELAY 0 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ +#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) + +#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\ + "nosmp arm_freq=800 weim-nor" +#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX6SOLO SABREAUTO MFG 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 0x10000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10010000 + +#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 + +#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_MIIBASE -1 +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM +#define CONFIG_MXC_FEC +#define CONFIG_FEC0_PHY_ADDR 1 +#define CONFIG_ETH_PRIME +#define CONFIG_RMII +#define CONFIG_PHY_MICREL_KSZ9021 +#define CONFIG_CMD_MII +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING +#define CONFIG_IPADDR 192.168.1.103 +#define CONFIG_SERVERIP 192.168.1.101 +#define CONFIG_NETMASK 255.255.255.0 + +/* + * OCOTP Configs + */ +#ifdef CONFIG_CMD_IMXOTP + #define CONFIG_IMX_OTP + #define IMX_OTP_BASE OCOTP_BASE_ADDR + #define IMX_OTP_ADDR_MAX 0x7F + #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA +#endif + +/* + * I2C Configs + */ +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C3_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0x30 +#endif + +/* + * SPI Configs + */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_M25PXX 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_ECSPI + #define IMX_CSPI_VER_2_3 1 + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* Regulator Configs */ +#ifdef CONFIG_CMD_REGUL + #define CONFIG_ANATOP_REGULATOR + #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" + #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" +#endif + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_USDHC_NUM 4 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 2 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether SD1, 2, 3, or 4 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + /* SD3 and SD4 are 8 bit */ + #define CONFIG_MMC_8BIT_PORTS 0xC + /* Setup target delay in DDR mode for each SD port */ + #define CONFIG_GET_DDR_TARGET_DELAY +#endif + +/* + * GPMI Nand Configs + */ +/* #define CONFIG_CMD_NAND */ + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + + /* NAND is the unique module invoke APBH-DMA */ + #define CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR +#ifdef CONFIG_DDR_32BIT +#define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) +#else +#define PHYS_SDRAM_1_SIZE (2u * 1024 * 1024 * 1024) +#endif +#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_MMC */ +/* #define CONFIG_FSL_ENV_IN_SATA */ +/* #define CONFIG_FSL_ENV_IN_SF */ + +#define CONFIG_ENV_SECT_SIZE (8 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_IS_NOWHERE 1 + +#endif /* __CONFIG_H */ -- cgit v1.1