diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-13 09:01:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-13 09:01:01 -0400 |
| commit | f9e3d2e147ee3b18dbc09e56d13e6fc8758ac375 (patch) | |
| tree | bd93f43be8a3ea14724aeb5686fbdcb80125623e /include | |
| parent | 8a1292ce3e21205645a155b23ac083a3fc6b64c1 (diff) | |
| parent | cea8f2c995b9d87af6ef42f967402e1c8a3506db (diff) | |
| download | u-boot-f9e3d2e147ee3b18dbc09e56d13e6fc8758ac375.zip u-boot-f9e3d2e147ee3b18dbc09e56d13e6fc8758ac375.tar.gz u-boot-f9e3d2e147ee3b18dbc09e56d13e6fc8758ac375.tar.bz2 | |
Merge tag 'dm-pull-12jun20' of git://git.denx.de/u-boot-dm into next
patman improvements to allow it to work with Zephyr
change to how sequence numbers are assigned to devices
minor fixes and improvements
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/display5.h | 7 | ||||
| -rw-r--r-- | include/configs/imx8mp_evk.h | 12 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 6 | ||||
| -rw-r--r-- | include/dm/read.h | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/include/configs/display5.h b/include/configs/display5.h index 2e5dbfe..3348ecc 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -28,9 +28,10 @@ * 0x020000 - 0x120000 : SPI.u-boot (1MiB) * 0x120000 - 0x130000 : SPI.u-boot-env1 (64KiB) * 0x130000 - 0x140000 : SPI.u-boot-env2 (64KiB) - * 0x140000 - 0x540000 : SPI.swupdate-kernel-FIT (4MiB) - * 0x540000 - 0x1540000 : SPI.swupdate-initramfs (16MiB) - * 0x1540000 - 0x1640000 : SPI.factory (1MiB) + * 0x140000 - 0x740000 : SPI.swupdate-kernel-FIT (6MiB) + * 0x740000 - 0x1B40000 : SPI.swupdate-initramfs (20MiB) + * 0x1B40000 - 0x1F00000 : SPI.reserved (3840KiB) + * 0x1F00000 - 0x2000000 : SPI.factory (1MiB) */ /* SPI Flash Configs */ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index b346154..7f38f21 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -24,16 +24,14 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" -#define CONFIG_SPL_STACK 0x990000 -#define CONFIG_SPL_BSS_START_ADDR 0x0095e000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ +#define CONFIG_SPL_STACK 0x960000 +#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 +#define CONFIG_SPL_BSS_MAX_SIZE 0x400 /* 1 KB */ +#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_MALLOC_F_ADDR 0x940000 - #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #undef CONFIG_DM_MMC diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2a81f3a..528187e 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -94,9 +94,9 @@ #endif #define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \ - "eth1addr=00:00:11:22:33:45\0" \ - "eth3addr=00:00:11:22:33:46\0" \ - "eth5addr=00:00:11:22:33:47\0" \ + "eth3addr=00:00:11:22:33:45\0" \ + "eth5addr=00:00:11:22:33:46\0" \ + "eth6addr=00:00:11:22:33:47\0" \ "ipaddr=1.2.3.4\0" #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/dm/read.h b/include/dm/read.h index b952551..1c1bc37 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -983,6 +983,8 @@ static inline u64 dev_translate_dma_address(const struct udevice *dev, static inline int dev_read_alias_highest_id(const char *stem) { + if (!CONFIG_IS_ENABLED(OF_LIBFDT)) + return -1; return fdtdec_get_alias_highest_id(gd->fdt_blob, stem); } |