Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ANDROID: of: Support CONFIG_CMDLINE_EXTEND config option
The old logic assumes CMDLINE_FROM_BOOTLOADER vs. CMDLINE_FORCE and ignores CMDLINE_EXTEND. Here's the old logic: - CONFIG_CMDLINE_FORCE=true CONFIG_CMDLINE - dt bootargs=non-empty: dt bootargs - dt bootargs=empty, @DaTa is non-empty string @DaTa is left unchanged - dt bootargs=empty, @DaTa is empty string CONFIG_CMDLINE (or "" if that's not defined) The new logic is now documented in of_fdt.h and is copied here for reference: - CONFIG_CMDLINE_FORCE=true CONFIG_CMDLINE - CONFIG_CMDLINE_EXTEND=true, @DaTa is non-empty string @DaTa + dt bootargs (even if dt bootargs are empty) - CONFIG_CMDLINE_EXTEND=true, @DaTa is empty string CONFIG_CMDLINE + dt bootargs (even if dt bootargs are empty) - CMDLINE_FROM_BOOTLOADER=true, dt bootargs=non-empty: dt bootargs - CMDLINE_FROM_BOOTLOADER=true, dt bootargs=empty, @DaTa is non-empty string @DaTa is left unchanged - CMDLINE_FROM_BOOTLOADER=true, dt bootargs=empty, @DaTa is empty string CONFIG_CMDLINE (or "" if that's not defined) Signed-off-by: Doug Anderson <[email protected]> CC: [email protected] CC: Grant Likely <[email protected]> CC: Benjamin Herrenschmidt <[email protected]> CC: Rob Herring <[email protected]> Change-Id: I40ace250847f813358125dfcaa8998fd32cf7ea3 Signed-off-by: Colin Cross <[email protected]>
- Loading branch information