From: Tim Harvey Date: Mon, 23 May 2016 15:25:27 +0000 (-0700) Subject: imx: ventana: gsc: remove dependence on env X-Git-Tag: v2016.07-rc2~16^2~42 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a419352daf7a3dd29306d458fd3924e394d3cdc0;p=oweals%2Fu-boot.git imx: ventana: gsc: remove dependence on env remove dependence on getenv() by using global board info struct for model. Signed-off-by: Tim Harvey --- diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c index 3febd1276e..4f26bfd914 100644 --- a/board/gateworks/gw_ventana/gsc.c +++ b/board/gateworks/gw_ventana/gsc.c @@ -11,6 +11,7 @@ #include #include +#include "ventana_eeprom.h" #include "gsc.h" /* @@ -79,7 +80,6 @@ static void read_hwmon(const char *name, uint reg, uint size) int gsc_info(int verbose) { - const char *model = getenv("model"); unsigned char buf[16]; i2c_set_bus_num(0); @@ -112,7 +112,7 @@ int gsc_info(int verbose) read_hwmon("VDD_2P5", GSC_HWMON_VDD_2P5, 3); read_hwmon("VDD_1P8", GSC_HWMON_VDD_1P8, 3); read_hwmon("VDD_IO2", GSC_HWMON_VDD_IO2, 3); - switch (model[3]) { + switch (ventana_info.model[3]) { case '1': /* GW51xx */ read_hwmon("VDD_IO3", GSC_HWMON_VDD_IO4, 3); /* -C rev */ break;