diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-25 16:55:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-25 16:55:59 -0400 |
| commit | 544dfc3c88f99aba0b23073d07182615658b4819 (patch) | |
| tree | 72d50ff97f4f4a6b0079e761566f6ff2c7932622 /arch | |
| parent | ad1c9b26a86bdccf6a10e3369b1009cde2b04365 (diff) | |
| parent | fa5977103978aa1998aa7b9ffe9cf495451cbbe1 (diff) | |
Merge branch '2023-07-25-assorted-general-updates'
- A number of MAINTAINER file updates, assorted driver/platform fixes,
performance improvements for sparse file writes, and 64bit time_t.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 15 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/utils.c | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bdd535fd73f..97c25b4f146 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -357,7 +357,7 @@ config SYS_ARM_ARCH choice prompt "Select the ARM data write cache policy" - default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || TARGET_BCMNS || RZA1 + default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMNS || RZA1 default SYS_ARM_CACHE_WRITEBACK config SYS_ARM_CACHE_WRITEBACK @@ -668,19 +668,6 @@ config TARGET_VEXPRESS_CA9X4 select CPU_V7A select PL011_SERIAL -config TARGET_BCMCYGNUS - bool "Support bcmcygnus" - select CPU_V7A - select GPIO_EXTRA_HEADER - select IPROC - imply BCM_SF2_ETH - imply BCM_SF2_ETH_GMAC - imply CMD_HASH - imply CRC32_VERIFY - imply FAT_WRITE - imply HASH_VERIFY - imply NETDEVICES - config TARGET_BCMNS bool "Support Broadcom Northstar" select CPU_V7A diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 6e6791fc659..7d938724f84 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -100,8 +100,7 @@ static u32 omap_mmc_get_part_size(const char *part) return 0; } - /* Check only for EFI (GPT) partition table */ - res = part_get_info_by_name_type(dev_desc, part, &info, PART_TYPE_EFI); + res = part_get_info_by_name(dev_desc, part, &info); if (res < 0) return 0; |