Skip to content

Commit 2f4b9e5

Browse files
author
Ye Li
committed
MLK-18146-4 mx6: Update mx6 common head file
Align the common head file with v2020.04, since some configurations have been moved to Kconfig, so don't need them in mx6_common.h now. Signed-off-by: Ye Li <[email protected]> (cherry picked from commit 183c12a) (cherry picked from commit 6fdf38a) (cherry picked from commit e37ed29) (cherry picked from commit e090c97) (cherry picked from commit 445edd56e0078d6e9a86d5d9205463d464f14a07)
1 parent 82c9e0f commit 2f4b9e5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ config SYS_LOAD_ADDR
541541
default 0x22000000 if MACH_SUN9I
542542
default 0x42000000 if ARCH_SUNXI
543543
default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3
544-
default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL)
544+
default 0x80800000 if ARCH_MX6 && (MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL)
545545
default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL)
546546
default 0x80800000 if ARCH_MX7
547547
default 0x90000000 if FSL_LSCH2 || FSL_LSCH3

include/configs/mx6_common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
33
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
4+
* Copyright 2018 NXP
45
*/
56

67
#ifndef __MX6_COMMON_H

0 commit comments

Comments
 (0)