diff options
author | Patrick Georgi <pgeorgi@google.com> | 2019-11-22 16:55:58 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2021-07-13 20:28:14 +0000 |
commit | 53ea1d44f0435ca419de04e275e08b1bd296922c (patch) | |
tree | c1a3a39c36e9b53d0129f0e24a9a032bfea066ca /util/kconfig/patches/0004-src-util-Use-NULL-instead-of-0-for-pointer.patch | |
parent | 8585eabc5d5b516f46b2980a40b25f49eef5e056 (diff) |
util/kconfig: Uprev to Linux 5.13's kconfig
This was originally several commits that had to be squashed into one
because the intermediate states weren't able to build coreboot:
- one to remove everything that wasn't our own code, leaving only
regex.[ch], toada.c, description.md and Makefile.inc.
- one to copy in Linux 5.13's scripts/kconfig and adapt Makefile.inc
to make the original Makefile work again.
- adapt abuild to use olddefconfig, simplifying matters.
- apply patches in util/kconfig/patches.
- Some more adaptations to the libpayload build system.
The patches are now in util/kconfig/patches/, reverse applying them
should lead to a util/kconfig/ tree that contains exactly the Linux
version + our own 5 files.
Change-Id: Ia0e8fe4e9022b278f34ab113a433ef4d45e5c355
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37152
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'util/kconfig/patches/0004-src-util-Use-NULL-instead-of-0-for-pointer.patch')
-rw-r--r-- | util/kconfig/patches/0004-src-util-Use-NULL-instead-of-0-for-pointer.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/util/kconfig/patches/0004-src-util-Use-NULL-instead-of-0-for-pointer.patch b/util/kconfig/patches/0004-src-util-Use-NULL-instead-of-0-for-pointer.patch new file mode 100644 index 0000000000..f451b58282 --- /dev/null +++ b/util/kconfig/patches/0004-src-util-Use-NULL-instead-of-0-for-pointer.patch @@ -0,0 +1,46 @@ +From e8287a030fc8fcec7404aa6731aef21a48035786 Mon Sep 17 00:00:00 2001 +From: Elyes HAOUAS <ehaouas@noos.fr> +Date: Tue, 5 Jun 2018 08:41:29 +0200 +Subject: [PATCH] {src,util}: Use NULL instead of 0 for pointer + +Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> +--- + util/kconfig/lxdialog/util.c | 2 +- + util/kconfig/qconf.h | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: kconfig/lxdialog/util.c +=================================================================== +--- kconfig.orig/lxdialog/util.c ++++ kconfig/lxdialog/util.c +@@ -370,7 +370,7 @@ void print_autowrap(WINDOW * win, const + { + int newl, cur_x, cur_y; + int prompt_len, room, wlen; +- char tempstr[MAX_LEN + 1], *word, *sp, *sp2, *newline_separator = 0; ++ char tempstr[MAX_LEN + 1], *word, *sp, *sp2, *newline_separator = NULL; + + strcpy(tempstr, prompt); + +Index: kconfig/qconf.h +=================================================================== +--- kconfig.orig/qconf.h ++++ kconfig/qconf.h +@@ -42,7 +42,7 @@ class ConfigList : public QTreeWidget { + Q_OBJECT + typedef class QTreeWidget Parent; + public: +- ConfigList(QWidget *parent, const char *name = 0); ++ ConfigList(QWidget *parent, const char *name = NULL); + ~ConfigList(); + void reinit(void); + ConfigItem* findConfigItem(struct menu *); +@@ -188,7 +188,7 @@ class ConfigInfoView : public QTextBrows + typedef class QTextBrowser Parent; + QMenu *contextMenu; + public: +- ConfigInfoView(QWidget* parent, const char *name = 0); ++ ConfigInfoView(QWidget* parent, const char *name = NULL); + bool showDebug(void) const { return _showDebug; } + + public slots: |