Merge tag 'dm-pull-5jan21' of git://git.denx.de/u-boot-dm into next

[platform/kernel/u-boot.git] / include / configs / lx2160a_common.h

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index d3b5c58..4bd0ddb 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -149,8 +149,10 @@
 /* USB */
 #ifdef CONFIG_USB
 #define CONFIG_HAS_FSL_XHCI_USB
+#ifndef CONFIG_TARGET_LX2162AQDS
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
+#endif
 
 /* FlexSPI */
 #ifdef CONFIG_NXP_FSPI
@@ -170,8 +172,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
-#define CONFIG_SYS_MMC_ENV_DEV          0
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
@@ -232,7 +232,7 @@ unsigned long get_board_ddr_clk(void);
        "kernel_size=0x2800000\0"               \
        "kernel_addr_sd=0x8000\0"               \
        "kernelhdr_addr_sd=0x3000\0"            \
-       "kernel_size_sd=0x1d000\0"              \
+       "kernel_size_sd=0x14000\0"              \
        "kernelhdr_size_sd=0x20\0"              \
        "console=ttyAMA0,38400n8\0"             \
        BOOTENV                                 \