diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-23 09:43:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-23 09:43:09 -0400 |
| commit | 6ef71c61f6aba20e8d24e7bff34cc9577305ecf1 (patch) | |
| tree | 1fc19007e84aa637b2c5ea74b4800c7a3f182d80 /include | |
| parent | 91ebf300934461e450f5ef8f386ea9e55d2636c5 (diff) | |
| parent | 09c6778d9f5c85c40d8a81722c98142975c2a01e (diff) | |
| download | u-boot-6ef71c61f6aba20e8d24e7bff34cc9577305ecf1.tar.gz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ls1043a_common.h | 2 | ||||
| -rw-r--r-- | include/configs/ls2080ardb.h | 8 | ||||
| -rw-r--r-- | include/usb/ehci-ci.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 002830c27e..1f9efffa56 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -22,7 +22,7 @@ #if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) #define SPL_NO_MMC #endif -#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT)) +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT_QSPI)) #define SPL_NO_IFC #endif diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 145b285685..9e9979e1c7 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -18,7 +18,6 @@ #define CONFIG_QIXIS_I2C_ACCESS #endif #define CONFIG_SYS_I2C_EARLY_INIT -#define CONFIG_DISPLAY_BOARDINFO_LATE #endif #define I2C_MUX_CH_VOL_MONITOR 0xa @@ -289,19 +288,15 @@ unsigned long get_board_sys_clk(void); /* SPI */ #if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI) #define CONFIG_SPI_FLASH -#ifdef CONFIG_FSL_QSPI +#ifdef CONFIG_FSL_DSPI #define CONFIG_SPI_FLASH_STMICRO #endif #ifdef CONFIG_FSL_QSPI -#ifdef CONFIG_TARGET_LS2081ARDB -#define CONFIG_SPI_FLASH_STMICRO -#else #define CONFIG_SPI_FLASH_SPANSION #endif #define FSL_QSPI_FLASH_SIZE SZ_64M /* 64MB */ #define FSL_QSPI_FLASH_NUM 2 #endif -#endif /* * RTC configuration @@ -392,6 +387,7 @@ unsigned long get_board_sys_clk(void); "load_addr=0xa0000000\0" \ "kernel_size=0x2800000\0" \ "console=ttyAMA0,38400n8\0" \ + "mcmemsize=0x70000000\0" \ MC_INIT_CMD \ BOOTENV \ "boot_scripts=ls2088ardb_boot.scr\0" \ diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index cd3eb47da4..59bfc14df6 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -156,7 +156,7 @@ #elif defined(CONFIG_MPC85xx) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC85xx_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR CONFIG_SYS_MPC85xx_USB2_ADDR -#elif defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A) +#elif defined(CONFIG_ARCH_LS1021A) || defined(CONFIG_ARCH_LS1012A) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #endif |