From 1a4596601fd395f3afb8f82f3f840c5e00bdd57a Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Mon, 8 Jul 2013 09:37:19 +0200 Subject: Add GPL-2.0+ SPDX-License-Identifier to source files Signed-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini --- include/configs/highbank.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'include/configs/highbank.h') diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 62cc08cebd..e7459c179b 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -1,18 +1,7 @@ /* * Copyright 2010-2011 Calxeda, Inc. * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H -- cgit From 185a5bb0f5bd4666913932cc4c4d6ffa6dd7b34b Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 12 Jun 2013 22:24:47 -0500 Subject: ARM: highbank: update config options Various changes to highbank config: Enable EFI partitions Enable ext4 and FAT filesystems Enable bootz command and raw initrd Increase cmd and print buffer size to 1K Change serial baudrate to 115200 Enable hush shell Signed-off-by: Rob Herring --- include/configs/highbank.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'include/configs/highbank.h') diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 62cc08cebd..5e5d8e6b1f 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -18,7 +18,9 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_DCACHE_OFF #define CONFIG_L2_OFF +#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_NO_FLASH #define CFG_HZ 1000 @@ -26,6 +28,7 @@ #define CONFIG_OF_LIBFDT #define CONFIG_FIT +#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* @@ -38,7 +41,7 @@ #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 38400 +#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_SINGLEWORD @@ -54,6 +57,7 @@ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_DOS_PARTITION +#define CONFIG_EFI_PARTITION #define CONFIG_CALXEDA_XGMAC @@ -68,12 +72,15 @@ #include #define CONFIG_CMD_BDI +#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_MEMORY #define CONFIG_CMD_LOADS #define CONFIG_CMD_SCSI #define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_FAT #define CONFIG_CMD_PXE #define CONFIG_MENU @@ -84,15 +91,18 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PROMPT "Highbank #" +#define CONFIG_SYS_HUSH_PARSER /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_LOAD_ADDR 0x800000 +#define CONFIG_SYS_64BIT_LBA + /*----------------------------------------------------------------------- * Physical Memory Map -- cgit From e1df283c26f14776419bff675b7887cf04bc1c20 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 12 Jun 2013 22:24:51 -0500 Subject: ARM: highbank: enable reset on command timeout Enable resetting on command timeout. The timeout is set with environment setting bootretry. Signed-off-by: Rob Herring --- include/configs/highbank.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/configs/highbank.h') diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 5e5d8e6b1f..9bf56c7ea1 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -85,6 +85,9 @@ #define CONFIG_MENU #define CONFIG_BOOTDELAY 2 +#define CONFIG_BOOT_RETRY_TIME -1 +#define CONFIG_RESET_TO_RETRY + /* * Miscellaneous configurable options */ -- cgit From 76c3999db439491a406cd6e7778300c992cda785 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 12 Jun 2013 22:24:52 -0500 Subject: ARM: highbank: setup peripherals based on power domain status Accessing powered down peripherals will hang the bus, so check power domain status before initializing SATA and fixup the FDT to disable unused peripherals. Signed-off-by: Rob Herring --- include/configs/highbank.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/configs/highbank.h') diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 9bf56c7ea1..e01d4bb298 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -27,6 +27,7 @@ #define CONFIG_SYS_HZ CFG_HZ #define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP #define CONFIG_FIT #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_SYS_BOOTMAPSZ (16 << 20) -- cgit From 76116f29ee846bb5c8106cb580408fe4beab66f1 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 12 Jun 2013 22:24:54 -0500 Subject: highbank: enable keyed autoboot stop Restrict autoboot interruption to "s" or "d" keys. This will prevent some unwanted stopping and also allow disabling the reset on command timeout. Signed-off-by: Rob Herring --- include/configs/highbank.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/configs/highbank.h') diff --git a/include/configs/highbank.h b/include/configs/highbank.h index e01d4bb298..5710be5bf6 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -88,6 +88,8 @@ #define CONFIG_BOOTDELAY 2 #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds...\nPress to stop or to delay\n", bootdelay /* * Miscellaneous configurable options -- cgit