diff options
| author | Tom Rini <[email protected]> | 2020-05-15 16:42:06 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-15 16:42:06 -0400 |
| commit | 506159549df76034dfbdee562304ce4c102d3a06 (patch) | |
| tree | 85c116fc3267a1ce16d6771f0a08675788d48ccd /tools | |
| parent | 5f09f9af3cc335fe6a74c031cfa0b1d8bdf4b9db (diff) | |
| parent | 24bf6e84ce22cd1b53cb79e4f89a4036af7e9c6b (diff) | |
Merge branch '2020-05-15-misc-bugfixes'
- A number of symbol name consistency updates
- JFFS2 bugfix
- Use /* fallthrough */ for now to help at least gcc know when we're
intentionally not 'break;'ing in a switch statement, we'll adopt
fallthrough; later on.
- Assorted other fixes
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 4 | ||||
| -rw-r--r-- | tools/fdtgrep.c | 11 | ||||
| -rw-r--r-- | tools/mkimage.c | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/tools/Makefile b/tools/Makefile index 1f9144f0288..879c3fd4a74 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -5,7 +5,7 @@ # Enable all the config-independent tools ifneq ($(HOST_TOOLS_ALL),) -CONFIG_KIRKWOOD = y +CONFIG_ARCH_KIRKWOOD = y CONFIG_LCD_LOGO = y CONFIG_CMD_LOADS = y CONFIG_CMD_NET = y @@ -199,7 +199,7 @@ ubsha1-objs := os_support.o ubsha1.o lib/sha1.o HOSTCFLAGS_ubsha1.o := -pedantic -hostprogs-$(CONFIG_KIRKWOOD) += kwboot +hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot hostprogs-y += proftool hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 7e168a1e6be..e4112b8f692 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -923,7 +923,9 @@ static const char usage_synopsis[] = /* Helper for getopt case statements */ #define case_USAGE_COMMON_FLAGS \ case 'h': usage(NULL); \ + /* fallthrough */ \ case 'V': util_version(); \ + /* fallthrough */ \ case '?': usage("unknown option"); static const char usage_short_opts[] = @@ -1085,6 +1087,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[]) switch (opt) { case_USAGE_COMMON_FLAGS + /* fallthrough */ case 'a': disp->show_addr = 1; break; @@ -1096,7 +1099,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[]) break; case 'C': inc = 0; - /* no break */ + /* fallthrough */ case 'c': type = FDT_IS_COMPAT; break; @@ -1111,7 +1114,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[]) break; case 'G': inc = 0; - /* no break */ + /* fallthrough */ case 'g': type = FDT_ANY_GLOBAL; break; @@ -1129,7 +1132,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[]) break; case 'N': inc = 0; - /* no break */ + /* fallthrough */ case 'n': type = FDT_IS_NODE; break; @@ -1148,7 +1151,7 @@ static void scan_args(struct display_info *disp, int argc, char *argv[]) break; case 'P': inc = 0; - /* no break */ + /* fallthrough */ case 'p': type = FDT_IS_PROP; break; diff --git a/tools/mkimage.c b/tools/mkimage.c index 336376f8d0a..d2cd1917874 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -211,7 +211,7 @@ static void process_args(int argc, char **argv) case 'f': datafile = optarg; params.auto_its = !strcmp(datafile, "auto"); - /* no break */ + /* fallthrough */ case 'F': /* * The flattened image tree (FIT) format |