diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-29 09:27:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-29 09:27:04 -0500 |
| commit | 3bb6dc04a9b78c3db7c130bea7e817d77add275e (patch) | |
| tree | f8c48e1764ce3996e9569c93bd4463421a5ded53 /include | |
| parent | 8e5f0497c8a8ab9bd7314737f2edb4711733b6fe (diff) | |
| parent | d6abd1d53992cf863019aed1251924c45893a46b (diff) | |
| download | u-boot-3bb6dc04a9b78c3db7c130bea7e817d77add275e.tar.gz | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6_common.h | 3 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 8 | ||||
| -rw-r--r-- | include/power/pmic.h | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 4de9db65c1..5fb85a1127 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -65,9 +65,6 @@ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 -#ifndef CONFIG_SYS_DCACHE_OFF -#endif - /* GPIO */ #define CONFIG_MXC_GPIO diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index f4c9c28397..906e677cd1 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -43,6 +43,7 @@ #define UPDATE_M4_ENV "" #endif +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ "script=boot.scr\0" \ @@ -105,10 +106,13 @@ "fi; " \ "else " \ "bootz; " \ - "fi;\0" + "fi;\0" \ + "findfdt="\ + "if test test $board_rev = REVA ; then " \ + "setenv fdt_file imx6sx-sdb-reva.dtb; fi; " \ #define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev};" \ + "run findfdt; " \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ "run bootscript; " \ diff --git a/include/power/pmic.h b/include/power/pmic.h index 4b34316427..f2fe537fb7 100644 --- a/include/power/pmic.h +++ b/include/power/pmic.h @@ -11,6 +11,7 @@ #ifndef __CORE_PMIC_H_ #define __CORE_PMIC_H_ +#include <dm/ofnode.h> #include <i2c.h> #include <linux/list.h> #include <power/power_chrg.h> |