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>
153 lines
4.4 KiB
C
153 lines
4.4 KiB
C
/*
|
|
* Bluewater Systems Snapper 9G45 module
|
|
*
|
|
* (C) Copyright 2011 Bluewater Systems
|
|
* Author: Andre Renaud <andre@bluewatersys.com>
|
|
* Author: Ryan Mallon <ryan@bluewatersys.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
/* SoC type is defined in boards.cfg */
|
|
#include <asm/hardware.h>
|
|
#include <linux/sizes.h>
|
|
|
|
#define CONFIG_SYS_TEXT_BASE 0x73f00000
|
|
|
|
/* ARM asynchronous clock */
|
|
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
|
|
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
|
|
|
|
/* CPU */
|
|
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
|
|
#define CONFIG_DISPLAY_CPUINFO
|
|
#define CONFIG_BOARD_EARLY_INIT_F
|
|
#define CONFIG_BOARD_LATE_INIT
|
|
|
|
/* SDRAM */
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6
|
|
#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024) /* 64MB */
|
|
#define CONFIG_SYS_INIT_SP_ADDR (ATMEL_BASE_SRAM + 0x1000 - \
|
|
GENERATED_GBL_DATA_SIZE)
|
|
|
|
/* Mem test settings */
|
|
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
|
|
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + (1024 * 1024))
|
|
|
|
/* NAND Flash */
|
|
#define CONFIG_NAND_ATMEL
|
|
#define CONFIG_ATMEL_NAND_HWECC
|
|
#define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC
|
|
#define CONFIG_SYS_NO_FLASH
|
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
|
#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
|
|
#define CONFIG_SYS_NAND_DBW_8
|
|
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* AD21 */
|
|
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) /* AD22 */
|
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8
|
|
|
|
/* Ethernet */
|
|
#define CONFIG_MACB
|
|
#define CONFIG_RMII
|
|
#define CONFIG_NET_RETRY_COUNT 20
|
|
#define CONFIG_RESET_PHY_R
|
|
#define CONFIG_AT91_WANTS_COMMON_PHY
|
|
#define CONFIG_TFTP_PORT
|
|
#define CONFIG_TFTP_TSIZE
|
|
|
|
/* USB */
|
|
#define CONFIG_USB_EHCI
|
|
#define CONFIG_USB_EHCI_ATMEL
|
|
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
|
|
#define CONFIG_DOS_PARTITION
|
|
#define CONFIG_USB_STORAGE
|
|
#define CONFIG_PARTITION_UUIDS
|
|
|
|
/* MMC */
|
|
#define CONFIG_MMC
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_GENERIC_ATMEL_MCI
|
|
|
|
/* LCD */
|
|
#define CONFIG_ATMEL_LCD
|
|
#define CONFIG_CONSOLE_MUX
|
|
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
|
#define CONFIG_GURNARD_SPLASH
|
|
|
|
#define CONFIG_ATMEL_SPI
|
|
|
|
/* GPIOs and IO expander */
|
|
#define CONFIG_ATMEL_LEGACY
|
|
#define CONFIG_AT91_GPIO
|
|
#define CONFIG_AT91_GPIO_PULLUP 1
|
|
|
|
/* UARTs/Serial console */
|
|
#define CONFIG_ATMEL_USART
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/* Boot options */
|
|
#define CONFIG_SYS_LOAD_ADDR 0x23000000
|
|
|
|
#define CONFIG_BOOTP_BOOTFILESIZE
|
|
#define CONFIG_BOOTP_BOOTPATH
|
|
#define CONFIG_BOOTP_GATEWAY
|
|
#define CONFIG_BOOTP_HOSTNAME
|
|
|
|
/* Environment settings */
|
|
#define CONFIG_ENV_IS_IN_NAND
|
|
#define CONFIG_ENV_OFFSET (512 << 10)
|
|
#define CONFIG_ENV_SIZE (256 << 10)
|
|
#define CONFIG_ENV_OVERWRITE
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"ethaddr=00:00:00:00:00:00\0" \
|
|
"serial=0\0" \
|
|
"stdout=serial_atmel\0" \
|
|
"stderr=serial_atmel\0" \
|
|
"stdin=serial_atmel\0" \
|
|
"bootlimit=3\0" \
|
|
"loadaddr=0x71000000\0" \
|
|
"board_rev=2\0" \
|
|
"bootfile=/tftpboot/uImage\0" \
|
|
"bootargs_def=console=ttyS0,115200 panic=5 quiet lpj=997376\0" \
|
|
"nfsroot=/export/root\0" \
|
|
"boot_working=setenv bootargs $bootargs_def; nboot $loadaddr 0 0x20c0000 && bootm\0" \
|
|
"boot_safe=setenv bootargs $bootargs_def; nboot $loadaddr 0 0xc0000 && bootm\0" \
|
|
"boot_tftp=setenv bootargs $bootargs_def ip=any nfsroot=$nfsroot; setenv autoload y && bootp && bootm\0" \
|
|
"boot_usb=setenv bootargs $bootargs_def; usb start && usb storage && fatload usb 0:1 $loadaddr dds-xm200.bin && bootm\0" \
|
|
"boot_mmc=setenv bootargs $bootargs_def; mmc rescan && fatload mmc 0:1 $loadaddr dds-xm200.bin && bootm\0" \
|
|
"bootcmd=run boot_mmc ; run boot_usb ; run boot_working ; run boot_safe\0" \
|
|
"altbootcmd=run boot_mmc ; run boot_usb ; run boot_safe ; run boot_working\0"
|
|
|
|
/* Console settings */
|
|
#define CONFIG_SYS_CBSIZE 256
|
|
#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
|
|
|
|
/* U-Boot memory settings */
|
|
#define CONFIG_SYS_MALLOC_LEN (1 << 20)
|
|
|
|
/* Command line configuration */
|
|
#define CONFIG_CMD_PING
|
|
#define CONFIG_CMD_DHCP
|
|
#define CONFIG_CMD_FAT
|
|
#define CONFIG_CMD_USB
|
|
#define CONFIG_CMD_MII
|
|
#define CONFIG_CMD_MMC
|
|
#define CONFIG_CMD_NAND
|
|
#define CONFIG_CMD_CACHE
|
|
#define CONFIG_CMD_PART
|
|
|
|
#endif /* __CONFIG_H */
|