diff options
| author | Tom Rini | 2022-04-19 17:02:21 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-04-19 17:06:01 -0400 |
| commit | 246e03476ba325051600017b552460d7f37c3191 (patch) | |
| tree | 7014c270d3f00cf9f5dc820876726efc1ee78ab0 /board | |
| parent | 9acf3726b654d06c50c07c3f45da9eb1cbbadf34 (diff) | |
| parent | b8a79164674230f401f696f7eb09315ad02199b5 (diff) | |
Merge branch '2022-04-19-assorted-updates'
- Migrate CONFIG_SYS_MEM_TOP_HIDE to Kconfig, IOMUX bugfix, 2 BTRFS
bugfixes, update .gitignore and .mailmap files, aspeed GPIO bugfix,
image-fit and squashfs code cleanups, enable EXT4 and ISO partitions on
DeveloperBox.
- populate u-boot,bootconf under /chosen, see
https://github.com/devicetree-org/dt-schema/pull/71 for corresponding
change
Diffstat (limited to 'board')
| -rw-r--r-- | board/samsung/common/board.c | 4 | ||||
| -rw-r--r-- | board/xilinx/versal/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/xilinx/zynqmp_r5/MAINTAINERS | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 97791aaeffe..ff178b7fe67 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -107,9 +107,9 @@ int board_init(void) } boot_temp_check(); #endif -#ifdef CONFIG_TZSW_RESERVED_DRAM_SIZE +#if CONFIG_VAL(SYS_MEM_TOP_HIDE) /* The last few MB of memory can be reserved for secure firmware */ - ulong size = CONFIG_TZSW_RESERVED_DRAM_SIZE; + ulong size = CONFIG_SYS_MEM_TOP_HIDE; gd->ram_size -= size; gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size; diff --git a/board/xilinx/versal/MAINTAINERS b/board/xilinx/versal/MAINTAINERS index bbab0513666..a13b6566164 100644 --- a/board/xilinx/versal/MAINTAINERS +++ b/board/xilinx/versal/MAINTAINERS @@ -1,5 +1,5 @@ XILINX_VERSAL BOARDS -M: Michal Simek <michal.simek@xilinx.com> +M: Michal Simek <michal.simek@amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/dts/versal* diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS index 56c637943f6..17a2766413c 100644 --- a/board/xilinx/zynqmp/MAINTAINERS +++ b/board/xilinx/zynqmp/MAINTAINERS @@ -1,5 +1,5 @@ XILINX_ZYNQMP BOARDS -M: Michal Simek <michal.simek@xilinx.com> +M: Michal Simek <michal.simek@amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/dts/zynqmp-* diff --git a/board/xilinx/zynqmp_r5/MAINTAINERS b/board/xilinx/zynqmp_r5/MAINTAINERS index ac267649781..aa50e6dae5f 100644 --- a/board/xilinx/zynqmp_r5/MAINTAINERS +++ b/board/xilinx/zynqmp_r5/MAINTAINERS @@ -1,5 +1,5 @@ XILINX_ZYNQMP_R5 BOARDS -M: Michal Simek <michal.simek@xilinx.com> +M: Michal Simek <michal.simek@amd.com> S: Maintained F: arch/arm/dts/zynqmp-r5* F: board/xilinx/zynqmp_r5/ |