From db5f1a50eff8cadd463cebd4448e00a9a2934f40 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 10 Feb 2021 17:29:16 +0000 Subject: config: hikey: convert to DM_USB and DM_ETH Convert the hikey to use DM_USB and DM_ETH. Conversion based on rpi as it has a similar DWC config. Signed-off-by: Peter Robinson --- include/configs/hikey.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/hikey.h b/include/configs/hikey.h index a323a0bf69b..659fbee052d 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -47,9 +47,7 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_DWC2_REG_ADDR 0xF72C0000 -/*#define CONFIG_DWC2_DFLT_SPEED_FULL*/ +#ifdef CONFIG_USB_DWC2 #define CONFIG_DWC2_ENABLE_DYNAMIC_FIFO #endif -- cgit v1.2.3 From c6bf4f38988996f12c69a1cb5470bf9bea7c88ce Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 10 Feb 2021 18:59:21 +0100 Subject: malloc: adjust memcpy() and memset() definitions. Compiling the sandbox fails on armv7 due to conflicting definitions of memcpy() and memset() in include/malloc.h and include/linux/string.h. Use linux/string.h here. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/malloc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/malloc.h b/include/malloc.h index f66c2e86176..e15e528a2e3 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -361,8 +361,11 @@ extern "C" { #if (__STD_C || defined(HAVE_MEMCPY)) #if __STD_C +/* U-Boot defines memset() and memcpy in /include/linux/string.h void* memset(void*, int, size_t); void* memcpy(void*, const void*, size_t); +*/ +#include #else #ifdef WIN32 /* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */ -- cgit v1.2.3 From 9abe5e68033dab0d521475090ffd0cef9cb2c581 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Mon, 15 Feb 2021 07:27:57 +0000 Subject: vexpress64_fvp: Set DRAM to 4G to match with kernel devicetree Currently, the kernel devicetree is setting the DRAM size to ~4G. Signed-off-by: Diego Sueiro --- include/configs/vexpress_aemv8a.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 566bee5b87b..7318fb6c585 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -117,6 +117,9 @@ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO #define PHYS_SDRAM_2 (0x880000000) #define PHYS_SDRAM_2_SIZE 0x180000000 +#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP && CONFIG_NR_DRAM_BANKS == 2 +#define PHYS_SDRAM_2 (0x880000000) +#define PHYS_SDRAM_2_SIZE 0x80000000 #endif /* Enable memtest */ -- cgit v1.2.3 From bc18f31e4a3f13e09b6e9d04b282c2579b519ebf Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 17 Feb 2021 12:54:31 +0100 Subject: lib: rsa: struct udevice build warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid build warnings observed with gcc 10.2 In file included from lib/rsa/rsa-keyprop.c:16: include/u-boot/rsa-mod-exp.h:65:24: warning: ‘struct udevice’ declared inside parameter list will not be visible outside of this definition or declaration 65 | int rsa_mod_exp(struct udevice *dev, const uint8_t *sig, | uint32_t sig_len, | ^~~~~~~ include/u-boot/rsa-mod-exp.h:96:24: warning: ‘struct udevice’ declared inside parameter list will not be visible outside of this definition or declaration 96 | int (*mod_exp)(struct udevice *dev, const uint8_t *sig, | by defining struct udevice. Fixes: 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/u-boot/rsa-mod-exp.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h index 7b7c2915a94..fc9557c7819 100644 --- a/include/u-boot/rsa-mod-exp.h +++ b/include/u-boot/rsa-mod-exp.h @@ -9,6 +9,8 @@ #include #include +struct udevice; + /** * struct key_prop - holder for a public key properties * -- cgit v1.2.3