diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
| commit | 53e0fef5a74ac10618da083a01bbf97b4387a3dd (patch) | |
| tree | 2e3d22c903796c967a4855a27f996b7705603c74 /include | |
| parent | cbe607b920bc0827d8fe379ed4f5ae4e2058513e (diff) | |
| parent | 2f7aa89703738b0c37e34120319bab567a8672bd (diff) | |
Merge branch '2021-02-24-assorted-fixes'
- squashfs, btrfs fixes
- Kconfig CONFIG logic fixes
- hikey DM migration
- Some portability fixes for the build system
- Assorted code cleanups
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/hikey.h | 4 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8a.h | 3 | ||||
| -rw-r--r-- | include/malloc.h | 3 | ||||
| -rw-r--r-- | include/u-boot/rsa-mod-exp.h | 2 |
4 files changed, 9 insertions, 3 deletions
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 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 */ 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 <linux/string.h> #else #ifdef WIN32 /* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */ 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 <errno.h> #include <image.h> +struct udevice; + /** * struct key_prop - holder for a public key properties * |