sysinfo: Use global sysinfo IDs for existing sysinfo drivers

Since 07c9e683a4 ("smbios: Allow a few values to come from sysinfo")
there are common global sysinfo IDs. This patch moved existing IDs above
SYSINFO_ID_USER.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/sysinfo/gazerbeam.h b/drivers/sysinfo/gazerbeam.h
index 171729d2031f99989917d62270831ec473d62aa1..6bf3c0098d1782d12ddf0a3f2a8aef5540572daf 100644 (file)
--- a/drivers/sysinfo/gazerbeam.h
+++ b/drivers/sysinfo/gazerbeam.h
@@ -5,10 +5,12 @@
  *
  */
 
+#include <sysinfo.h>
+
 enum {
-       BOARD_MULTICHANNEL,
-       BOARD_VARIANT,
-       BOARD_HWVERSION,
+       BOARD_HWVERSION = SYSINFO_ID_BOARD_MODEL,
+       BOARD_MULTICHANNEL = SYSINFO_ID_USER,
+       BOARD_VARIANT
 };
 
 enum {

diff --git a/drivers/sysinfo/sandbox.h b/drivers/sysinfo/sandbox.h
index 2cff494f56e3f51dfc7d9ef06ea5a936a95088c8..d9c5804c26a43fc7ae3b36cc0fffb71f66d5a03d 100644 (file)
--- a/drivers/sysinfo/sandbox.h
+++ b/drivers/sysinfo/sandbox.h
@@ -5,7 +5,7 @@
  */
 
 enum {
-       BOOL_CALLED_DETECT,
+       BOOL_CALLED_DETECT = SYSINFO_ID_USER,
        INT_TEST1,
        INT_TEST2,
        STR_VACATIONSPOT,