diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-07-22 20:39:45 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:10 -0700 |
| commit | cf2414a7b3d7bd2e7ee363fd6e356a3e4d9339a7 (patch) | |
| tree | 0c1df789498b09c8bb85371b33aad3f79b6d259e /common/cmd_vboot_twostop.c | |
| parent | 4ddaee01e37ed491ce7c45586ab96e5bbb905ab4 (diff) | |
CHROMIUM: reunify boot_kernel
During the code migration to the redesigned vboot_reference API, the
boot_kernel (formerly named load_kernel_helper) was divided and its
private functions were taken out to keep U-Boot compilable
$ git log --oneline -3 -- lib/chromeos/load_kernel_helper.c
6cdb577 CHROMIUM: remove codes based on deprecated API of vboot_reference
29c5f74 CHROMIUM: Separate cmdline update part from load_kernel_helper library.
f853479 CHROMIUM: Separate the pre-boot FDT update part from load_kernel_helper library.
The commit 29c5f74 and f853479 took out the private functions for
updating kernel command line and embedding crossystem data into a device
tree. The functions are the guts of boot_kernel and serve no purpose
other than helping boot kernel.
In fact, if you diff load_kernel_helper and boot_kernel, you will find
they are virtually identical, except that functions based on deprecated
APIs of vboot_reference are removed in boot_kernel.
As the code migration has been completed, it is time for the private
functions to reunite with the boot_kernel.
BUG=chromium-os:16542
TEST=boot on Aebl
Change-Id: I6512d7a5197c41df7a2e9cc5d90c40be87b468b0
Reviewed-on: http://gerrit.chromium.org/gerrit/4573
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Diffstat (limited to 'common/cmd_vboot_twostop.c')
| -rw-r--r-- | common/cmd_vboot_twostop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_vboot_twostop.c b/common/cmd_vboot_twostop.c index cf759928613..2bb6b4f2c4a 100644 --- a/common/cmd_vboot_twostop.c +++ b/common/cmd_vboot_twostop.c @@ -13,6 +13,7 @@ #include <fdt_decode.h> #include <lcd.h> #include <malloc.h> +#include <chromeos/boot_kernel.h> #include <chromeos/common.h> #include <chromeos/crossystem_data.h> #include <chromeos/cros_gpio.h> @@ -20,7 +21,6 @@ #include <chromeos/firmware_storage.h> #include <chromeos/memory_wipe.h> #include <chromeos/power_management.h> -#include <vboot/boot_kernel.h> #include <gbb_header.h> /* for GoogleBinaryBlockHeader */ #include <vboot_api.h> |