diff options
| author | Tom Rini <[email protected]> | 2025-01-08 18:05:51 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-01-08 18:05:51 -0600 |
| commit | e13e0a921f444cc12127c8a497dcc476f1268939 (patch) | |
| tree | 19ecf26e4ddc96357f74edc6e7557995de7c0477 /api | |
| parent | 3bfd12008bef1a8353e7ceaca2cb06cf388527ed (diff) | |
| parent | 9c6c7e30aa006a3eab52302e5399f5eb592184ed (diff) | |
Merge tag 'efi-next-20250105' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-next-20250105
Documentation:
* doc: develop: Fix typos and wording in binman/binman.rst
* doc: develop: Fix typos and wording in gdb.rst
* doc: sandbox: Fix the "sb" command name
* doc/develop/distro.rst: Better document upstream definition of extlinux.conf
UEFI:
* efi_loader: avoid writing message in Exit() boot service
* efi_loader: update EFI specification version
* cmd: efidebug: update output of memory attributes
* efi_loader: Don't warn if the TCG2 FinalEvents table is not installed
* cmd: bootmenu: add parameter -e for UEFI boot options
* efi_loader: Update startimage_exit self-test to check error
* efi: Correct ECPT table GUID
Others:
Building the API demo application for riscv64 is supported.
* API: unify platform_sys_info() implementations
* examples: implement _start and syscall for RISC-V
* examples: use architecture specific memset() on RISC-V
* examples: use QEMU compatible LOAD_ADDR on RISC-V
* test: fix test_extension.py
* configs: sandbox_deconfig: remove CONFIG_AMIGA_PARTITION
* CI: xilinx_versal_virt: disable USB_DWC3
* net: eth_bootdev_hunt() should not run DHCP
Diffstat (limited to 'api')
| -rw-r--r-- | api/Makefile | 9 | ||||
| -rw-r--r-- | api/api_platform-arm.c | 35 | ||||
| -rw-r--r-- | api/api_platform-mips.c | 29 | ||||
| -rw-r--r-- | api/api_platform.c | 25 |
4 files changed, 31 insertions, 67 deletions
diff --git a/api/Makefile b/api/Makefile index bd2d035fcdb..ce3de6b6a1c 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,8 +1,11 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 Semihalf obj-y += api.o api_display.o api_net.o api_storage.o -obj-$(CONFIG_ARM) += api_platform-arm.o + +ifeq (CONFIG_PPC,y) obj-$(CONFIG_PPC) += api_platform-powerpc.o -obj-$(CONFIG_MIPS) += api_platform-mips.o +else +obj-y += api_platform.o +endif diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c deleted file mode 100644 index 9afba66c244..00000000000 --- a/api/api_platform-arm.c +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2007 Semihalf - * - * Written by: Rafal Jaworowski <[email protected]> - * - * This file contains routines that fetch data from ARM-dependent sources - * (bd_info etc.) - */ - -#include <config.h> -#include <linux/types.h> -#include <api_public.h> - -#include <asm/global_data.h> - -#include "api_private.h" - -DECLARE_GLOBAL_DATA_PTR; - -/* - * Important notice: handling of individual fields MUST be kept in sync with - * include/asm-arm/u-boot.h and include/asm-arm/global_data.h, so any changes - * need to reflect their current state and layout of structures involved! - */ -int platform_sys_info(struct sys_info *si) -{ - int i; - - for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) - platform_set_mr(si, gd->bd->bi_dram[i].start, - gd->bd->bi_dram[i].size, MR_ATTR_DRAM); - - return 1; -} diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c deleted file mode 100644 index 262b35a2777..00000000000 --- a/api/api_platform-mips.c +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2007 Stanislav Galabov <[email protected]> - * - * This file contains routines that fetch data from bd_info sources - */ - -#include <config.h> -#include <linux/types.h> -#include <api_public.h> - -#include <asm/global_data.h> - -#include "api_private.h" - -DECLARE_GLOBAL_DATA_PTR; - -/* - * Important notice: handling of individual fields MUST be kept in sync with - * include/asm-generic/u-boot.h, so any changes - * need to reflect their current state and layout of structures involved! - */ -int platform_sys_info(struct sys_info *si) -{ - - platform_set_mr(si, gd->ram_base, gd->ram_size, MR_ATTR_DRAM); - - return 1; -} diff --git a/api/api_platform.c b/api/api_platform.c new file mode 100644 index 00000000000..7a789bd2016 --- /dev/null +++ b/api/api_platform.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (C) Copyright 2007 Semihalf + * + * Written by: Rafal Jaworowski <[email protected]> + * + * This file contains a routine to fetch data from the global_data structure. + */ + +#include <api_public.h> +#include <asm/global_data.h> +#include "api_private.h" + +DECLARE_GLOBAL_DATA_PTR; + +int platform_sys_info(struct sys_info *si) +{ + int i; + + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) + platform_set_mr(si, gd->bd->bi_dram[i].start, + gd->bd->bi_dram[i].size, MR_ATTR_DRAM); + + return 1; +} |
