diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-02 20:45:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-02 20:45:24 -0400 |
| commit | ad6a303c578b0087749510d20c1c46ae13f20367 (patch) | |
| tree | df814f33a90a3dbd6a39aa8dad4fa8628a9eea6f /include/configs | |
| parent | 7351bf2b5b35819104d7c84ba8fd7d72eea544ee (diff) | |
| parent | ab01ef5fa617444fd95543ee04ea53ccda273269 (diff) | |
| download | u-boot-ad6a303c578b0087749510d20c1c46ae13f20367.tar.gz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ls1012aqds.h | 4 | ||||
| -rw-r--r-- | include/configs/ls1043a_common.h | 2 | ||||
| -rw-r--r-- | include/configs/ls1043ardb.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index fcf402c836..6e31ca0ba4 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -28,11 +28,11 @@ #define CONFIG_SYS_I2C_FPGA_ADDR 0x66 #define QIXIS_LBMAP_BRDCFG_REG 0x04 #define QIXIS_LBMAP_SWITCH 6 -#define QIXIS_LBMAP_MASK 0xf7 +#define QIXIS_LBMAP_MASK 0x08 #define QIXIS_LBMAP_SHIFT 0 #define QIXIS_LBMAP_DFLTBANK 0x00 #define QIXIS_LBMAP_ALTBANK 0x08 -#define QIXIS_RST_CTL_RESET 0x41 +#define QIXIS_RST_CTL_RESET 0x31 #define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20 #define QIXIS_RCFG_CTL_RECONFIG_START 0x21 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 0ad5261c56..e55fcb2928 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -175,6 +175,8 @@ /* Command line configuration */ #define CONFIG_CMD_ENV +#define CONFIG_MENU +#define CONFIG_CMD_PXE /* MMC */ #define CONFIG_MMC diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 44f86fabd5..857ad7b6cc 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -14,8 +14,8 @@ #define SEC_FIRMWARE_ERET_ADDR_REVERT #define CONFIG_ARMV8_PSCI -#define CONFIG_SYS_LS_PPA_FW_IN_NOR -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR +#define CONFIG_SYS_LS_PPA_FW_IN_XIP +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP #define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 #endif #endif |