| Message ID | 20200915093206.14902-1-bage@linutronix.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | bootloader: remove cruft | expand |
On 15.09.20 11:32, bage@linutronix.de wrote: > From: Bastian Germann <bage@linutronix.de> > > 82a157e35e9d ("bootloader: drop suppport for legacy U-Boot tools") removed > the legacy U-Boot support. Also remove the still remaining header. > > Signed-off-by: Bastian Germann <bage@linutronix.de> > --- > bootloader/uboot.c | 1 - > bootloader/uboot.h | 27 --------------------------- > 2 files changed, 28 deletions(-) > delete mode 100644 bootloader/uboot.h > > diff --git a/bootloader/uboot.c b/bootloader/uboot.c > index cf5d26f..d5aa630 100644 > --- a/bootloader/uboot.c > +++ b/bootloader/uboot.c > @@ -16,7 +16,6 @@ > #include <sys/file.h> > #include <dirent.h> > #include "generated/autoconf.h" > -#include "uboot.h" > #include "util.h" > #include "bootloader.h" > > diff --git a/bootloader/uboot.h b/bootloader/uboot.h > deleted file mode 100644 > index 4059678..0000000 > --- a/bootloader/uboot.h > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* > - * (C) Copyright 2002-2008 > - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. > - * > - * SPDX-License-Identifier: GPL-2.0-or-later > - */ > - > -#include <stdint.h> > - > -#define AES_KEY_LENGTH (128 / 8) > - > -struct env_opts { > - char *config_file; > - int aes_flag; /* Is AES encryption used? */ > - uint8_t aes_key[AES_KEY_LENGTH]; > -}; > - > -extern struct env_opts *fw_env_opts; > - > -int fw_parse_script(char *fname, struct env_opts *opts); > -char *fw_getenv(char *name); > -int fw_env_open(struct env_opts *opts); > -int fw_env_write(char *name, char *value); > -int fw_env_close(struct env_opts *opts); > -int fw_env_flush(struct env_opts *opts); > - > -extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned); > Applied to -master, thanks ! Best regards, Stefano Babic
diff --git a/bootloader/uboot.c b/bootloader/uboot.c index cf5d26f..d5aa630 100644 --- a/bootloader/uboot.c +++ b/bootloader/uboot.c @@ -16,7 +16,6 @@ #include <sys/file.h> #include <dirent.h> #include "generated/autoconf.h" -#include "uboot.h" #include "util.h" #include "bootloader.h" diff --git a/bootloader/uboot.h b/bootloader/uboot.h deleted file mode 100644 index 4059678..0000000 --- a/bootloader/uboot.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * (C) Copyright 2002-2008 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include <stdint.h> - -#define AES_KEY_LENGTH (128 / 8) - -struct env_opts { - char *config_file; - int aes_flag; /* Is AES encryption used? */ - uint8_t aes_key[AES_KEY_LENGTH]; -}; - -extern struct env_opts *fw_env_opts; - -int fw_parse_script(char *fname, struct env_opts *opts); -char *fw_getenv(char *name); -int fw_env_open(struct env_opts *opts); -int fw_env_write(char *name, char *value); -int fw_env_close(struct env_opts *opts); -int fw_env_flush(struct env_opts *opts); - -extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned);