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>
154 lines
4.5 KiB
C
154 lines
4.5 KiB
C
/*
|
|
* Configuration settings for the VInCo platform.
|
|
*
|
|
* Based on the settings for the SAMA5-EK board
|
|
* Copyright (C) 2014 Atmel
|
|
* Bo Shen <voice.shen@atmel.com>
|
|
* Copyright (C) 2015 Free Electrons
|
|
* Gregory CLEMENT gregory.clement@free-electrons.com
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
/* No NOR flash, this definition should be put before common header */
|
|
#define CONFIG_SYS_NO_FLASH
|
|
|
|
#include "at91-sama5_common.h"
|
|
|
|
/* The value in the common file is too far away for the VInCo platform */
|
|
#ifdef CONFIG_SYS_TEXT_BASE
|
|
#undef CONFIG_SYS_TEXT_BASE
|
|
#endif
|
|
#define CONFIG_SYS_TEXT_BASE 0x20f00000
|
|
|
|
/* serial console */
|
|
#define CONFIG_ATMEL_USART
|
|
#define CONFIG_USART_BASE ATMEL_BASE_USART3
|
|
#define CONFIG_USART_ID ATMEL_ID_USART3
|
|
|
|
/* SDRAM */
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS
|
|
#define CONFIG_SYS_SDRAM_SIZE 0x4000000
|
|
|
|
#define CONFIG_SYS_INIT_SP_ADDR \
|
|
(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
|
|
|
|
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
|
|
|
|
/* SerialFlash */
|
|
|
|
#ifdef CONFIG_CMD_SF
|
|
#define CONFIG_ATMEL_SPI
|
|
#define CONFIG_ATMEL_SPI0
|
|
#define CONFIG_SPI_FLASH_STMICRO
|
|
#define CONFIG_SF_DEFAULT_BUS 0
|
|
#define CONFIG_SF_DEFAULT_CS 0
|
|
#define CONFIG_SF_DEFAULT_SPEED 50000000
|
|
#define CONFIG_ENV_SPI_MAX_HZ 50000000
|
|
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
|
|
#define CONFIG_ENV_SPI_MODE (SPI_MODE_0)
|
|
#endif
|
|
|
|
/* MMC */
|
|
|
|
#ifdef CONFIG_CMD_MMC
|
|
#define CONFIG_SUPPORT_EMMC_BOOT
|
|
#define CONFIG_MMC
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_GENERIC_ATMEL_MCI
|
|
#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1
|
|
#define CONFIG_SYS_MMC_CLK_OD 500000
|
|
|
|
/* For generating MMC partitions */
|
|
#define CONFIG_PARTITION_UUIDS
|
|
#define CONFIG_RANDOM_UUID
|
|
#define CONFIG_EFI_PARTITION
|
|
#define CONFIG_CMD_GPT
|
|
|
|
#endif
|
|
|
|
/* USB */
|
|
|
|
#ifdef CONFIG_CMD_USB
|
|
#define CONFIG_USB_EHCI
|
|
#define CONFIG_USB_EHCI_ATMEL
|
|
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
|
|
#define CONFIG_USB_STORAGE
|
|
#endif
|
|
|
|
/* USB device */
|
|
#define CONFIG_USB_ETHER
|
|
#define CONFIG_USB_ETH_RNDIS
|
|
#define CONFIG_USBNET_MANUFACTURER "L+G VInCo"
|
|
|
|
#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
|
|
#define CONFIG_DOS_PARTITION
|
|
#endif
|
|
|
|
/* Ethernet Hardware */
|
|
#define CONFIG_PHY_SMSC
|
|
#define CONFIG_MACB
|
|
#define CONFIG_RMII
|
|
#define CONFIG_NET_RETRY_COUNT 20
|
|
#define CONFIG_MACB_SEARCH_PHY
|
|
|
|
#define CONFIG_USB_HOST_ETHER
|
|
#define CONFIG_USB_ETHER_SMSC95XX
|
|
#define CONFIG_USB_ETHER_RNDIS
|
|
|
|
#ifdef CONFIG_SYS_USE_SERIALFLASH
|
|
/* bootstrap + u-boot + env + linux in serial flash */
|
|
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
|
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
|
/* Use our own mapping for the VInCo platform */
|
|
#undef CONFIG_ENV_OFFSET
|
|
#undef CONFIG_ENV_SIZE
|
|
|
|
#define CONFIG_ENV_OFFSET 0x10000
|
|
#define CONFIG_ENV_SIZE 0x10000
|
|
|
|
/* Update the bootcommand according to our mapping for the VInCo platform */
|
|
#undef CONFIG_BOOTCOMMAND
|
|
#define CONFIG_BOOTCOMMAND "mmc dev 0 0;" \
|
|
"mmc read ${loadaddr} ${k_offset} ${k_blksize};" \
|
|
"mmc read ${oftaddr} ${dtb_offset} ${dtb_blksize};" \
|
|
"bootz ${loadaddr} - ${oftaddr}"
|
|
|
|
#undef CONFIG_BOOTARGS
|
|
#define CONFIG_BOOTARGS "console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"kernel_start=0x20000\0" \
|
|
"kernel_size=0x800000\0" \
|
|
"mmcblksize=0x200\0" \
|
|
"oftaddr=0x21000000\0" \
|
|
"loadaddr=0x22000000\0" \
|
|
"update_uboot=tftp ${loadaddr} u-boot.bin;sf probe 0;" \
|
|
"sf erase 0x20000 0x4B000; sf write ${loadaddr} 0x20000 0x4B000\0" \
|
|
"create_partition=setexpr dtb_start ${kernel_start} + 0x400000;" \
|
|
"setexpr rootfs_start ${kernel_start} + ${kernel_size};" \
|
|
"setenv partitions 'name=kernel,size=${kernel_size}," \
|
|
"start=${kernel_start};name=rootfs,size=-';" \
|
|
"gpt write mmc 0 ${partitions} \0"\
|
|
"f2blk_size=setexpr fileblksize ${filesize} / ${mmcblksize};" \
|
|
"setexpr fileblksize ${fileblksize} + 1\0" \
|
|
"store_kernel=tftp ${loadaddr} zImage; run f2blk_size;" \
|
|
"setexpr k_blksize ${fileblksize};" \
|
|
"setexpr k_offset ${kernel_start} / ${mmcblksize};" \
|
|
"mmc write ${fileaddr} ${k_offset} ${fileblksize}\0" \
|
|
"store_dtb=tftp ${loadaddr} at91-vinco.dtb; run f2blk_size;" \
|
|
"setexpr dtb_blksize ${fileblksize};" \
|
|
"setexpr dtb_offset ${dtb_start} / ${mmcblksize};" \
|
|
"mmc write ${fileaddr} ${dtb_offset} ${fileblksize}\0" \
|
|
"store_rootfs=tftp ${loadaddr} vinco-gateway-image-vinco.ext4;" \
|
|
"setexpr rootfs_offset ${rootfs_start} / ${mmcblksize};" \
|
|
"mmc write ${fileaddr} ${rootfs_offset} ${fileblksize}\0" \
|
|
"bootdelay=0\0"
|
|
|
|
#endif
|
|
|
|
#endif
|