mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 23:21:58 +00:00
290e7cfdbf
Since commit 051ba9e082
("Kconfig: mx6ull: Deselect MX6UL from
CONFIG_MX6ULL") CONFIG_MX6ULL does not select CONFIG_MX6UL anymore, so
take this into consideration in all the checks for CONFIG_MX6UL.
This fixes a boot regression.
Reported-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Tested-by: Breno Lima <breno.lima@nxp.com>
Tested-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Tested-by: Jörg Krause <joerg.krause@embedded.rocks>
88 lines
1.8 KiB
C
88 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0
|
|
*/
|
|
|
|
#ifndef __MX6_COMMON_H
|
|
#define __MX6_COMMON_H
|
|
|
|
#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL))
|
|
#ifndef CONFIG_SYS_L2CACHE_OFF
|
|
#define CONFIG_SYS_L2_PL310
|
|
#define CONFIG_SYS_PL310_BASE L2_PL310_BASE
|
|
#endif
|
|
|
|
#define CONFIG_MP
|
|
#endif
|
|
#define CONFIG_BOARD_POSTCLK_INIT
|
|
#define CONFIG_MXC_GPT_HCLK
|
|
|
|
#define CONFIG_SYS_BOOTM_LEN 0x1000000
|
|
|
|
#include <linux/sizes.h>
|
|
#include <asm/arch/imx-regs.h>
|
|
#include <asm/mach-imx/gpio.h>
|
|
|
|
#ifndef CONFIG_MX6
|
|
#define CONFIG_MX6
|
|
#endif
|
|
|
|
#define CONFIG_SYS_FSL_CLK
|
|
|
|
/* ATAGs */
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
|
|
/* Boot options */
|
|
#if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \
|
|
defined(CONFIG_MX6SX) || \
|
|
defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
|
|
#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
|
|
|
|
/* allow to overwrite serial and ethaddr */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
#define CONFIG_CONS_INDEX 1
|
|
|
|
/* Filesystems and image support */
|
|
#define CONFIG_SUPPORT_RAW_INITRD
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_AUTO_COMPLETE
|
|
#define CONFIG_SYS_CBSIZE 512
|
|
#define CONFIG_SYS_MAXARGS 32
|
|
|
|
/* GPIO */
|
|
#define CONFIG_MXC_GPIO
|
|
|
|
/* MMC */
|
|
#define CONFIG_BOUNCE_BUFFER
|
|
#define CONFIG_FSL_ESDHC
|
|
#define CONFIG_FSL_USDHC
|
|
|
|
/* Fuses */
|
|
#define CONFIG_MXC_OCOTP
|
|
|
|
/* Secure boot (HAB) support */
|
|
#ifdef CONFIG_SECURE_BOOT
|
|
#define CONFIG_CSF_SIZE 0x2000
|
|
#ifdef CONFIG_SPL_BUILD
|
|
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|