mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +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>
183 lines
4.9 KiB
C
183 lines
4.9 KiB
C
/*
|
|
* (C) Copyright 2007-2008
|
|
* Stelian Pop <stelian@popies.net>
|
|
* Lead Tech Design <www.leadtechdesign.com>
|
|
*
|
|
* (C) Copyright 2009-2015
|
|
* Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
|
|
* esd electronic system design gmbh <www.esd.eu>
|
|
*
|
|
* Configuation settings for the esd MEESC board.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
/*
|
|
* SoC must be defined first, before hardware.h is included.
|
|
* In this case SoC is defined in boards.cfg.
|
|
*/
|
|
#include <asm/hardware.h>
|
|
|
|
/*
|
|
* Warning: changing CONFIG_SYS_TEXT_BASE requires
|
|
* adapting the initial boot program.
|
|
* Since the linker has to swallow that define, we must use a pure
|
|
* hex number here!
|
|
*/
|
|
#define CONFIG_SYS_TEXT_BASE 0x21F00000
|
|
|
|
/*
|
|
* since a number of boards are not being listed in linux
|
|
* arch/arm/tools/mach-types any more, the mach-types have to be
|
|
* defined here
|
|
*/
|
|
#define MACH_TYPE_MEESC 2165
|
|
#define MACH_TYPE_ETHERCAN2 2407
|
|
|
|
/* ARM asynchronous clock */
|
|
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* 32.768 kHz crystal */
|
|
#define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */
|
|
|
|
/* Misc CPU related */
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT
|
|
#define CONFIG_ARCH_CPU_INIT
|
|
#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_SERIAL_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
|
|
#define CONFIG_MISC_INIT_R /* Call misc_init_r */
|
|
|
|
#define CONFIG_DISPLAY_BOARDINFO /* call checkboard() */
|
|
#define CONFIG_DISPLAY_CPUINFO /* display cpu info and speed */
|
|
#define CONFIG_PREBOOT /* enable preboot variable */
|
|
|
|
/*
|
|
* Hardware drivers
|
|
*/
|
|
|
|
/* general purpose I/O */
|
|
#define CONFIG_AT91_GPIO
|
|
|
|
/* Console output */
|
|
#define CONFIG_ATMEL_USART
|
|
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
|
|
#define CONFIG_USART_ID ATMEL_ID_SYS
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/*
|
|
* BOOTP options
|
|
*/
|
|
#define CONFIG_BOOTP_BOOTFILESIZE
|
|
#define CONFIG_BOOTP_BOOTPATH
|
|
#define CONFIG_BOOTP_GATEWAY
|
|
#define CONFIG_BOOTP_HOSTNAME
|
|
|
|
/*
|
|
* Command line configuration.
|
|
*/
|
|
|
|
#ifdef CONFIG_SYS_USE_NANDFLASH
|
|
#define CONFIG_CMD_NAND
|
|
#endif
|
|
|
|
/* LED */
|
|
#define CONFIG_AT91_LED
|
|
|
|
/*
|
|
* SDRAM: 1 bank, min 32, max 128 MB
|
|
* Initialized before u-boot gets started.
|
|
*/
|
|
#define PHYS_SDRAM ATMEL_BASE_CS1 /* 0x20000000 */
|
|
#define PHYS_SDRAM_SIZE 0x02000000 /* 32 MByte */
|
|
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
|
|
#define CONFIG_SYS_SDRAM_SIZE PHYS_SDRAM_SIZE
|
|
|
|
#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + 0x00100000)
|
|
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x01E00000)
|
|
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x00100000)
|
|
|
|
/*
|
|
* Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,
|
|
* leaving the correct space for initial global data structure above
|
|
* that address while providing maximum stack area below.
|
|
*/
|
|
#define CONFIG_SYS_INIT_SP_ADDR \
|
|
(ATMEL_BASE_SRAM0 + 0x1000 - GENERATED_GBL_DATA_SIZE)
|
|
|
|
/* DataFlash */
|
|
#ifdef CONFIG_SYS_USE_DATAFLASH
|
|
# define CONFIG_ATMEL_DATAFLASH_SPI
|
|
# define CONFIG_HAS_DATAFLASH
|
|
# define CONFIG_SYS_MAX_DATAFLASH_BANKS 1
|
|
# define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */
|
|
# define AT91_SPI_CLK 15000000
|
|
# define DATAFLASH_TCSS (0x1a << 16)
|
|
# define DATAFLASH_TCHS (0x1 << 24)
|
|
#endif
|
|
|
|
/* NOR flash is not populated, disable it */
|
|
#define CONFIG_SYS_NO_FLASH
|
|
|
|
/* NAND flash */
|
|
#ifdef CONFIG_CMD_NAND
|
|
# define CONFIG_NAND_ATMEL
|
|
# define CONFIG_SYS_MAX_NAND_DEVICE 1
|
|
# define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /* 0x40000000 */
|
|
# define CONFIG_SYS_NAND_DBW_8
|
|
# define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
|
|
# define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
|
|
# define CONFIG_SYS_NAND_ENABLE_PIN GPIO_PIN_PD(15)
|
|
# define CONFIG_SYS_NAND_READY_PIN GPIO_PIN_PA(22)
|
|
#endif
|
|
|
|
/* Ethernet */
|
|
#define CONFIG_MACB
|
|
#define CONFIG_RMII
|
|
#define CONFIG_NET_RETRY_COUNT 20
|
|
#undef CONFIG_RESET_PHY_R
|
|
|
|
/* hw-controller addresses */
|
|
#define CONFIG_ET1100_BASE 0x70000000
|
|
|
|
#ifdef CONFIG_SYS_USE_DATAFLASH
|
|
|
|
/* bootstrap + u-boot + env in dataflash on CS0 */
|
|
# define CONFIG_ENV_IS_IN_DATAFLASH
|
|
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
|
|
0x8400)
|
|
# define CONFIG_ENV_OFFSET 0x4200
|
|
# define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
|
|
CONFIG_ENV_OFFSET)
|
|
# define CONFIG_ENV_SIZE 0x4200
|
|
|
|
#elif CONFIG_SYS_USE_NANDFLASH
|
|
|
|
/* bootstrap + u-boot + env + linux in nandflash */
|
|
# define CONFIG_ENV_IS_IN_NAND 1
|
|
# define CONFIG_ENV_OFFSET 0xC0000
|
|
# define CONFIG_ENV_SIZE 0x20000
|
|
|
|
#endif
|
|
|
|
#define CONFIG_SYS_CBSIZE 512
|
|
#define CONFIG_SYS_MAXARGS 16
|
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
|
sizeof(CONFIG_SYS_PROMPT) + 16)
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_AUTO_COMPLETE
|
|
|
|
/*
|
|
* Size of malloc() pool
|
|
*/
|
|
#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \
|
|
128*1024, 0x1000)
|
|
|
|
#endif
|