From: Troy Kisky <troykiskyboundary@gmail.com>
To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de
Cc: gary.bisson@lairdconnect.com,
Troy Kisky <troykiskyboundary@gmail.com>,
Marek Vasut <marex@denx.de>, Stefan Roese <sr@denx.de>
Subject: [PATCH v1 02/24] lib: crc32: prepare for CONFIG_IS_ENABLED changes
Date: Tue, 21 Feb 2023 17:37:59 -0800 [thread overview]
Message-ID: <20230222013821.1144691-3-troykiskyboundary@gmail.com> (raw)
In-Reply-To: <20230222013821.1144691-1-troykiskyboundary@gmail.com>
We need to include <linux/kconfig.h> in order to include
files that use CONFIG_IS_ENABLED. TO prepare for that
be more direct with using defined(USE_HOSTCC).
Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com>
---
lib/crc32.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/crc32.c b/lib/crc32.c
index aa94d70ef3e..b2fa9e06e55 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -11,14 +11,18 @@
#ifdef USE_HOSTCC
#include <arpa/inet.h>
#include <u-boot/crc.h>
+#include <linux/kconfig.h>
#else
#include <common.h>
#include <efi_loader.h>
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+#define PET_WDG
+#endif
#endif
#include <compiler.h>
#include <u-boot/crc.h>
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+#ifdef PET_WDG
#include <watchdog.h>
#endif
#include "u-boot/zlib.h"
@@ -84,7 +88,7 @@ static void __efi_runtime make_crc_table(void)
}
crc_table_empty = 0;
}
-#elif !defined(CONFIG_ARM64_CRC32)
+#elif !defined(CONFIG_ARM64_CRC32) || defined(USE_HOSTCC)
/* ========================================================================
* Table of CRC-32's of all single-byte values (made by make_crc_table)
*/
@@ -184,7 +188,7 @@ const uint32_t * ZEXPORT get_crc_table()
*/
uint32_t __efi_runtime crc32_no_comp(uint32_t crc, const Bytef *buf, uInt len)
{
-#ifdef CONFIG_ARM64_CRC32
+#if defined(CONFIG_ARM64_CRC32) && !defined(USE_HOSTCC)
crc = cpu_to_le32(crc);
while (len--)
crc = __builtin_aarch64_crc32b(crc, *buf++);
@@ -243,7 +247,7 @@ uint32_t __efi_runtime crc32(uint32_t crc, const Bytef *p, uInt len)
uint32_t crc32_wd(uint32_t crc, const unsigned char *buf, uInt len,
uInt chunk_sz)
{
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+#ifdef PET_WDG
const unsigned char *end, *curr;
int chunk;
--
2.34.1
next prev parent reply other threads:[~2023-02-22 1:39 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-22 1:37 [PATCH v1 00/24] CONFIG_IS_ENABLED vs IS_ENABLED Troy Kisky
2023-02-22 1:37 ` [PATCH v1 01/24] cmd: nvedit: check for ENV_SUPPORT Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:37 ` Troy Kisky [this message]
2023-02-22 21:19 ` [PATCH v1 02/24] lib: crc32: prepare for CONFIG_IS_ENABLED changes Simon Glass
2023-02-22 1:38 ` [PATCH v1 03/24] lib: md5: " Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 04/24] lib: sha1: " Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 05/24] lib: sha256: " Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 22:42 ` Troy Kisky
2023-02-22 1:38 ` [PATCH v1 06/24] lib: sha512: " Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 07/24] tools: prevent CONFIG_IS_ENABLED errors by including linux/kconfig.h Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 08/24] tools: Makefile: prepare for CONFIG_IS_ENABLED changes by adding CONFIG_TOOLS_xxx Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 09/24] x86: cpu: qemu: qemu: remove SPL use with CONFIG_IS_ENABLED Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 10/24] config_distro_bootcmd: remove booting environment variables from SPL environment Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 11/24] ofnode: fdt_support definitions needed if OF_CONTROL is enabled Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 12/24] ringneck-px30: remove check for ENV_IS_NOWHERE, it is an SPL config Troy Kisky
2023-02-22 14:45 ` Quentin Schulz
2023-02-22 15:03 ` Tom Rini
2023-02-22 1:38 ` [PATCH v1 13/24] puma-rk3399: " Troy Kisky
2023-02-22 21:19 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 14/24] fdt_support: always define fdt_fixup_mtdparts Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 15/24] m53menlo: define ft_board_setup only if CONFIG_IS_ENABLED(OF_LIBFDT) Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 16/24] freescale: common: pfuze: define pfuze_mode_init only if defined(CONFIG_DM_PMIC) Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 17/24] ns16550: match when to define bdf with uart code Troy Kisky
2023-02-22 18:18 ` Tom Rini
2023-02-22 18:42 ` Troy Kisky
2023-02-22 19:16 ` Simon Glass
2023-02-22 19:39 ` Troy Kisky
2023-02-22 20:41 ` Troy Kisky
2023-02-22 21:06 ` Troy Kisky
2023-02-22 21:16 ` Simon Glass
2023-02-22 20:56 ` Simon Glass
[not found] ` <CAO46J5WM4yLmbYesfXFeRVYU-7TC=KOPxpBte6=rt9Uh0qF3vw@mail.gmail.com>
[not found] ` <CAPnjgZ1jJuwwZ4FAspkhsxwK5RAQiDxtHDkygvwOOtHVFGFiJQ@mail.gmail.com>
[not found] ` <CAO46J5XsyQpR57-WA6Q==9wkQLsgwJ+qpsJQxnVt4=GZJ+Ysyg@mail.gmail.com>
2023-02-23 2:48 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 18/24] solidrun: mx6cuboxi: use CONFIG_IS_ENABLED(SATA) instead of CONFIG_CMD_SATA Troy Kisky
2023-02-22 16:59 ` Tom Rini
2023-02-22 18:13 ` Troy Kisky
2023-02-24 1:19 ` Troy Kisky
2023-02-22 1:38 ` [PATCH v1 19/24] arm: mach-imx: use CONFIG_$(SPL_)SATA instead of CONFIG_SATA Troy Kisky
2023-02-22 15:05 ` Tom Rini
2023-02-23 19:23 ` Troy Kisky
2023-02-23 22:20 ` Tom Rini
2023-02-23 23:07 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 20/24] x86: cpu: i386: cpu: only set pci_ram_top if CONFIG_IS_ENABLED(PCI) Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 21/24] gateworks: venice: surround call of setup_fec with if IS_ENABLED(CONFIG_NET) Troy Kisky
2023-02-22 15:07 ` Tom Rini
2023-02-22 1:38 ` [PATCH v1 22/24] power: pmic: add dm style definitions if not CONFIG_IS_ENABLED(POWER_LEGACY) Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 23/24] arm: cpu: armv7: ls102xa: fdt: remove eth_device support Troy Kisky
2023-02-22 21:20 ` Simon Glass
2023-02-22 1:38 ` [PATCH v1 24/24] CI: add test/usage_of_is_enabled_check.sh Troy Kisky
2023-02-22 21:20 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230222013821.1144691-3-troykiskyboundary@gmail.com \
--to=troykiskyboundary@gmail.com \
--cc=gary.bisson@lairdconnect.com \
--cc=marex@denx.de \
--cc=sjg@chromium.org \
--cc=sr@denx.de \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.