diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-13 16:34:41 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-09-15 12:57:07 -0700 |
| commit | 9c1e1396b592ff67bf154ac7c50c0abb6296645f (patch) | |
| tree | 77dc96943c576f1465b79082b5c065dd9c5c3865 /lib | |
| parent | ce6431af149f778a465a34c7f283295637f478f9 (diff) | |
CHROMIUMOS: small code clean ups in boot_kernel/fdt_decode
This just changes to standard 'blob' naming, and fixes a code style error.
BUG=chromium-os:19353
TEST=build and boot on Seaboard
Change-Id: Ib79d526ef612a181091ef15a5dd427ea73c53330
Reviewed-on: http://gerrit.chromium.org/gerrit/7681
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chromeos/boot_kernel.c | 2 | ||||
| -rw-r--r-- | lib/chromeos/fdt_decode.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chromeos/boot_kernel.c b/lib/chromeos/boot_kernel.c index 55a847399b..4fb08ee67b 100644 --- a/lib/chromeos/boot_kernel.c +++ b/lib/chromeos/boot_kernel.c @@ -270,7 +270,7 @@ int boot_kernel(VbSelectAndLoadKernelParams *kparams, crossystem_data_t *cdata) if (!setup_zimage(params, cmdline, 0, 0, 0)) boot_zimage(params, kparams->kernel_buffer); #else - do_bootm(NULL, 0, sizeof(argv)/sizeof(*argv), argv); + do_bootm(NULL, 0, ARRAY_SIZE(argv), argv); #endif VBDEBUG(PREFIX "failed to boot; is kernel broken?\n"); diff --git a/lib/chromeos/fdt_decode.c b/lib/chromeos/fdt_decode.c index bf63621a21..9c42364209 100644 --- a/lib/chromeos/fdt_decode.c +++ b/lib/chromeos/fdt_decode.c @@ -140,13 +140,13 @@ int fdt_decode_twostop_fmap(const void *blob, struct twostop_fmap *config) return 0; } -int fdt_decode_chromeos_config_has_prop(const void *fdt, const char *name) +int fdt_decode_chromeos_config_has_prop(const void *blob, const char *name) { - int nodeoffset = fdt_path_offset(fdt, "/chromeos-config"); + int nodeoffset = fdt_path_offset(blob, "/chromeos-config"); int len; if (nodeoffset < 0) return 0; - return fdt_get_property(fdt, nodeoffset, name, &len) != NULL; + return fdt_get_property(blob, nodeoffset, name, &len) != NULL; } |