Thompson, Nick (GE EntSol, Intelligent Platforms) wrote:
> Add config, Makefile and common header changes to integrate DA8xx
> Support.
>
> Creates a new config target:
> make ... da8xx_omapl1_evm_config
>
> Tested build with Sourcery G++ Lite 2009q1-203 tool chain on an
> OMAP-L137 EVM board RevE with Rev1.1 DA830 silicon.
>
> Signed-off-by: Nick Thompson <nick.thomp...@gefanuc.com>
> ---
> Applies to u-boot-ti
>
> Makefile | 4 +
> include/common.h | 3 +
> include/configs/da8xx_evm.h | 241
> +++++++++++++++++++++++++++++++++++++++++++
Need to add target to MAKEALL
Need to add yourself to board maintainers
>
> diff --git a/Makefile b/Makefile
> index 449099a..26170db 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2936,6 +2936,10 @@ davinci_dm365evm_config : unconfig
> davinci_dm6467evm_config : unconfig
> @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci
>
> +xtract_da8xx = $(subst da8xx_omapl1,da8xx,$(subst _config,,$1))
What is the point of this ?
Can you just call the config directly ?
> +da8xx_omapl1_evm_config : unconfig
> + @$(MKCONFIG) $(call xtract_da8xx,$@) arm arm926ejs da8xx-evm da8xx da8xx
> +
Who is the board manufacturer?
The config name will likely have to change to be consistent with other
davini configs.
Sandeep,
Can you provide guidance here ?
> imx27lite_config: unconfig
> @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
>
> diff --git a/include/common.h b/include/common.h
> index f7c93bf..5c8d609 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -107,6 +107,9 @@ typedef volatile unsigned char vu_char;
> #ifdef CONFIG_BLACKFIN
> #include <asm/blackfin.h>
> #endif
> +#ifdef CONFIG_DA8XX
> +#include <asm/arch/hardware.h>
> +#endif
>
> #include <part.h>
> #include <flash.h>
> diff --git a/include/configs/da8xx_evm.h b/include/configs/da8xx_evm.h
> new file mode 100644
> index 0000000..8bdbb71
> --- /dev/null
> +++ b/include/configs/da8xx_evm.h
> @@ -0,0 +1,241 @@
> +/*
> + * Copyright (C) 2008 Texas Instruments, Inc <www.ti.com>
> + *
> + * Based on davinci_dvevm.h. Original Copyrights follow:
> + *
> + * Copyright (C) 2007 Sergey Kubushyn <k...@koi8.net>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef __CONFIG_H
> +#define __CONFIG_H
> +#include <asm/sizes.h>
> +#include <asm/arch/clock.h>
> +
> +/*=======*/
> +/* Board */
> +/*=======*/
Multiline comments
> +/* #define CONFIG_USE_SPIFLASH */
> +/* #define CONFIG_USE_NAND */
Why the commented out defines?
> +
> +/*===================*/
> +/* SoC Configuration */
> +/*===================*/
> +#define CONFIG_ARM926EJS /* arm926ejs CPU core */
> +#define CONFIG_DA8XX /* TI DA8xx SoC */
> +#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) /* Arm Clock */
> +#define CONFIG_SYS_OSCIN_FREQ 24000000
> +#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE /* use timer 0 */
> +#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) /* Timer
> Input clock freq */
> +#define CONFIG_SYS_HZ 1000
> +#undef CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is _always_ loaded by a
> bootloader */
> +#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
> +
> +/*=============*/
> +/* Memory Info */
> +/*=============*/
> +#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /*
> malloc() len */
> +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* reserved for initial data */
Trailing whitespace, fix globally
> +#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
> +#define PHYS_SDRAM_1_SIZE 0x04000000 /* SDRAM size 64MB */
> +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 /* memtest start
> address */
> +#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 16*1024*1024) /* 16MB
> RAM test */
> +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
> +#define CONFIG_STACKSIZE (256*1024) /* regular stack */
> +#define SDRAM_4BANKS_10COLS /* TODO: Update this! */
Yes update this ..
> +
> +/*====================*/
> +/* Serial Driver info */
> +/*====================*/
> +#define CONFIG_SYS_NS16550
> +#define CONFIG_SYS_NS16550_SERIAL
> +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register
> size */
> +#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address
> of UART2 */
> +#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) /* Input clock
> to NS16550 */
> +#define CONFIG_CONS_INDEX 1 /* use UART0 for
> console */
> +#define CONFIG_BAUDRATE 115200 /* Default baud rate */
> +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
> +
> +/*===================*/
> +/* I2C Configuration */
> +/*===================*/
> +#define CONFIG_HARD_I2C
> +#define CONFIG_DRIVER_DAVINCI_I2C
> +#define CONFIG_SYS_I2C_SPEED 25000 /* 100Kbps won't work,
> silicon bug */
> +#define CONFIG_SYS_I2C_SLAVE 10 /* Bogus,
> master-only in U-Boot */
> +
> +/*====================================================*/
> +/* I2C EEPROM definitions for catalyst 24W256 EEPROM chip */
> +/*====================================================*/
> +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
> +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
> +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
> +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
> +
> +/*==================================*/
> +/* Network & Ethernet Configuration */
> +/*==================================*/
> +#define CONFIG_DRIVER_DA8XX_EMAC
> +#define CONFIG_MII
> +#define CONFIG_BOOTP_DEFAULT
> +#define CONFIG_BOOTP_DNS
> +#define CONFIG_BOOTP_DNS2
> +#define CONFIG_BOOTP_SEND_HOSTNAME
> +#define CONFIG_NET_RETRY_COUNT 10
> +#define CONFIG_NET_MULTI
> +
> +/*=====================*/
> +/* Flash & Environment */
> +/*=====================*/
> +#ifdef CONFIG_USE_NAND
> +#undef CONFIG_ENV_IS_IN_FLASH
> +#define CONFIG_NAND_DAVINCI
> +#define CONFIG_SYS_NO_FLASH
> +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
> +#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by
> bootcode */
> +#define CONFIG_ENV_SIZE SZ_128K
Convert to (128 << 10)
See Sandeep's recent changes to remove SZ's
Apply globally
> +#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
> +#define CONFIG_SYS_NAND_CS 3
> +#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
> +#define CONFIG_SYS_CLE_MASK 0x10
> +#define CONFIG_SYS_ALE_MASK 0x8
> +#define CONFIG_SYS_NAND_HW_ECC
> +#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
> +#define NAND_MAX_CHIPS 1
> +#define DEF_BOOTM ""
> +#endif
> +
> +#ifdef CONFIG_USE_NOR
> +#define CONFIG_ENV_IS_IN_FLASH
> +#undef CONFIG_SYS_NO_FLASH
> +#define CONFIG_SYS_FLASH_CFI_DRIVER
> +#define CONFIG_SYS_FLASH_CFI
> +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */
> +#define CONFIG_SYS_FLASH_SECT_SZ 0x10000 /* 64KB sect size AMD
> Flash */
> +#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SECT_SZ*3)
> +#define CONFIG_SYS_FLASH_BASE DAVINCI_ASYNC_EMIF_DATA_CE2_BASE
> +#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */
> +#define CONFIG_SYS_MAX_FLASH_SECT
> (PHYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ)
> +#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ /* Env sector
> Size */
> +#define CONFIG_SYS_FLASH_SPL_ACCESS
> +#endif
> +
> +#ifdef CONFIG_USE_SPIFLASH
> +#undef CONFIG_ENV_IS_IN_FLASH
> +#undef CONFIG_ENV_IS_IN_NAND
> +#define CONFIG_ENV_IS_IN_SPI_FLASH
> +#define CONFIG_ENV_SIZE SZ_16K
> +#define CONFIG_ENV_OFFSET SZ_256K
> +#define CONFIG_ENV_SECT_SIZE SZ_4K
> +#define CONFIG_SYS_NO_FLASH
> +#define CONFIG_SPI
> +#define CONFIG_SPI_FLASH
> +#define CONFIG_SPI_FLASH_WINBOND
> +#define CONFIG_DAVINCI_SPI
> +#define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE
> +#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID)
> +#define CONFIG_SF_DEFAULT_SPEED 50000000
> +#define CONFIG_SYS_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
> +#endif
> +
> +
> +/*==============================*/
> +/* U-Boot general configuration */
> +/*==============================*/
> +#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */
> +#define CONFIG_MISC_INIT_R
> +#undef CONFIG_BOOTDELAY
> +#define CONFIG_BOOTFILE "uImage" /* Boot file name */
> +#define CONFIG_SYS_PROMPT "U-Boot > " /* Monitor Command Prompt */
You may want to change this to something less generic.
> +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer
> Size */
> +#define CONFIG_SYS_PBSIZE
> (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print buffer sz */
> +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
> +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot
> Argument Buffer Size */
> +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_MEMTEST_START + 0x700000)
> /* default Linux kernel load address */
> +#define CONFIG_VERSION_VARIABLE
> +#define CONFIG_AUTO_COMPLETE /* Won't work with hush so far, may be
> later */
Lines above exceed 80 chars. Please fix
> +#define CONFIG_SYS_HUSH_PARSER
> +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
> +#define CONFIG_CMDLINE_EDITING
> +#define CONFIG_SYS_LONGHELP
> +#define CONFIG_CRC32_VERIFY
> +#define CONFIG_MX_CYCLIC
> +/* #define CONFIG_USB_DA8XX */
> +/* #define CONFIG_MUSB_HCD */
Remove if not needed
> +#define CONFIG_USE_PINMUX
> +
> +/*===================*/
> +/* Linux Information */
> +/*===================*/
> +#define LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_MEMTEST_START + 0x100)
> +#define CONFIG_CMDLINE_TAG
> +#define CONFIG_SETUP_MEMORY_TAGS
> +#define CONFIG_BOOTARGS "mem=32M console=ttyS2,115200n8
> root=/dev/mtdblock/2 rw noinitrd ip=dhcp"
> +#define CONFIG_BOOTCOMMAND ""
> +#define CONFIG_BOOTDELAY 3
Tab
> +
> +/*=================*/
> +/* U-Boot commands */
> +/*=================*/
> +#include <config_cmd_default.h>
> +#define CONFIG_CMD_ENV
> +#define CONFIG_CMD_ASKENV
> +#define CONFIG_CMD_DHCP
> +#define CONFIG_CMD_DIAG
> +#define CONFIG_CMD_MII
> +#define CONFIG_CMD_PING
> +#define CONFIG_CMD_SAVES
> +#define CONFIG_CMD_MEMORY
> +#undef CONFIG_CMD_BDI
> +#undef CONFIG_CMD_FPGA
> +#undef CONFIG_CMD_SETGETDCR
> +#define CONFIG_CMD_EEPROM
> +
> +#ifdef CONFIG_USE_NAND
> +#undef CONFIG_CMD_FLASH
> +#undef CONFIG_CMD_IMLS
> +#define CONFIG_CMD_NAND
> +#define CONFIG_CMD_MTDPARTS
> +#define CONFIG_MTD_PARTITIONS
> +#define CONFIG_CMD_UBI
> +#define CONFIG_RBTREE
> +#endif
> +
> +#ifdef CONFIG_USE_SPIFLASH
> +#undef CONFIG_CMD_IMLS
> +#undef CONFIG_CMD_FLASH
> +#define CONFIG_CMD_SPI
> +#define CONFIG_CMD_SAVEENV
> +#endif
> +
> +#if !defined(CONFIG_USE_NAND) && !defined(CONFIG_USE_NOR) &&
> !defined(CONFIG_USE_SPIFLASH)
> +#define CONFIG_ENV_IS_NOWHERE
> +#define CONFIG_SYS_NO_FLASH
> +#define CONFIG_ENV_SIZE SZ_16K
> +#undef CONFIG_CMD_IMLS
> +#undef CONFIG_CMD_FLASH
> +#undef CONFIG_CMD_ENV
> +#endif
> +
> +#ifdef CONFIG_USB_DA8XX
> +#define CONFIG_CMD_USB /* inclue support for usb */
> +#define CONFIG_CMD_STORAGE /* inclue support for usb */
> +#define CONFIG_CMD_FAT /* inclue support for FAT/storage*/
Extra space here
> +#define CONFIG_DOS_PARTITION /* inclue support for FAT/storage*/
Spelling, change to 'include'
> +#endif
> +
> +#endif /* __CONFIG_H */
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
