From 1af3e71972a62a363c24eace8b4f121c8baef75d Mon Sep 17 00:00:00 2001 From: Jim Liu Date: Mon, 23 Oct 2023 15:02:23 +0800 Subject: configs: npcm: Support more uart baud rate Add uart baud rate table to arbel(npcm8xx) and poleg(npcm7xx) Signed-off-by: Jim Liu [trini: Rework slightly] Signed-off-by: Tom Rini --- include/configs/arbel.h | 6 +++++- include/configs/poleg.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/arbel.h b/include/configs/arbel.h index 891257bc93a..576ee37ee4a 100644 --- a/include/configs/arbel.h +++ b/include/configs/arbel.h @@ -7,11 +7,15 @@ #define __CONFIG_ARBEL_H #define CFG_SYS_SDRAM_BASE 0x0 -#define CFG_SYS_BOOTMAPSZ (30 << 20) +#define CFG_SYS_BOOTMAPSZ (128 << 20) #define CFG_SYS_BOOTM_LEN (20 << 20) #define CFG_SYS_INIT_RAM_ADDR CFG_SYS_SDRAM_BASE #define CFG_SYS_INIT_RAM_SIZE 0x8000 +#define CFG_SYS_BAUDRATE_TABLE \ + { 9600, 14400, 19200, 38400, 57600, 115200, 230400, 380400, 460800, 921600 } + + /* Default environemnt variables */ #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80400000\0" \ "stdin=serial\0" \ diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 1e96e838be4..2a2d85c8ec6 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -13,6 +13,8 @@ #define CFG_SYS_BOOTMAPSZ (0x30 << 20) #define CFG_SYS_SDRAM_BASE 0x0 +#define CFG_SYS_BAUDRATE_TABLE { 57600, 115200, 230400, 460800 } + /* Default environemnt variables */ #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ -- cgit v1.3.1 From a248c1a0035ac43dda432a7d482a9ce0dd2f206d Mon Sep 17 00:00:00 2001 From: Masahisa Kojima Date: Wed, 25 Oct 2023 15:51:01 +0900 Subject: board: developerbox: remove obsolete NOR flash layout definition There are two kinds of NOR flash layout for the Developerbox. Capsule update for the old layout is no longer available since it has small capacity for secure world images and can not house the TA such as fTPM. This commit removes the definition related to the obsolete NOR flash layout for the UEFI capsule update. Signed-off-by: Masahisa Kojima Acked-by: Jassi Brar Reviewed-by: Ilias Apalodimas --- include/configs/synquacer.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'include') diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index cd7359c2f8a..e36e63e81e4 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -40,20 +40,6 @@ /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */ -#ifdef CONFIG_FWU_MULTI_BANK_UPDATE -#define DEFAULT_DFU_ALT_INFO -#else -#define DEFAULT_DFU_ALT_INFO "dfu_alt_info=" \ - "mtd nor1=u-boot.bin raw 200000 100000;" \ - "fip.bin raw 180000 78000;" \ - "optee.bin raw 500000 100000\0" -#endif - -/* GUIDs for capsule updatable firmware images */ -#define DEVELOPERBOX_UBOOT_IMAGE_GUID \ - EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \ - 0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00) - #ifdef CONFIG_FWU_MULTI_BANK_UPDATE #define DEVELOPERBOX_FIP_IMAGE_GUID \ EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \ @@ -64,10 +50,6 @@ 0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98) #endif -#define DEVELOPERBOX_OPTEE_IMAGE_GUID \ - EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \ - 0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30) - /* Distro boot settings */ #ifdef CONFIG_CMD_USB #define BOOT_TARGET_DEVICE_USB(func) func(USB, usb, 0) @@ -107,7 +89,6 @@ "ramdisk_addr_r=0xa0000000\0" \ "scriptaddr=0x88000000\0" \ "pxefile_addr_r=0x88100000\0" \ - DEFAULT_DFU_ALT_INFO \ BOOTENV #endif /* __CONFIG_H */ -- cgit v1.3.1 From 2dff8df1ad6bc8a89758d516c1df823abce34212 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 26 Oct 2023 13:50:50 +0100 Subject: corstone1000: enable distro booting command enable distro_bootcmd Signed-off-by: Abdellatif El Khlifi Signed-off-by: Rui Miguel Silva --- include/configs/corstone1000.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h index 3347c11792d..3ada21cbba1 100644 --- a/include/configs/corstone1000.h +++ b/include/configs/corstone1000.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * (C) Copyright 2022 ARM Limited + * Copyright 2022-2023 Arm Limited and/or its affiliates * (C) Copyright 2022 Linaro * Rui Miguel Silva * Abdellatif El Khlifi @@ -29,5 +29,6 @@ #include +#define CFG_EXTRA_ENV_SETTINGS BOOTENV #endif -- cgit v1.3.1