mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 18:28:55 +00:00
2fbb8462b0
As the help message of CONFIG_BOOTDELAY says, CONFIG_BOOTDELAY=-2
means the autoboot with no delay, with no abort check even if
CONFIG_ZERO_BOOTDELAY_CHECK is defined.
To sum up, the autoboot behaves as follows:
[1] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=y
autoboot with no delay, but you can abort it by key input
[2] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
autoboot with no delay, with no check for abort
[3] CONFIG_BOOTDELAY=-1
disable autoboot
[4] CONFIG_BOOTDELAY=-2
autoboot with no delay, with no check for abort
As you notice, [2] and [4] come to the same result, which means we
do not need CONFIG_ZERO_BOOTDELAY_CHECK. We can control all the
cases only by CONFIG_BOOTDELAY, like this:
[1] CONFIG_BOOTDELAY=0
autoboot with no delay, but you can abort it by key input
[2] CONFIG_BOOTDELAY=-1
disable autoboot
[3] CONFIG_BOOTDELAY=-2
autoboot with no delay, with no check for abort
This commit converts the logic as follow:
CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
--> CONFIG_BOOTDELAY=-2
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Acked-by: Christian Riesch <christian.riesch@omicronenergy.com>
Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
239 lines
7.1 KiB
C
239 lines
7.1 KiB
C
/*
|
|
* Copyright (C) 2016 David Lechner <david@lechnology.com>
|
|
*
|
|
* Based on da850evm.h
|
|
*
|
|
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
|
|
*
|
|
* Based on davinci_dvevm.h. Original Copyrights follow:
|
|
*
|
|
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
/*
|
|
* SoC Configuration
|
|
*/
|
|
#define CONFIG_MACH_DAVINCI_DA850_EVM
|
|
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
|
|
#define CONFIG_SOC_DA850 /* TI DA850 SoC */
|
|
#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
|
|
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
|
|
#define CONFIG_SYS_OSCIN_FREQ 24000000
|
|
#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE
|
|
#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID)
|
|
#define CONFIG_SYS_DA850_PLL_INIT
|
|
#define CONFIG_SYS_DA850_DDR_INIT
|
|
|
|
#define CONFIG_SYS_TEXT_BASE 0xc1080000
|
|
|
|
/*
|
|
* Memory Info
|
|
*/
|
|
#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /* malloc() len */
|
|
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
|
|
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
|
|
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
|
|
|
|
/* memtest start addr */
|
|
#define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + 0x2000000)
|
|
|
|
/* memtest will be run on 16MB */
|
|
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024)
|
|
|
|
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
|
|
|
|
#define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \
|
|
DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \
|
|
DAVINCI_SYSCFG_SUSPSRC_SPI0 | \
|
|
DAVINCI_SYSCFG_SUSPSRC_UART1 | \
|
|
DAVINCI_SYSCFG_SUSPSRC_EMAC | \
|
|
DAVINCI_SYSCFG_SUSPSRC_I2C)
|
|
|
|
/*
|
|
* PLL configuration
|
|
*/
|
|
#define CONFIG_SYS_DV_CLKMODE 0
|
|
#define CONFIG_SYS_DA850_PLL0_POSTDIV 1
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV1 0x8000
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV2 0x8001
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV3 0x8002
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV4 0x8003
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV5 0x8002
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV6 CONFIG_SYS_DA850_PLL0_PLLDIV1
|
|
#define CONFIG_SYS_DA850_PLL0_PLLDIV7 0x8005
|
|
|
|
#define CONFIG_SYS_DA850_PLL1_POSTDIV 1
|
|
#define CONFIG_SYS_DA850_PLL1_PLLDIV1 0x8000
|
|
#define CONFIG_SYS_DA850_PLL1_PLLDIV2 0x8001
|
|
#define CONFIG_SYS_DA850_PLL1_PLLDIV3 0x8002
|
|
|
|
#define CONFIG_SYS_DA850_PLL0_PLLM 24
|
|
#define CONFIG_SYS_DA850_PLL1_PLLM 21
|
|
|
|
/*
|
|
* DDR2 memory configuration
|
|
*/
|
|
#define CONFIG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \
|
|
DV_DDR_PHY_EXT_STRBEN | \
|
|
(0x4 << DV_DDR_PHY_RD_LATENCY_SHIFT))
|
|
|
|
#define CONFIG_SYS_DA850_DDR2_SDBCR ( \
|
|
(1 << DV_DDR_SDCR_MSDRAMEN_SHIFT) | \
|
|
(1 << DV_DDR_SDCR_DDREN_SHIFT) | \
|
|
(1 << DV_DDR_SDCR_SDRAMEN_SHIFT) | \
|
|
(1 << DV_DDR_SDCR_BUS_WIDTH_SHIFT) | \
|
|
(0x3 << DV_DDR_SDCR_CL_SHIFT) | \
|
|
(0x2 << DV_DDR_SDCR_IBANK_SHIFT) | \
|
|
(0x2 << DV_DDR_SDCR_PAGESIZE_SHIFT))
|
|
|
|
/* SDBCR2 is only used if IBANK_POS bit in SDBCR is set */
|
|
#define CONFIG_SYS_DA850_DDR2_SDBCR2 0
|
|
|
|
#define CONFIG_SYS_DA850_DDR2_SDTIMR ( \
|
|
(14 << DV_DDR_SDTMR1_RFC_SHIFT) | \
|
|
(2 << DV_DDR_SDTMR1_RP_SHIFT) | \
|
|
(2 << DV_DDR_SDTMR1_RCD_SHIFT) | \
|
|
(1 << DV_DDR_SDTMR1_WR_SHIFT) | \
|
|
(5 << DV_DDR_SDTMR1_RAS_SHIFT) | \
|
|
(8 << DV_DDR_SDTMR1_RC_SHIFT) | \
|
|
(1 << DV_DDR_SDTMR1_RRD_SHIFT) | \
|
|
(0 << DV_DDR_SDTMR1_WTR_SHIFT))
|
|
|
|
#define CONFIG_SYS_DA850_DDR2_SDTIMR2 ( \
|
|
(7 << DV_DDR_SDTMR2_RASMAX_SHIFT) | \
|
|
(0 << DV_DDR_SDTMR2_XP_SHIFT) | \
|
|
(0 << DV_DDR_SDTMR2_ODT_SHIFT) | \
|
|
(17 << DV_DDR_SDTMR2_XSNR_SHIFT) | \
|
|
(199 << DV_DDR_SDTMR2_XSRD_SHIFT) | \
|
|
(0 << DV_DDR_SDTMR2_RTP_SHIFT) | \
|
|
(0 << DV_DDR_SDTMR2_CKE_SHIFT))
|
|
|
|
#define CONFIG_SYS_DA850_DDR2_SDRCR 0x00000494
|
|
#define CONFIG_SYS_DA850_DDR2_PBBPR 0x30
|
|
|
|
/*
|
|
* Serial Driver info
|
|
*/
|
|
#define CONFIG_SYS_NS16550_SERIAL
|
|
#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */
|
|
#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART1_BASE /* Base address of UART1 */
|
|
#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
|
|
#define CONFIG_CONS_INDEX 1 /* use UART0 for console */
|
|
#define CONFIG_BAUDRATE 115200 /* Default baud rate */
|
|
|
|
#define CONFIG_SPI
|
|
#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_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
|
|
|
/*
|
|
* I2C Configuration
|
|
*/
|
|
#define CONFIG_SYS_I2C
|
|
#define CONFIG_SYS_I2C_DAVINCI
|
|
#define CONFIG_SYS_DAVINCI_I2C_SPEED 400000
|
|
#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */
|
|
|
|
/*
|
|
* U-Boot general configuration
|
|
*/
|
|
#define CONFIG_BOARD_EARLY_INIT_F
|
|
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
|
|
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O 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 Args Buffer Size */
|
|
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
|
|
#define CONFIG_VERSION_VARIABLE
|
|
#define CONFIG_AUTO_COMPLETE
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_CRC32_VERIFY
|
|
#define CONFIG_MX_CYCLIC
|
|
|
|
/*
|
|
* Linux Information
|
|
*/
|
|
#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
|
|
#define CONFIG_HWCONFIG /* enable hwconfig */
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
#define CONFIG_SERIAL_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_SETUP_INITRD_TAG
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"if mmc rescan; then " \
|
|
"if run loadbootscr; then " \
|
|
"run bootscript; " \
|
|
"else " \
|
|
"if run loadimage; then " \
|
|
"run mmcargs; " \
|
|
"run mmcboot; " \
|
|
"else " \
|
|
"run flashargs; " \
|
|
"run flashboot; " \
|
|
"fi; " \
|
|
"fi; " \
|
|
"else " \
|
|
"run flashargs; " \
|
|
"run flashboot; " \
|
|
"fi"
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"hostname=EV3\0" \
|
|
"memsize=64M\0" \
|
|
"filesyssize=10M\0" \
|
|
"verify=n\0" \
|
|
"console=ttyS1,115200n8\0" \
|
|
"bootscraddr=0xC0600000\0" \
|
|
"loadaddr=0xC0007FC0\0" \
|
|
"filesysaddr=0xC1180000\0" \
|
|
"fwupdateboot=mw 0xFFFF1FFC 0x5555AAAA; reset\0" \
|
|
"mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
|
|
"mmcboot=bootm ${loadaddr}\0" \
|
|
"flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
|
|
"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \
|
|
"loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
|
|
"loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
|
|
"bootscript=source ${bootscraddr}\0" \
|
|
|
|
/*
|
|
* U-Boot commands
|
|
*/
|
|
#define CONFIG_CMD_DIAG
|
|
#define CONFIG_CMD_SAVES
|
|
|
|
#ifdef CONFIG_CMD_BDI
|
|
#define CONFIG_CLOCKS
|
|
#endif
|
|
|
|
#define CONFIG_ENV_IS_NOWHERE
|
|
#define CONFIG_SYS_NO_FLASH
|
|
#define CONFIG_ENV_SIZE (16 << 10)
|
|
|
|
/* SD/MMC configuration */
|
|
#define CONFIG_MMC
|
|
#define CONFIG_DAVINCI_MMC_SD1
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_DAVINCI_MMC
|
|
|
|
/*
|
|
* Enable MMC commands only when
|
|
* MMC support is present
|
|
*/
|
|
#ifdef CONFIG_MMC
|
|
#define CONFIG_DOS_PARTITION
|
|
#endif
|
|
|
|
/* additions for new relocation code, must added to all boards */
|
|
#define CONFIG_SYS_SDRAM_BASE 0xc0000000
|
|
|
|
#define CONFIG_SYS_INIT_SP_ADDR 0x80010000
|
|
|
|
#endif /* __CONFIG_H */
|