mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +00:00
cd6ddc4813
Commit 8183058188 ("imx6: centralise common boot options in
mx6_common.h") broke boot on mx6sl and mx6sx by assuming that all mx6
SoCs use the same LOADADDR/SYS_TEXT_BASE range, which is not correct.
DDR on mx6sx/mx6sl starts at 0x80000000.
Adjust LOADADDR/SYS_TEXT_BASE to the proper values for mx6sx/mx6sl,
so that these SoCs can boot again.
Also, TQMA6 requires a custom CONFIG_SYS_TEXT_BASE value, so move
its setting prior to the inclusion of mx6_common.h.
Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
116 lines
2.8 KiB
C
116 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef __MX6_COMMON_H
|
|
#define __MX6_COMMON_H
|
|
|
|
#define CONFIG_ARM_ERRATA_743622
|
|
#define CONFIG_ARM_ERRATA_751472
|
|
#define CONFIG_ARM_ERRATA_794072
|
|
#define CONFIG_ARM_ERRATA_761320
|
|
#define CONFIG_BOARD_POSTCLK_INIT
|
|
|
|
#ifndef CONFIG_SYS_L2CACHE_OFF
|
|
#define CONFIG_SYS_L2_PL310
|
|
#define CONFIG_SYS_PL310_BASE L2_PL310_BASE
|
|
#endif
|
|
|
|
#define CONFIG_MP
|
|
#define CONFIG_MXC_GPT_HCLK
|
|
|
|
#define CONFIG_SYS_NO_FLASH
|
|
|
|
#include <linux/sizes.h>
|
|
#include <asm/arch/imx-regs.h>
|
|
#include <asm/imx-common/gpio.h>
|
|
#include <config_cmd_default.h>
|
|
|
|
#ifndef CONFIG_MX6
|
|
#define CONFIG_MX6
|
|
#endif
|
|
|
|
#define CONFIG_DISPLAY_BOARDINFO
|
|
#define CONFIG_DISPLAY_CPUINFO
|
|
#define CONFIG_SYS_GENERIC_BOARD
|
|
|
|
/* ATAGs */
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
|
|
/* Boot options */
|
|
#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL))
|
|
#define CONFIG_LOADADDR 0x82000000
|
|
#ifndef CONFIG_SYS_TEXT_BASE
|
|
#define CONFIG_SYS_TEXT_BASE 0x87800000
|
|
#endif
|
|
#else
|
|
#define CONFIG_LOADADDR 0x12000000
|
|
#ifndef CONFIG_SYS_TEXT_BASE
|
|
#define CONFIG_SYS_TEXT_BASE 0x17800000
|
|
#endif
|
|
#endif
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
#ifndef CONFIG_BOOTDELAY
|
|
#define CONFIG_BOOTDELAY 3
|
|
#endif
|
|
|
|
/* allow to overwrite serial and ethaddr */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
#define CONFIG_CONS_INDEX 1
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/* Filesystems and image support */
|
|
#define CONFIG_OF_LIBFDT
|
|
#define CONFIG_CMD_BOOTZ
|
|
#define CONFIG_SUPPORT_RAW_INITRD
|
|
#define CONFIG_CMD_FS_GENERIC
|
|
#define CONFIG_DOS_PARTITION
|
|
#define CONFIG_CMD_EXT2
|
|
#define CONFIG_CMD_EXT4
|
|
#define CONFIG_CMD_EXT4_WRITE
|
|
#define CONFIG_CMD_FAT
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_NO_FLASH
|
|
#undef CONFIG_CMD_IMLS
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_SYS_HUSH_PARSER
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_AUTO_COMPLETE
|
|
#define CONFIG_SYS_CBSIZE 512
|
|
#define CONFIG_SYS_MAXARGS 32
|
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
|
|
|
#ifndef CONFIG_SYS_DCACHE_OFF
|
|
#define CONFIG_CMD_CACHE
|
|
#endif
|
|
|
|
/* GPIO */
|
|
#define CONFIG_MXC_GPIO
|
|
#define CONFIG_CMD_GPIO
|
|
|
|
/* MMC */
|
|
#define CONFIG_MMC
|
|
#define CONFIG_CMD_MMC
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_BOUNCE_BUFFER
|
|
#define CONFIG_FSL_ESDHC
|
|
#define CONFIG_FSL_USDHC
|
|
|
|
#endif
|