New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 813855 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Mar 2018
Cc:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Feature



Sign in to add a comment

Migrate reef to use YAML for the master configuration

Project Member Reported by sjg@chromium.org, Feb 20 2018

Issue description

With  crbug.com/796983  getting close we will have proper YAML support in cros_config.

We should migrate the reef config using dts2yaml, etc. and get it running on all boards (electro, basking, pyro, snappy, sand, alan, bigdaddy).

 

Comment 1 by sjg@chromium.org, Mar 8 2018

Testing booting on basking. Need to get logs working for cros_config.
Project Member

Comment 2 by bugdroid1@chromium.org, Mar 11 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/2f5c20cf1557e349aeec95b3940751e422d9bd25

commit 2f5c20cf1557e349aeec95b3940751e422d9bd25
Author: Simon Glass <sjg@chromium.org>
Date: Sun Mar 11 07:32:42 2018

chromeos-config: Set up a log file for cros_config

Create a new /var/log/cros_config.log file for cros_config, to aid
debugging.

BUG= chromium:813855 
TEST=run on reef and see that the log file is created:
CROS_CONFIG_DEBUG=1 cros_config / powerd-prefs

Change-Id: Idf9cfee2407146d6d87a1f1771eb00239a4ad0a5
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/957941
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/2f5c20cf1557e349aeec95b3940751e422d9bd25/chromeos-config/cros_config_main.cc

Project Member

Comment 3 by bugdroid1@chromium.org, Mar 11 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/69e54ab84c2fd8ef19eaa4856362bce42555dd03

commit 69e54ab84c2fd8ef19eaa4856362bce42555dd03
Author: Simon Glass <sjg@chromium.org>
Date: Sun Mar 11 07:32:43 2018

chromeos-config: Drop InitModel()

The InitModel() function should not exist except in CrosConfig. That class
should call InitCommon() in the two implementation classes. Update the
code to do this and drop the unused InitModel() functions.

Also adjust the internal GetString() function to take a reference.

BUG= chromium:813855 
TEST=FEATURES=test emerge-reef chromeos-config-tools power_manager

Change-Id: I8bf23119d78d036305df5513f9900436556d8d01
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/958402
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config_yaml.cc
[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config_yaml.h
[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config.cc
[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config_fdt.cc
[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config_impl.h
[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config.h
[modify] https://crrev.com/69e54ab84c2fd8ef19eaa4856362bce42555dd03/chromeos-config/libcros_config/cros_config_fdt.h

Project Member

Comment 4 by bugdroid1@chromium.org, Mar 11 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/21523424daa80cceae074321a4ffc882d4ba605d

commit 21523424daa80cceae074321a4ffc882d4ba605d
Author: Simon Glass <sjg@chromium.org>
Date: Sun Mar 11 07:32:44 2018

chromeos-config: Make the implementations into pointers

At present we need to include both implementaton header files (fdt and
yaml) in the cros_config.h header file. This is not nice since clients
like powerd don't care about the internals.

Change the classes into pointers so we can just use a forward declaration.

BUG= chromium:813855 
TEST=FEATURES=test emerge-reef chromeos-config-tools power_manager

Change-Id: I0f3d908b1d04d360b45423de449898dad60c8493
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/958403
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/21523424daa80cceae074321a4ffc882d4ba605d/chromeos-config/libcros_config/cros_config.cc
[modify] https://crrev.com/21523424daa80cceae074321a4ffc882d4ba605d/chromeos-config/libcros_config/cros_config.h

Project Member

Comment 5 by bugdroid1@chromium.org, Mar 11 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/d9e1ddb9b86d7d696d9e4ea7700de56e7a1c0beb

commit d9e1ddb9b86d7d696d9e4ea7700de56e7a1c0beb
Author: Simon Glass <sjg@chromium.org>
Date: Sun Mar 11 07:32:45 2018

chromeos-config: Add a little more logging

Add a little more logging so that we know that things are working
correctly. This allows us to see fdt/yaml mismatches in the logs.

BUG= chromium:813855 
TEST=FEATURES=test emerge-reef chromeos-config-tools power_manager

Change-Id: Icc30235be8e56210c5abb9dee9c30c34f35ab318
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/958404
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/d9e1ddb9b86d7d696d9e4ea7700de56e7a1c0beb/chromeos-config/libcros_config/cros_config.cc

A regression is being tracked in 74508666.
Project Member

Comment 7 by bugdroid1@chromium.org, Mar 13 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/d1f0d0fa9bab91b92922122f3eb2601f5af3d440

commit d1f0d0fa9bab91b92922122f3eb2601f5af3d440
Author: Simon Glass <sjg@chromium.org>
Date: Tue Mar 13 13:48:14 2018

chromeos-config: Just log yaml failures

When yaml queries don't return the correct result, we write out to the
log and return an error.

However there is still at least one infidelity to resolve. While we do
this, just log if the yaml results are incorrect, or the yaml file is
missing entirely.

BUG= chromium:813855 , b:74508666
TEST=manually test on reef that this failure just logs:
cros_config /audio/main ucm-suffix

Change-Id: I07a8b76774a43f6b04f42104ca864546bec351cd
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/959050
Reviewed-by: Benjamin Gordon <bmgordon@chromium.org>
Reviewed-by: C Shapiro <shapiroc@google.com>

[modify] https://crrev.com/d1f0d0fa9bab91b92922122f3eb2601f5af3d440/chromeos-config/libcros_config/cros_config.cc

Comment 8 by sjg@chromium.org, Mar 13 2018

Status:

- electro: seems OK
- basking: not tested
- alan: seems OK
- bigdadddy: needs sub-model support

Issue 821641 has been merged into this issue.

Comment 10 by sjg@chromium.org, Mar 26 2018

Status: Fixed (was: Assigned)
I suppose this can be closed now as the new config is working and the sub-model problem is resolved.

Sign in to add a comment