mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 08:57:58 +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>
213 lines
5.5 KiB
C
213 lines
5.5 KiB
C
/*
|
|
* (C) Copyright 2009
|
|
* Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _SPEAR_COMMON_H
|
|
#define _SPEAR_COMMON_H
|
|
/*
|
|
* Common configurations used for both spear3xx as well as spear6xx
|
|
*/
|
|
|
|
/* U-Boot Load Address */
|
|
#define CONFIG_SYS_TEXT_BASE 0x00700000
|
|
|
|
/* Ethernet driver configuration */
|
|
#define CONFIG_MII
|
|
#define CONFIG_PHY_RESET_DELAY 10000 /* in usec */
|
|
#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */
|
|
|
|
/* USBD driver configuration */
|
|
#if defined(CONFIG_SPEAR_USBTTY)
|
|
#define CONFIG_DW_UDC
|
|
#define CONFIG_USB_DEVICE
|
|
#define CONFIG_USBD_HS
|
|
#define CONFIG_USB_TTY
|
|
|
|
#define CONFIG_USBD_PRODUCT_NAME "SPEAr SoC"
|
|
#define CONFIG_USBD_MANUFACTURER "ST Microelectronics"
|
|
|
|
#endif
|
|
|
|
#define CONFIG_EXTRA_ENV_USBTTY "usbtty=cdc_acm\0"
|
|
|
|
/* I2C driver configuration */
|
|
#define CONFIG_SYS_I2C
|
|
#if defined(CONFIG_SPEAR600)
|
|
#define CONFIG_SYS_I2C_BASE 0xD0200000
|
|
#elif defined(CONFIG_SPEAR300)
|
|
#define CONFIG_SYS_I2C_BASE 0xD0180000
|
|
#elif defined(CONFIG_SPEAR310)
|
|
#define CONFIG_SYS_I2C_BASE 0xD0180000
|
|
#elif defined(CONFIG_SPEAR320)
|
|
#define CONFIG_SYS_I2C_BASE 0xD0180000
|
|
#endif
|
|
#define CONFIG_SYS_I2C_SPEED 400000
|
|
#define CONFIG_SYS_I2C_SLAVE 0x02
|
|
|
|
#define CONFIG_I2C_CHIPADDRESS 0x50
|
|
|
|
/* Timer, HZ specific defines */
|
|
|
|
/* Flash configuration */
|
|
#if defined(CONFIG_FLASH_PNOR)
|
|
#define CONFIG_SPEAR_EMI
|
|
#else
|
|
#define CONFIG_ST_SMI
|
|
#endif
|
|
|
|
#if defined(CONFIG_ST_SMI)
|
|
|
|
#define CONFIG_SYS_MAX_FLASH_BANKS 2
|
|
#define CONFIG_SYS_FLASH_BASE 0xF8000000
|
|
#define CONFIG_SYS_CS1_FLASH_BASE 0xF9000000
|
|
#define CONFIG_SYS_FLASH_BANK_SIZE 0x01000000
|
|
#define CONFIG_SYS_FLASH_ADDR_BASE {CONFIG_SYS_FLASH_BASE, \
|
|
CONFIG_SYS_CS1_FLASH_BASE}
|
|
#define CONFIG_SYS_MAX_FLASH_SECT 128
|
|
|
|
#define CONFIG_SYS_FLASH_ERASE_TOUT (3 * CONFIG_SYS_HZ)
|
|
#define CONFIG_SYS_FLASH_WRITE_TOUT (3 * CONFIG_SYS_HZ)
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Serial Configuration (PL011)
|
|
* CONFIG_PL01x_PORTS is defined in specific files
|
|
*/
|
|
#define CONFIG_PL011_SERIAL
|
|
#define CONFIG_PL011_CLOCK (48 * 1000 * 1000)
|
|
#define CONFIG_CONS_INDEX 0
|
|
#define CONFIG_BAUDRATE 115200
|
|
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \
|
|
57600, 115200 }
|
|
|
|
#define CONFIG_SYS_LOADS_BAUD_CHANGE
|
|
|
|
/* NAND FLASH Configuration */
|
|
#define CONFIG_SYS_NAND_SELF_INIT
|
|
#define CONFIG_MTD_DEVICE
|
|
#define CONFIG_MTD_PARTITIONS
|
|
#define CONFIG_NAND_FSMC
|
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
|
#define CONFIG_SYS_NAND_ONFI_DETECTION
|
|
|
|
/*
|
|
* Command support defines
|
|
*/
|
|
#define CONFIG_CMD_NAND
|
|
#define CONFIG_CMD_ENV
|
|
#define CONFIG_CMD_SAVES
|
|
|
|
/*
|
|
* Default Environment Varible definitions
|
|
*/
|
|
#define CONFIG_ENV_OVERWRITE
|
|
|
|
/*
|
|
* U-Boot Environment placing definitions.
|
|
*/
|
|
#if defined(CONFIG_ENV_IS_IN_FLASH)
|
|
#ifdef CONFIG_ST_SMI
|
|
/*
|
|
* Environment is in serial NOR flash
|
|
*/
|
|
#define CONFIG_SYS_MONITOR_LEN 0x00040000
|
|
#define CONFIG_ENV_SECT_SIZE 0x00010000
|
|
#define CONFIG_FSMTDBLK "/dev/mtdblock3 "
|
|
|
|
#define CONFIG_BOOTCOMMAND "bootm 0xf8050000"
|
|
|
|
#elif defined(CONFIG_SPEAR_EMI)
|
|
/*
|
|
* Environment is in parallel NOR flash
|
|
*/
|
|
#define CONFIG_SYS_MONITOR_LEN 0x00060000
|
|
#define CONFIG_ENV_SECT_SIZE 0x00020000
|
|
#define CONFIG_FSMTDBLK "/dev/mtdblock3 "
|
|
|
|
#define CONFIG_BOOTCOMMAND "cp.b 0x50080000 0x1600000 " \
|
|
"0x4C0000; bootm 0x1600000"
|
|
#endif
|
|
|
|
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \
|
|
CONFIG_SYS_MONITOR_LEN)
|
|
#elif defined(CONFIG_ENV_IS_IN_NAND)
|
|
/*
|
|
* Environment is in NAND
|
|
*/
|
|
|
|
#define CONFIG_ENV_OFFSET 0x60000
|
|
#define CONFIG_ENV_RANGE 0x10000
|
|
#define CONFIG_FSMTDBLK "/dev/mtdblock7 "
|
|
|
|
#define CONFIG_BOOTCOMMAND "nand read.jffs2 0x1600000 " \
|
|
"0x80000 0x4C0000; " \
|
|
"bootm 0x1600000"
|
|
#endif
|
|
|
|
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 " \
|
|
"mem=128M " \
|
|
"root="CONFIG_FSMTDBLK \
|
|
"rootfstype=jffs2"
|
|
|
|
#define CONFIG_NFSBOOTCOMMAND \
|
|
"bootp; " \
|
|
"setenv bootargs root=/dev/nfs rw " \
|
|
"nfsroot=$(serverip):$(rootpath) " \
|
|
"ip=$(ipaddr):$(serverip):$(gatewayip):" \
|
|
"$(netmask):$(hostname):$(netdev):off " \
|
|
"console=ttyAMA0,115200 $(othbootargs);" \
|
|
"bootm; "
|
|
|
|
#define CONFIG_RAMBOOTCOMMAND \
|
|
"setenv bootargs root=/dev/ram rw " \
|
|
"console=ttyAMA0,115200 $(othbootargs);" \
|
|
CONFIG_BOOTCOMMAND
|
|
|
|
#define CONFIG_ENV_SIZE 0x02000
|
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_ARCH_CPU_INIT
|
|
#define CONFIG_BOARD_EARLY_INIT_F
|
|
#define CONFIG_DISPLAY_CPUINFO
|
|
#define CONFIG_BOOT_PARAMS_ADDR 0x00000100
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_MISC_INIT_R
|
|
|
|
#define CONFIG_SYS_MEMTEST_START 0x00800000
|
|
#define CONFIG_SYS_MEMTEST_END 0x04000000
|
|
#define CONFIG_SYS_MALLOC_LEN (1024*1024)
|
|
#define CONFIG_IDENT_STRING "-SPEAr"
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_SYS_CBSIZE 256
|
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
|
sizeof(CONFIG_SYS_PROMPT) + 16)
|
|
#define CONFIG_SYS_MAXARGS 16
|
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
|
#define CONFIG_SYS_LOAD_ADDR 0x00800000
|
|
#define CONFIG_SYS_CONSOLE_INFO_QUIET
|
|
|
|
#define CONFIG_SYS_FLASH_EMPTY_INFO
|
|
|
|
/* Physical Memory Map */
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define PHYS_SDRAM_1 0x00000000
|
|
#define PHYS_SDRAM_1_MAXSIZE 0x40000000
|
|
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
|
#define CONFIG_SYS_INIT_RAM_ADDR 0xD2800000
|
|
#define CONFIG_SYS_INIT_RAM_SIZE 0x2000
|
|
|
|
#define CONFIG_SYS_INIT_SP_OFFSET \
|
|
(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
|
|
|
|
#define CONFIG_SYS_INIT_SP_ADDR \
|
|
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
|
|
|
#endif
|