mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-03 18:10:13 +00:00
832ce20278
Most boards currently use SPI_FLASH_MTD only in U-Boot proper, not in SPL. They often rely on hacks in the board header files to include this option conditionally. To be able to fix this, we previously introduced a separate option SPL_SPI_FLASH_MTD. Therefore we can now adjust the Makefile and change the code in sf_probe.c and sf_internal.h to use CONFIG_IS_ENABLED(SPI_FLASH_MTD). We also need to move all occurences of CONFIG_SPI_FLASH_MTD from the header files to the according defconfigs. The affected boards are socfpga, aristainetos, cm_fx6, display5, ventana, rcar-gen2, dh_imx6 and da850evm. We do this all in one patch to guarantee bisectibility. This change was tested with buildman to make sure it does not introduce any regressions by comparing the resulting binary sizes. Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Acked-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
151 lines
3.7 KiB
C
151 lines
3.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* DHCOM DH-iMX6 PDK board configuration
|
|
*
|
|
* Copyright (C) 2017 Marek Vasut <marex@denx.de>
|
|
*/
|
|
|
|
#ifndef __DH_IMX6_CONFIG_H
|
|
#define __DH_IMX6_CONFIG_H
|
|
|
|
#include <asm/arch/imx-regs.h>
|
|
|
|
#include "mx6_common.h"
|
|
|
|
/*
|
|
* SPI NOR layout:
|
|
* 0x00_0000-0x00_ffff ... U-Boot SPL
|
|
* 0x01_0000-0x0f_ffff ... U-Boot
|
|
* 0x10_0000-0x10_ffff ... U-Boot env #1
|
|
* 0x11_0000-0x11_ffff ... U-Boot env #2
|
|
* 0x12_0000-0x1f_ffff ... UNUSED
|
|
*/
|
|
|
|
/* SPL */
|
|
#include "imx6_spl.h" /* common IMX6 SPL configuration */
|
|
#define CONFIG_SPL_TARGET "u-boot-with-spl.imx"
|
|
|
|
/* Miscellaneous configurable options */
|
|
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
|
|
#define CONFIG_BZIP2
|
|
|
|
/* Size of malloc() pool */
|
|
#define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M)
|
|
|
|
/* Bootcounter */
|
|
#define CONFIG_SYS_BOOTCOUNT_BE
|
|
|
|
/* FEC ethernet */
|
|
#define IMX_FEC_BASE ENET_BASE_ADDR
|
|
#define CONFIG_FEC_XCV_TYPE RMII
|
|
#define CONFIG_ETHPRIME "FEC"
|
|
#define CONFIG_FEC_MXC_PHYADDR 0
|
|
#define CONFIG_ARP_TIMEOUT 200UL
|
|
|
|
/* MMC Configs */
|
|
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
|
#define CONFIG_SYS_MMC_ENV_DEV 2 /* 1 = SDHC3, 2 = SDHC4 (eMMC) */
|
|
|
|
/* SATA Configs */
|
|
#define CONFIG_LBA48
|
|
|
|
/* SPI Flash Configs */
|
|
#if defined(CONFIG_SPL_BUILD)
|
|
#undef CONFIG_DM_SPI
|
|
#undef CONFIG_DM_SPI_FLASH
|
|
#endif
|
|
|
|
/* UART */
|
|
#define CONFIG_MXC_UART
|
|
#define CONFIG_MXC_UART_BASE UART1_BASE
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
/* USB Configs */
|
|
#ifdef CONFIG_CMD_USB
|
|
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
|
#define CONFIG_USB_HOST_ETHER
|
|
#define CONFIG_USB_ETHER_ASIX
|
|
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
|
#define CONFIG_MXC_USB_FLAGS 0
|
|
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
|
|
|
|
/* USB Gadget (DFU, UMS) */
|
|
#if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
|
|
#define CONFIG_SYS_DFU_DATA_BUF_SIZE (16 * 1024 * 1024)
|
|
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
|
|
|
/* USB IDs */
|
|
#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
|
|
#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
|
|
#endif
|
|
#endif
|
|
|
|
/* Watchdog */
|
|
|
|
/* allow to overwrite serial and ethaddr */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
|
|
#define CONFIG_LOADADDR 0x12000000
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
#ifndef CONFIG_SPL_BUILD
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"console=ttymxc0,115200\0" \
|
|
"fdt_addr=0x18000000\0" \
|
|
"fdt_high=0xffffffff\0" \
|
|
"initrd_high=0xffffffff\0" \
|
|
"kernel_addr_r=0x10008000\0" \
|
|
"fdt_addr_r=0x13000000\0" \
|
|
"ramdisk_addr_r=0x18000000\0" \
|
|
"scriptaddr=0x14000000\0" \
|
|
"fdtfile=imx6q-dhcom-pdk2.dtb\0"\
|
|
BOOTENV
|
|
|
|
#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
|
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 0) \
|
|
func(MMC, mmc, 2) \
|
|
func(USB, usb, 1) \
|
|
func(SATA, sata, 0) \
|
|
func(DHCP, dhcp, na)
|
|
|
|
#include <config_distro_bootcmd.h>
|
|
#endif
|
|
|
|
/* Physical Memory Map */
|
|
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
|
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
|
|
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
|
|
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
|
|
|
|
#define CONFIG_SYS_INIT_SP_OFFSET \
|
|
(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
|
|
|
|
#define CONFIG_SYS_INIT_SP_ADDR \
|
|
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
|
|
|
#define CONFIG_SYS_MEMTEST_START 0x10000000
|
|
#define CONFIG_SYS_MEMTEST_END 0x20000000
|
|
#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
|
|
|
|
/* Environment */
|
|
#define CONFIG_ENV_SIZE (16 * 1024)
|
|
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
|
|
#if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
|
|
#define CONFIG_ENV_OFFSET (1024 * 1024)
|
|
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
|
#define CONFIG_ENV_OFFSET_REDUND \
|
|
(CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
|
|
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
|
|
#endif
|
|
|
|
#endif /* __DH_IMX6_CONFIG_H */
|