mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-27 07:01:24 +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>
362 lines
11 KiB
C
362 lines
11 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright (C) 2017
|
|
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
#include "mx6_common.h"
|
|
|
|
/* Falcon Mode */
|
|
#define CONFIG_CMD_SPL
|
|
#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
|
|
#define CONFIG_CMD_SPL_WRITE_SIZE (44 * SZ_1K)
|
|
|
|
/* Falcon Mode - MMC support */
|
|
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x3F00
|
|
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS \
|
|
(CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
|
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x100 /* 128KiB */
|
|
|
|
/*
|
|
* display5 SPI-NOR memory layout
|
|
*
|
|
* The definition can be found in Kconfig's
|
|
* CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT
|
|
*
|
|
* 0x000000 - 0x020000 : SPI.SPL (128KiB)
|
|
* 0x020000 - 0x120000 : SPI.u-boot (1MiB)
|
|
* 0x120000 - 0x130000 : SPI.u-boot-env1 (64KiB)
|
|
* 0x130000 - 0x140000 : SPI.u-boot-env2 (64KiB)
|
|
* 0x140000 - 0x540000 : SPI.swupdate-kernel-FIT (4MiB)
|
|
* 0x540000 - 0x1540000 : SPI.swupdate-initramfs (16MiB)
|
|
* 0x1540000 - 0x1640000 : SPI.factory (1MiB)
|
|
*/
|
|
|
|
/* SPI Flash Configs */
|
|
#if defined(CONFIG_SPL_BUILD)
|
|
#undef CONFIG_DM_SPI
|
|
#undef CONFIG_DM_SPI_FLASH
|
|
#endif
|
|
|
|
/* Below values are "dummy" - only to avoid build break */
|
|
#define CONFIG_SYS_SPI_KERNEL_OFFS 0x150000
|
|
#define CONFIG_SYS_SPI_ARGS_OFFS 0x140000
|
|
#define CONFIG_SYS_SPI_ARGS_SIZE 0x10000
|
|
|
|
#include "imx6_spl.h"
|
|
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
|
|
/* Size of malloc() pool */
|
|
#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024)
|
|
|
|
#define CONFIG_MXC_UART_BASE UART5_BASE
|
|
|
|
/* I2C Configs */
|
|
#define CONFIG_I2C_MULTI_BUS
|
|
|
|
/* MMC Configs */
|
|
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
|
|
|
/* allow to overwrite serial and ethaddr */
|
|
#define CONFIG_ENV_OVERWRITE
|
|
#define CONFIG_BAUDRATE 115200
|
|
|
|
#ifndef CONFIG_BOOTCOMMAND
|
|
#define CONFIG_BOOTCOMMAND "if run check_em_pad; then " \
|
|
"run recovery;" \
|
|
"else if test ${BOOT_FROM} = FACTORY; then " \
|
|
"run factory_nfs;" \
|
|
"else " \
|
|
"run boot_mmc;" \
|
|
"fi;fi"
|
|
#endif
|
|
|
|
#define PARTS_DEFAULT \
|
|
/* Linux partitions */ \
|
|
"partitions=" \
|
|
"uuid_disk=${uuid_gpt_disk};" \
|
|
"name=kernel_raw1,start=128K,size=8M,uuid=${uuid_gpt_kernel_raw1};" \
|
|
"name=rootfs1,size=1528M,uuid=${uuid_gpt_rootfs1};" \
|
|
"name=kernel_raw2,size=8M,uuid=${uuid_gpt_kernel_raw2};" \
|
|
"name=rootfs2,size=512M,uuid=${uuid_gpt_rootfs2};" \
|
|
"name=data,size=-,uuid=${uuid_gpt_data}\0"
|
|
|
|
#define SWUPDATE_RECOVERY_PROCEDURE \
|
|
"echo '#######################';" \
|
|
"echo '# RECOVERY SWUupdate #';" \
|
|
"echo '#######################';" \
|
|
"echo '#######################';" \
|
|
"echo '# GPT verify #';" \
|
|
"if gpt verify mmc ${mmcdev} ${partitions}; then " \
|
|
"echo '# OK ! #';" \
|
|
"else " \
|
|
"echo '# FAILED ! #';" \
|
|
"echo '# GPT RESTORATION #';" \
|
|
"gpt write mmc ${mmcdev} ${partitions};" \
|
|
"fi;" \
|
|
"echo '#######################';" \
|
|
"setenv loadaddr_swu_initramfs 0x14000000;" \
|
|
"setenv bootargs console=${console} " \
|
|
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
|
|
":${hostname}::off root=/dev/ram rw;" \
|
|
"sf probe;" \
|
|
"sf read ${loadaddr} swu-kernel;" \
|
|
"sf read ${loadaddr_swu_initramfs} swu-initramfs;" \
|
|
"bootm ${loadaddr} ${loadaddr_swu_initramfs};reset;"
|
|
|
|
#define SETUP_BOOTARGS \
|
|
"run set_rootfs_part;" \
|
|
"setenv bootargs ${bootargs} console=${console} " \
|
|
"root=/dev/mmcblk${mmcdev}p${rootfs_part} " \
|
|
"rootwait rootfstype=ext4 rw; " \
|
|
"run set_kernel_part;" \
|
|
"part start mmc ${mmcdev} ${kernel_part} lba_start; " \
|
|
"mmc read ${loadaddr} ${lba_start} ${fitImg_fw_sz}; " \
|
|
"setenv fdt_conf imx6q-${board}-${display}.dtb; "
|
|
|
|
/* All the numbers are in LBAs */
|
|
#define __TFTP_UPDATE_KERNEL \
|
|
"tftp_mmc_fitImg=" \
|
|
"if test ! -n ${kernel_part}; then " \
|
|
"setenv kernel_part ${kernel_part_active};" \
|
|
"fi;" \
|
|
"if tftp ${loadaddr} ${kernel_file}; then " \
|
|
"setexpr fw_sz ${filesize} / 0x200; " \
|
|
"setexpr fw_sz ${fw_sz} + 1; " \
|
|
"part start mmc ${mmcdev} ${kernel_part} lba_start; " \
|
|
"mmc write ${loadaddr} ${lba_start} ${fw_sz}; " \
|
|
"; fi\0" \
|
|
|
|
#define TFTP_UPDATE_KERNEL \
|
|
"setenv kernel_part ${kernel_part_active};" \
|
|
"run tftp_mmc_fitImg;" \
|
|
"setenv kernel_part ${kernel_part_backup};" \
|
|
"run tftp_mmc_fitImg;" \
|
|
|
|
#define __TFTP_UPDATE_ROOTFS \
|
|
"tftp_mmc_rootfs=" \
|
|
"if test ! -n ${rootfs_part}; then " \
|
|
"setenv rootfs_part ${rootfs_part_active};" \
|
|
"fi;" \
|
|
"if tftp ${loadaddr} ${rootfs_file}; then " \
|
|
"setexpr fw_sz ${filesize} / 0x200; " \
|
|
"setexpr fw_sz ${fw_sz} + 1; " \
|
|
"part start mmc ${mmcdev} ${rootfs_part} lba_start; " \
|
|
"mmc write ${loadaddr} ${lba_start} ${fw_sz}; " \
|
|
"; fi\0" \
|
|
|
|
#define TFTP_UPDATE_ROOTFS \
|
|
"setenv rootfs_part ${rootfs_part_active};" \
|
|
"run tftp_mmc_rootfs;" \
|
|
"run tftp_mmc_rootfs_bkp;" \
|
|
|
|
|
|
#define TFTP_UPDATE_RECOVERY_SWU_KERNEL \
|
|
"tftp_sf_fitImg_SWU=" \
|
|
"if tftp ${loadaddr} ${kernel_file}; then " \
|
|
"sf probe;" \
|
|
"sf erase swu-kernel +${filesize};" \
|
|
"sf write ${loadaddr} swu-kernel ${filesize};" \
|
|
"; fi\0" \
|
|
|
|
#define TFTP_UPDATE_RECOVERY_SWU_INITRAMFS \
|
|
"swu_initramfs_file=swupdate-image-display5.ext4.gz.u-boot\0" \
|
|
"tftp_sf_initramfs_SWU=" \
|
|
"if tftp ${loadaddr} ${swu_initramfs_file}; then " \
|
|
"sf probe;" \
|
|
"sf erase swu-initramfs +${filesize};" \
|
|
"sf write ${loadaddr} swu-initramfs ${filesize};" \
|
|
"; fi\0" \
|
|
|
|
#define TFTP_UPDATE_BOOTLOADER \
|
|
"ubootfile=u-boot.img\0" \
|
|
"ubootfileSPL=SPL\0" \
|
|
"tftp_sf_uboot=" \
|
|
"if tftp ${loadaddr} ${ubootfile}; then " \
|
|
"sf probe;" \
|
|
"sf erase u-boot +${filesize};" \
|
|
"sf write ${loadaddr} u-boot ${filesize}" \
|
|
"; fi\0" \
|
|
"tftp_sf_SPL=" \
|
|
"if tftp ${loadaddr} ${ubootfileSPL}; then " \
|
|
"sf probe;" \
|
|
"setexpr uboot_SPL_size ${filesize} + 0x400;" \
|
|
"sf erase 0x0 +${uboot_SPL_size};" \
|
|
"sf write ${loadaddr} 0x400 ${filesize};" \
|
|
"fi\0" \
|
|
|
|
#define TFTP_UPDATE_SPINOR \
|
|
"spinorfile=core-image-lwn-display5.spinor\0" \
|
|
"spinorsize=0x2000000\0" \
|
|
"tftp_sf_img=" \
|
|
"if tftp ${loadaddr} ${spinorfile}; then " \
|
|
"sf probe;" \
|
|
"sf erase 0x0 ${spinorsize};" \
|
|
"sf write ${loadaddr} 0x0 ${filesize};" \
|
|
"fi\0" \
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
PARTS_DEFAULT \
|
|
"gpio_recovery=93\0" \
|
|
"check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \
|
|
"display=tianma-tm070-800x480\0" \
|
|
"board=display5\0" \
|
|
"mmcdev=0\0" \
|
|
"altbootcmd=run recovery\0" \
|
|
"bootdelay=1\0" \
|
|
"baudrate=115200\0" \
|
|
"bootcmd=" CONFIG_BOOTCOMMAND "\0" \
|
|
"ethact=FEC\0" \
|
|
"netdev=eth0\0" \
|
|
"boot_os=y\0" \
|
|
"hostname=display5\0" \
|
|
"loadaddr=0x12000000\0" \
|
|
"fdtaddr=0x12800000\0" \
|
|
"console=ttymxc4,115200 quiet cma=256M\0" \
|
|
"fdtfile=imx6q-display5.dtb\0" \
|
|
"fdt_high=0xffffffff\0" \
|
|
"initrd_high=0xffffffff\0" \
|
|
"kernel_file=fitImage\0" \
|
|
"fitImg_fw_sz=0x2200\0" \
|
|
"up=run tftp_sf_SPL; run tftp_sf_uboot\0" \
|
|
"download_kernel=" \
|
|
"tftpboot ${loadaddr} ${kernel_file};\0" \
|
|
"factory_nfs=" \
|
|
"setenv ipaddr 192.168.1.102;" \
|
|
"setenv gatewayip 192.168.1.1;" \
|
|
"setenv netmask 255.255.255.0;" \
|
|
"setenv serverip 192.168.1.2;" \
|
|
"echo BOOT: FACTORY (LEG);" \
|
|
"run boot_nfs\0" \
|
|
"boot_swu_recovery=" SWUPDATE_RECOVERY_PROCEDURE "\0" \
|
|
"recovery=" \
|
|
"echo BOOT: RECOVERY: SWU;" \
|
|
"run boot_swu_recovery\0" \
|
|
"boot_tftp=" \
|
|
"if run download_kernel; then " \
|
|
"setenv bootargs console=${console} " \
|
|
"root=/dev/mmcblk0p2 rootwait;" \
|
|
"bootm ${loadaddr} - ${fdtaddr};reset;" \
|
|
"fi\0" \
|
|
"addip=setenv bootargs ${bootargs} " \
|
|
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
|
|
"${hostname}:eth0:on" \
|
|
"\0" \
|
|
"nfsargs=setenv bootargs " \
|
|
"root=/dev/nfs rw " \
|
|
"nfsroot=${serverip}:${rootpath},nolock,nfsvers=3" \
|
|
"\0" \
|
|
"rootpath=/srv/tftp/DISP5/rootfs\0" \
|
|
"boot_nfs=" \
|
|
"if run download_kernel; then " \
|
|
"run nfsargs;" \
|
|
"run addip;" \
|
|
"setenv bootargs ${bootargs} console=${console};" \
|
|
"setenv fdt_conf imx6q-${board}-${display}.dtb; " \
|
|
"bootm ${loadaddr}#conf@${fdt_conf};reset;" \
|
|
"fi\0" \
|
|
"falcon_setup=" \
|
|
"if mmc dev ${mmcdev}; then " \
|
|
SETUP_BOOTARGS \
|
|
"spl export fdt ${loadaddr}#conf@${fdt_conf};" \
|
|
"setexpr fw_sz ${fdtargslen} / 0x200; " \
|
|
"setexpr fw_sz ${fw_sz} + 1; " \
|
|
"mmc write ${fdtargsaddr} " \
|
|
__stringify(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR)" ${fw_sz}; " \
|
|
"fi\0" \
|
|
"boot_mmc=" \
|
|
"if mmc dev ${mmcdev}; then " \
|
|
SETUP_BOOTARGS \
|
|
"bootm ${loadaddr}#conf@${fdt_conf};reset;" \
|
|
"fi\0" \
|
|
"set_kernel_part=" \
|
|
"if test ${BOOT_FROM} = ACTIVE; then " \
|
|
"setenv kernel_part ${kernel_part_active};" \
|
|
"echo BOOT: ACTIVE;" \
|
|
"else if test ${BOOT_FROM} = BACKUP; then " \
|
|
"setenv kernel_part ${kernel_part_backup};" \
|
|
"echo BOOT: BACKUP;" \
|
|
"else " \
|
|
"run recovery;" \
|
|
"fi;fi\0" \
|
|
"set_rootfs_part=" \
|
|
"if test ${BOOT_FROM} = ACTIVE; then " \
|
|
"setenv rootfs_part ${rootfs_part_active};" \
|
|
"else if test ${BOOT_FROM} = BACKUP; then " \
|
|
"setenv rootfs_part ${rootfs_part_backup};" \
|
|
"else " \
|
|
"run recovery;" \
|
|
"fi;fi\0" \
|
|
"BOOT_FROM=ACTIVE\0" \
|
|
TFTP_UPDATE_BOOTLOADER \
|
|
TFTP_UPDATE_SPINOR \
|
|
"kernel_part_active=1\0" \
|
|
"kernel_part_backup=3\0" \
|
|
__TFTP_UPDATE_KERNEL \
|
|
"rootfs_part_active=2\0" \
|
|
"rootfs_part_backup=4\0" \
|
|
"rootfs_file=core-image-lwn-display5.ext4\0" \
|
|
"rootfs_file_backup=core-image-lwn-backup-display5.ext4\0" \
|
|
__TFTP_UPDATE_ROOTFS \
|
|
"tftp_mmc_rootfs_bkp=" \
|
|
"setenv rootfs_part ${rootfs_part_backup};" \
|
|
"setenv rootfs_file ${rootfs_file_backup};" \
|
|
"run tftp_mmc_rootfs\0" \
|
|
TFTP_UPDATE_RECOVERY_SWU_KERNEL \
|
|
TFTP_UPDATE_RECOVERY_SWU_INITRAMFS \
|
|
"\0" \
|
|
|
|
/* Miscellaneous configurable options */
|
|
#undef CONFIG_SYS_CBSIZE
|
|
#define CONFIG_SYS_CBSIZE 2048
|
|
|
|
/* Print Buffer Size */
|
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
|
sizeof(CONFIG_SYS_PROMPT) + 16)
|
|
#define CONFIG_SYS_MAXARGS 32
|
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
|
|
|
#define CONFIG_STANDALONE_LOAD_ADDR 0x10001000
|
|
#define CONFIG_SYS_HZ 1000
|
|
|
|
/* 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)
|
|
|
|
/* Watchdog */
|
|
#if defined(CONFIG_SPL_BUILD)
|
|
#undef CONFIG_WDT
|
|
#undef CONFIG_WATCHDOG
|
|
#define CONFIG_HW_WATCHDOG
|
|
#endif
|
|
|
|
/* ENV config */
|
|
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
|
|
#define CONFIG_ENV_SIZE (SZ_64K)
|
|
/* The 0x120000 value corresponds to above SPI-NOR memory MAP */
|
|
#define CONFIG_ENV_OFFSET (0x120000)
|
|
#define CONFIG_ENV_SECT_SIZE (SZ_64K)
|
|
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
|
|
CONFIG_ENV_SECT_SIZE)
|
|
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
|
|
#endif
|
|
|
|
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
|
#endif /* __CONFIG_H */
|