diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am43xx_evm.h | 6 | ||||
| -rw-r--r-- | include/configs/am57xx_evm.h | 5 | ||||
| -rw-r--r-- | include/configs/cl-som-am57x.h | 148 | ||||
| -rw-r--r-- | include/configs/cm_t43.h | 3 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 5 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 6 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 9 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 8 |
8 files changed, 4 insertions, 186 deletions
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 5a6080645a..37d058ebbc 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -120,12 +120,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x120000 #endif -/* SPI */ -#define CONFIG_TI_SPI_MMAP -#define CONFIG_QSPI_SEL_GPIO 48 -#define CONFIG_QSPI_QUAD_SUPPORT -#define CONFIG_TI_EDMA3 - #ifndef CONFIG_SPL_BUILD #include <environment/ti/dfu.h> #include <environment/ti/mmc.h> diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 48999847ee..c14b010550 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -92,11 +92,6 @@ #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 /* SPI SPL */ -#define CONFIG_TI_EDMA3 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 -/* SPI */ -#define CONFIG_TI_SPI_MMAP -#define CONFIG_QSPI_QUAD_SUPPORT - #endif /* __CONFIG_AM57XX_EVM_H */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h deleted file mode 100644 index bf2bb44d48..0000000000 --- a/include/configs/cl-som-am57x.h +++ /dev/null @@ -1,148 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration settings for CompuLab CL-SOM-AM57x board - * - * (C) Copyright 2016 CompuLab, Ltd. http://compulab.co.il/ - * - * Author: Dmitry Lifshitz <lifshitz@compulab.co.il> - */ - -#ifndef __CONFIG_CL_SOM_AM57X_H -#define __CONFIG_CL_SOM_AM57X_H - -#define CONSOLEDEV "ttyO2" -#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ - -#define CONFIG_SYS_OMAP_ABE_SYSCK - -#define PARTS_DEFAULT - -#include <configs/ti_omap5_common.h> - -/* misc */ -#define CONFIG_REVISION_TAG - -/* PMIC I2C bus number */ -#define CONFIG_SYS_SPD_BUS_NUM 3 - -/* SPI Flash support */ -#define CONFIG_TI_SPI_MMAP - -/* SPI SPL defines */ -/* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS (256 * 1024) -#define CONFIG_SPL_SPI_SUPPORT - -/* SD/MMC RAW/FS boot */ -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 - -/* Environment */ -#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB env size */ - -#define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_OFFSET (768 * 1024) - -/* EEPROM */ -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_SYS_I2C_EEPROM_BUS 3 - -#define CONFIG_ENV_EEPROM_IS_ON_I2C -#define CONFIG_SYS_EEPROM_SIZE 256 - -#ifndef CONFIG_SPL_BUILD -/* SATA */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) -/* PCA9555 GPIO expander support */ -#define CONFIG_PCA953X -#define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 -#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } - -#endif /* !CONFIG_SPL_BUILD */ - -/* USB xHCI HOST */ -#define CONFIG_USB_XHCI_OMAP - -#define CONFIG_OMAP_USB3PHY1_HOST - -/* USB Networking options */ - -/* CPSW Ethernet */ -#define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_PHY_ATHEROS -#define CONFIG_SYS_RX_ETH_BUFFER 64 -#define PHY_ANEG_TIMEOUT 8000 - -#define CONFIG_BOOTP_DNS2 -#define CONFIG_NET_RETRY_COUNT 10 - -/* Default environment */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ - "autoload=no\0" \ - "baudrate=115200\0" \ - "console=ttyO2,115200n8\0" \ - "bootdelay=3\0" \ - "fdtfile=am57xx-sbc-am57x.dtb\0" \ - "kernel=zImage-cl-som-am57x\0" \ - "bootscr=bootscr.img\0" \ - "displaytype=hdmi\0" \ - "bootkernel=bootz ${loadaddr} - ${fdtaddr}\0" \ - "mmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \ - "mmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \ - "emmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \ - "emmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \ - "load_mmc=mmc dev ${mmcdev} && mmc rescan && " \ - "run mmcloadkernel && run mmcloadfdt\0" \ - "mmcroot=/dev/mmcblk1p2\0" \ - "mmcrootfstype=ext4 rw rootwait\0" \ - "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "mmcbootscript=setenv mmcdev 0; mmc dev ${mmcdev} && mmc rescan && " \ - "load mmc ${mmcdev} ${loadaddr} ${bootscr} && " \ - "echo Running bootscript from MMC/SD Card ... && " \ - "source ${loadaddr}\0" \ - "mmcboot=setenv mmcdev 0 && run load_mmc && " \ - "run mmcargs && echo Booting from MMC/SD Card ... && " \ - "run bootkernel\0" \ - "emmcroot=/dev/mmcblk0p2\0" \ - "emmcrootfstype=ext4 rw rootwait\0" \ - "emmcargs=setenv bootargs console=${console} " \ - "root=${emmcroot} " \ - "rootfstype=${emmcrootfstype}\0" \ - "emmcbootscript=setenv mmcdev 1; mmc dev ${mmcdev} && mmc rescan && " \ - "load mmc ${mmcdev} ${loadaddr} ${bootscr} && " \ - "echo Running bootscript from eMMC ... && " \ - "source ${loadaddr}\0" \ - "emmcboot=setenv mmcdev 1 && run load_mmc && " \ - "run emmcargs && echo Booting from eMMC ... && " \ - "run bootkernel\0" \ - "sataroot=/dev/sda2\0" \ - "satarootfstype=ext4 rw rootwait\0" \ - "load_sata=load scsi 0 ${loadaddr} ${kernel} && " \ - "load scsi 0 ${fdtaddr} ${fdtfile}\0" \ - "sataargs=setenv bootargs console=${console} " \ - "root=${sataroot} " \ - "rootfstype=${satarootfstype}\0" \ - "satabootscript=load scsi 0 ${loadaddr} ${bootscr} && " \ - "echo Running bootscript from SATA ... && " \ - "source ${loadaddr}\0" \ - "sataboot=run load_sata && run sataargs && " \ - "echo Booting from SATA ... && " \ - "run bootkernel\0" - -#undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND \ - "run mmcbootscript || run mmcboot || " \ - "run satabootscript || run sataboot || " \ - "run emmcbootscript || run emmcboot" - - -#endif /* __CONFIG_CL_SOM_AM57X_H */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index ffe4a44c86..e4e37e5bbb 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -53,9 +53,6 @@ #define CONFIG_USB_XHCI_OMAP #define CONFIG_AM437X_USB2PHY2_HOST -/* SPI Flash support */ -#define CONFIG_TI_SPI_MMAP - /* Power */ #define CONFIG_POWER #define CONFIG_POWER_I2C diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7441f4a69d..f6be6595fe 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -72,10 +72,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_PHY_TI -/* SPI */ -#define CONFIG_TI_SPI_MMAP -#define CONFIG_QSPI_QUAD_SUPPORT - /* * Default to using SPI for environment, etc. * 0x000000 - 0x040000 : QSPI.SPL (256KiB) @@ -98,7 +94,6 @@ #endif /* SPI SPL */ -#define CONFIG_TI_EDMA3 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index ee18260be6..a498393472 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -104,13 +104,7 @@ #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */ #ifdef CONFIG_AHCI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SUNXI_AHCI #define CONFIG_SYS_64BIT_LBA -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #endif #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 27a8e4d490..91ae7088a5 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -108,15 +108,6 @@ # define PHY_ANEG_TIMEOUT 20000 #endif -/* EEPROM */ -#ifdef CONFIG_ZYNQMP_EEPROM -# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -# define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 -# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 -# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -# define CONFIG_SYS_EEPROM_SIZE (64 * 1024) -#endif - #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) #define CONFIG_CLOCKS diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 94177c6fcb..3ab783e3a8 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -69,7 +69,7 @@ # define CONFIG_THOR_RESET_OFF # define DFU_ALT_INFO_RAM \ "dfu_ram_info=" \ - "set dfu_alt_info " \ + "setenv dfu_alt_info " \ "${kernel_image} ram 0x3000000 0x500000\\\\;" \ "${devicetree_image} ram 0x2A00000 0x20000\\\\;" \ "${ramdisk_image} ram 0x2000000 0x600000\0" \ @@ -79,7 +79,7 @@ # if defined(CONFIG_MMC_SDHCI_ZYNQ) # define DFU_ALT_INFO_MMC \ "dfu_mmc_info=" \ - "set dfu_alt_info " \ + "setenv dfu_alt_info " \ "${kernel_image} fat 0 1\\\\;" \ "${devicetree_image} fat 0 1\\\\;" \ "${ramdisk_image} fat 0 1\0" \ @@ -227,9 +227,9 @@ "env run importbootenv; " \ "fi; " \ "fi; \0" \ - "sd_loadbootenv=set bootenv_dev mmc && " \ + "sd_loadbootenv=setenv bootenv_dev mmc && " \ "run setbootenv \0" \ - "usb_loadbootenv=set bootenv_dev usb && usb start && run setbootenv \0" \ + "usb_loadbootenv=setenv bootenv_dev usb && usb start && run setbootenv \0" \ "preboot=if test $modeboot = sdboot; then " \ "run sd_loadbootenv; " \ "echo Checking if uenvcmd is set ...; " \ |