diff options
Diffstat (limited to 'include/configs')
79 files changed, 245 insertions, 270 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index ab7dd08914..48d5063716 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -98,6 +98,5 @@ CONFIG_SYS_MALLOC_LEN - \ 0x10000) #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_GPIO #endif /* __CONFIG_H */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 856c836385..2ecdd5d896 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -102,6 +102,5 @@ CONFIG_SYS_MALLOC_LEN - \ 0x10000) #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_GPIO #endif /* __CONFIG_H */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 7db67c2c61..44c3175e7d 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -365,7 +365,6 @@ #define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_MPC83XX_GPIO 1 -#define CONFIG_CMD_GPIO 1 /* * Serial Port diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 8611473773..ad2f115c56 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -538,7 +538,6 @@ #endif /* Misc Extra Settings */ -#define CONFIG_CMD_GPIO 1 #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d58816d61d..ed3fd34488 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -186,7 +186,12 @@ "if test $board_name = A335BONE; then " \ "setenv fdtfile am335x-bone.dtb; fi; " \ "if test $board_name = A335BNLT; then " \ - "setenv fdtfile am335x-boneblack.dtb; fi; " \ + "if test $board_rev = BBG1; then " \ + "setenv fdtfile am335x-bonegreen.dtb; " \ + "else " \ + "setenv fdtfile am335x-boneblack.dtb; " \ + "fi; " \ + "fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ diff --git a/include/configs/beagle_x15.h b/include/configs/am57xx_evm.h index d38b7b55cf..6308cab8e6 100644 --- a/include/configs/beagle_x15.h +++ b/include/configs/am57xx_evm.h @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_BEAGLE_X15_H -#define __CONFIG_BEAGLE_X15_H +#ifndef __CONFIG_AM57XX_EVM_H +#define __CONFIG_AM57XX_EVM_H #define CONFIG_AM57XX @@ -88,4 +88,4 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#endif /* __CONFIG_BEAGLE_X5_H */ +#endif /* __CONFIG_AM57XX_EVM_H */ diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 450291c6c0..9a7e0dcf90 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -39,6 +39,8 @@ #define CONFIG_BOARD_TYPES #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_OF_LIBFDT + /* * NAND Flash configuration */ @@ -48,28 +50,14 @@ /* * UART configuration - * - * CONFIG_CONS_INDEX = 1 - Debug UART - * CONFIG_CONS_INDEX = 4 - FPGA UART connected to FTDI/USB */ -#define CONFIG_CONS_INDEX 4 +#define CONFIG_DW_SERIAL #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE -4 -#if (CONFIG_CONS_INDEX == 1) - /* Debug UART */ -# define CONFIG_SYS_NS16550_CLK 33333000 -#else - /* FPGA UARTs use different clock */ -# define CONFIG_SYS_NS16550_CLK 33333333 -#endif -#define CONFIG_SYS_NS16550_COM1 (ARC_APB_PERIPHERAL_BASE + 0x5000) -#define CONFIG_SYS_NS16550_COM2 (ARC_FPGA_PERIPHERAL_BASE + 0x20000) -#define CONFIG_SYS_NS16550_COM3 (ARC_FPGA_PERIPHERAL_BASE + 0x21000) -#define CONFIG_SYS_NS16550_COM4 (ARC_FPGA_PERIPHERAL_BASE + 0x22000) +#define CONFIG_SYS_NS16550_CLK 33333333 #define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_BAUDRATE 115200 + /* * I2C configuration */ @@ -119,18 +107,11 @@ #define CONFIG_DW_AUTONEG /* - * Command line configuration + * Commands still not supported in Kconfig */ -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_FAT -#define CONFIG_CMD_I2C #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_RARP - -#define CONFIG_OF_LIBFDT #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 6ea6fb07f9..72479070be 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -126,7 +126,6 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C #define CONFIG_CMD_MMC #define CONFIG_CMD_BOOTZ diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index a07505041e..91a84feaf4 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -80,7 +80,6 @@ # define CONFIG_CMD_BOOTLDR # define CONFIG_CMD_CACHE # define CONFIG_CMD_CPLBINFO -# define CONFIG_CMD_GPIO # define CONFIG_CMD_KGDB # define CONFIG_CMD_LDRINFO # define CONFIG_CMD_REGINFO diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index c45c8c2389..9abbc39f83 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -17,7 +17,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 1d96a2dde7..c9eb63ecac 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -113,7 +113,6 @@ #define CONFIG_CMD_I2C /* GPIO */ #define CONFIG_OMAP_GPIO -#define CONFIG_CMD_GPIO /* * ---------------------------------------------------------------------------- * The following are general good-enough settings for U-Boot. We set a diff --git a/include/configs/calimain.h b/include/configs/calimain.h index a5b2f9e641..7f942dcd11 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -316,7 +316,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#define CONFIG_CMD_GPIO #ifndef CONFIG_DRIVER_TI_EMAC #undef CONFIG_CMD_DHCP diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 05132047b7..180ea280be 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -230,7 +230,6 @@ /* SPL */ #include "imx6_spl.h" -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x80 /* offset 64 kb */ #define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS / 2 * 1024) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index e951b2d5d1..5f2f020279 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -22,7 +22,6 @@ */ #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP_GPIO -#define CONFIG_CMD_GPIO #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ #define CONFIG_OMAP_COMMON /* Common ARM Erratas */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 8a10e9c6f0..1c086fc722 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -137,7 +137,6 @@ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#define CONFIG_CMD_GPIO #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 7658e61367..9135d6c624 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -55,7 +55,6 @@ /* GPIO support */ #define CONFIG_DM_GPIO -#define CONFIG_CMD_GPIO #define CONFIG_VYBRID_GPIO /* Dynamic MTD partition support */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index d3b7620af1..d89e661b6b 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -60,7 +60,6 @@ * GPIO */ #define CONFIG_LPC32XX_GPIO -#define CONFIG_CMD_GPIO /* * SSP/SPI diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 6d2c22e6ba..b8975fa9a3 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -101,7 +101,6 @@ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ #undef CONFIG_CMD_SPI -#undef CONFIG_CMD_GPIO #undef CONFIG_CMD_ASKENV #undef CONFIG_CMD_BOOTZ #undef CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h index e809f20359..3b2da0ddd4 100644 --- a/include/configs/dnp5370.h +++ b/include/configs/dnp5370.h @@ -94,7 +94,6 @@ /* * Misc Settings */ -#define CONFIG_CMD_GPIO #define CONFIG_CMD_STRINGS #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 2815ad8623..3f35616bca 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -34,31 +34,19 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - -/* Add target to build it automatically upon "make" */ -#define CONFIG_BUILD_TARGET "u-boot.kwb" /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_ENV +#define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_SF -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB -#define CONFIG_CMD_IDE -#define CONFIG_CMD_DATE /* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h" /* * Environment variables configurations @@ -118,20 +106,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ -/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - -/* - * display enhanced info about the cpu at boot. - */ -#define CONFIG_DISPLAY_CPUINFO - -#define CONFIG_OF_LIBFDT - #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/duovero.h b/include/configs/duovero.h index 28d12ad3b2..bb3ba5523a 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -48,7 +48,6 @@ #define CONFIG_SMC911X_BASE 0x2C000000 /* GPIO */ -#define CONFIG_CMD_GPIO /* ENV related config options */ #define CONFIG_ENV_IS_NOWHERE diff --git a/include/configs/ea20.h b/include/configs/ea20.h index b230d9cecb..53ad302561 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -155,7 +155,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES #define CONFIG_CMD_I2C -#define CONFIG_CMD_GPIO #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 4866836d55..5d2b4f320e 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -162,7 +162,6 @@ /* Enable Time Command */ #define CONFIG_CMD_TIME -#define CONFIG_CMD_GPIO /* USB */ #define CONFIG_CMD_USB diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 675ec52bcf..712bfd776a 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -20,46 +20,18 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_GURUPLUG /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* - * Compression configuration + * Standard filesystems */ -#define CONFIG_BZIP2 -#define CONFIG_LZMA -#define CONFIG_LZO +#define CONFIG_SYS_MVFS /* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ - -/* - * Commands configuration - */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB -#define CONFIG_CMD_FAT - -/* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h" /* * Environment variables configurations @@ -123,20 +95,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ -/* - * File system - */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_RBTREE -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_MTDPARTS - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_GURUPLUG_H */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 484d76305f..48010ebce8 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -54,7 +54,6 @@ /* GPIO */ #define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO /* Thermal */ #define CONFIG_IMX_THERMAL diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 1a4381bfe2..796861e485 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -79,7 +79,6 @@ #endif #define CONFIG_HIKEY_GPIO -#define CONFIG_CMD_GPIO /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 594fceb457..57b1a43cd4 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -9,7 +9,6 @@ #ifndef _CONFIG_IB62x0_H #define _CONFIG_IB62x0_H - /* * Version number information */ @@ -22,35 +21,23 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Machine type - */ -#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210 - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" /* * Compression configuration */ #define CONFIG_BZIP2 #define CONFIG_LZMA -#define CONFIG_LZO /* * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_IDE #define CONFIG_CMD_MII -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB /* * mv-common.h should be defined after CMD configs since it used them @@ -126,17 +113,4 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ -/* - * File system - */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_RBTREE -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_MTDPARTS - #endif /* _CONFIG_IB62x0_H */ diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index f3248bc1d5..91b29b35ba 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -56,6 +56,10 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_PROMPT "Hit <SPACE> key to stop autoboot in %2ds\n" +#define CONFIG_AUTOBOOT_STOP_STR " " + /* Support the IVM EEprom */ #define CONFIG_SYS_IVM_EEPROM_ADR 0x50 #define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400 @@ -137,8 +141,9 @@ * - 'release': for a standalone system kernel/rootfs from flash */ #define CONFIG_KM_DEF_ENV_BOOTTARGETS \ - "subbootcmds=ubiattach ubicopy cramfsloadfdt set_fdthigh " \ - "cramfsloadkernel flashargs add_default addpanic boot\0"\ + "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \ + "set_fdthigh cramfsloadkernel flashargs add_default " \ + "addpanic boot\0" \ "develop=" \ "tftp 200000 scripts/develop-${arch}.txt && " \ "env import -t 200000 ${filesize} && " \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index eb85a74919..3f045f2e4a 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -17,6 +17,10 @@ #define CONFIG_CMD_DTT #define CONFIG_JFFS2_CMDLINE +/* Pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP + /* standard km ethernet_present for piggy */ #define CONFIG_KM_COMMON_ETH_INIT @@ -63,9 +67,9 @@ * is not valid yet, which is the case for when u-boot copies itself to RAM */ #define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10) -#define CONFIG_KM_CRAMFS_ADDR 0x800000 -#define CONFIG_KM_KERNEL_ADDR 0x400000 /* 3968Kbytes */ -#define CONFIG_KM_FDT_ADDR 0x7E0000 /* 128Kbytes */ +#define CONFIG_KM_CRAMFS_ADDR 0xC00000 +#define CONFIG_KM_KERNEL_ADDR 0x400000 /* 7680Kbytes */ +#define CONFIG_KM_FDT_ADDR 0xB80000 /* 512Kbytes */ /* architecture specific default bootargs */ #define CONFIG_KM_DEF_BOOT_ARGS_CPU "" @@ -79,6 +83,7 @@ " ${filesize} && " \ "protect on " __stringify(BOOTFLASH_START) " +${filesize}\0"\ "set_fdthigh=true\0" \ + "checkfdt=true\0" \ "" #endif /* __CONFIG_KEYMILE_POWERPC_H */ diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h index 5cbb348045..d21b500d74 100644 --- a/include/configs/km/km8309-common.h +++ b/include/configs/km/km8309-common.h @@ -28,8 +28,10 @@ /* QE microcode/firmware address */ #define CONFIG_SYS_QE_FMAN_FW_IN_NOR -/* at end of uboot partition, before env */ -#define CONFIG_SYS_QE_FW_ADDR 0xF00B0000 +/* between the u-boot partition and env */ +#ifndef CONFIG_SYS_QE_FW_ADDR +#define CONFIG_SYS_QE_FW_ADDR 0xF00C0000 +#endif /* * System IO Config @@ -98,6 +100,12 @@ HRCWH_BIG_ENDIAN | \ HRCWH_LALE_NORMAL) +#define CONFIG_SYS_DDRCDR (\ + DDRCDR_EN | \ + DDRCDR_PZ_MAXZ | \ + DDRCDR_NZ_MAXZ | \ + DDRCDR_M_ODR) + #define CONFIG_SYS_DDR_CS0_BNDS 0x0000007f #define CONFIG_SYS_DDR_SDRAM_CFG (SDRAM_CFG_SDRAM_TYPE_DDR2 | \ SDRAM_CFG_32_BE | \ diff --git a/include/configs/km/km8321-common.h b/include/configs/km/km8321-common.h index cd56380492..ef83263e3d 100644 --- a/include/configs/km/km8321-common.h +++ b/include/configs/km/km8321-common.h @@ -64,6 +64,12 @@ HRCWH_BIG_ENDIAN | \ HRCWH_LALE_NORMAL) +#define CONFIG_SYS_DDRCDR (\ + DDRCDR_EN | \ + DDRCDR_PZ_MAXZ | \ + DDRCDR_NZ_MAXZ | \ + DDRCDR_M_ODR) + #define CONFIG_SYS_DDR_CS0_BNDS 0x0000007f #define CONFIG_SYS_DDR_SDRAM_CFG (SDRAM_CFG_SDRAM_TYPE_DDR2 | \ SDRAM_CFG_32_BE | \ diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index cebe21060e..30cf60c259 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -152,9 +152,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP #define CONFIG_OF_STDOUT_VIA_ALIAS /* @@ -184,10 +181,14 @@ #ifndef CONFIG_SYS_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH +#ifndef CONFIG_ENV_ADDR #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) +#endif #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ +#ifndef CONFIG_ENV_OFFSET #define CONFIG_ENV_OFFSET (CONFIG_SYS_MONITOR_LEN) +#endif /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ @@ -322,8 +323,8 @@ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ "newenv=" \ - "prot off 0xF00C0000 +0x40000 && " \ - "era 0xF00C0000 +0x40000\0" \ + "prot off "__stringify(CONFIG_ENV_ADDR)" +0x40000 && " \ + "era "__stringify(CONFIG_ENV_ADDR)" +0x40000\0" \ "unlock=yes\0" \ "" diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index b89af535ab..54aa6fb3b6 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -82,6 +82,12 @@ "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ CONFIG_KM_UPDATE_UBOOT \ "set_fdthigh=setenv fdt_high ${kernelmem}\0" \ + "checkfdt=" \ + "if cramfsls fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; " \ + "then true; else setenv cramfsloadfdt true; " \ + "setenv boot bootm ${load_addr_r}; " \ + "echo No FDT found, booting with the kernel " \ + "appended one; fi\0" \ "" #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ @@ -241,7 +247,7 @@ int get_scl(void); #define CONFIG_SYS_EEPROM_WREN #define CONFIG_ENV_OFFSET 0x0 /* no bracets! */ #define CONFIG_ENV_SIZE (0x2000 - CONFIG_ENV_OFFSET) -#define CONFIG_I2C_ENV_EEPROM_BUS KM_ENV_BUS +#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */ #define CONFIG_ENV_OFFSET_REDUND 0x2000 /* no bracets! */ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 8a3c74e1db..e163edb1e8 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -457,6 +457,7 @@ int get_scl(void); "sf probe 0;sf erase 0 +${filesize};" \ "sf write ${load_addr_r} 0 ${filesize};\0" \ "set_fdthigh=true\0" \ + "checkfdt=true\0" \ "" #define CONFIG_HW_ENV_SETTINGS \ diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index 19e89cec76..4cfc1dc2d7 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -430,10 +430,7 @@ int get_scl(void); #define CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC /* "bad" address */ -/* pass open firmware flat tree */ #define CONFIG_FIT 1 -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc/cpm/serial@11a90" diff --git a/include/configs/km8360.h b/include/configs/km8360.h index c517e78df2..49b92007de 100644 --- a/include/configs/km8360.h +++ b/include/configs/km8360.h @@ -99,7 +99,7 @@ #define CONFIG_SYS_DDR_CS0_CONFIG (\ CSCONFIG_EN | \ CSCONFIG_AP | \ - CSCONFIG_ODT_RD_ONLY_CURRENT | \ + CSCONFIG_ODT_WR_ONLY_CURRENT | \ CSCONFIG_BANK_BIT_3 | \ CSCONFIG_ROW_BIT_13 | \ CSCONFIG_COL_BIT_10) @@ -107,7 +107,7 @@ #define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \ CSCONFIG_ROW_BIT_13 | \ CSCONFIG_COL_BIT_10 | \ - CSCONFIG_ODT_RD_ONLY_CURRENT) + CSCONFIG_ODT_WR_ONLY_CURRENT) #endif #define CONFIG_SYS_DDR_CLK_CNTL (\ diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index dc2615533c..a445aaf09d 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -116,10 +116,6 @@ /* include common defines/options for all arm based Keymile boards */ #include "km/km_arm.h" -#ifndef CONFIG_KM_ENV_IS_IN_SPI_NOR -#define KM_ENV_BUS 5 /* I2C2 (Mux-Port 5)*/ -#endif - #if defined(CONFIG_KM_PIGGY4_88E6352) /* * Some keymile boards like mgcoge5un & nusa1 have their PIGGY4 connected via diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 29c60b75a5..24b5489237 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -32,7 +32,6 @@ #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV #define CONFIG_CMD_I2C #define CONFIG_CMD_MII diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 62406666eb..882f3dbba2 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -135,7 +135,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE #define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_GPIO #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 8ce1c49707..6f20a82f76 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -248,7 +248,6 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_MFSL -#define CONFIG_CMD_GPIO #if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE) # define CONFIG_CMD_CACHE diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h new file mode 100644 index 0000000000..d7d8d81cb9 --- /dev/null +++ b/include/configs/mv-plug-common.h @@ -0,0 +1,64 @@ +/* + * (C) Copyright 2009-2015 + * Marvell Semiconductor <www.marvell.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _CONFIG_MARVELL_PLUG_H +#define _CONFIG_MARVELL_PLUG_H + + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ + +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" + +/* + * Compression configuration + */ +#ifdef CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_LZMA +#define CONFIG_CMD_BOOTZ +#endif /* CONFIG_SYS_MVFS */ + +/* + * Enable device tree support + */ +#define CONFIG_OF_LIBFDT + +/* + * Commands configuration + */ +#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_CMD_DATE +#define CONFIG_CMD_ENV +#define CONFIG_CMD_IDE +#define CONFIG_CMD_MII + +/* + * Extra file system + */ +#define CONFIG_CMD_EXT4 + +/* + * mv-common.h should be defined after CMD configs since it used them + * to enable certain macros + */ +#include "mv-common.h" + +/* + * RTC driver configuration + */ +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + +#define CONFIG_SYS_ALT_MEMTEST + +#endif /* _CONFIG_MARVELL_PLUG_H */ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 529f73b852..e6a08d187c 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -19,7 +19,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_LED #define CONFIG_CMD_MMC #define CONFIG_CMD_USB diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index b649c7d152..92f8f86cb9 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -21,7 +21,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC #define CONFIG_CMD_USB #define CONFIG_CMD_BOOTZ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 588490f3cd..10867a7b9d 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -24,7 +24,6 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_PING diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 29bfbde3c5..1fd7ce3178 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -103,7 +103,6 @@ /* GPIO */ #define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO /* MMC */ #define CONFIG_MMC diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 5615a348e8..870e12ed2e 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -73,7 +73,6 @@ /* GPIO */ #define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO /* UART */ #define CONFIG_MXC_UART diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 52369be39e..f071c59597 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -129,7 +129,6 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_GPIO /* Enable gpio command */ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 4c85e851ab..8e6715975f 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -194,7 +194,6 @@ #define CONFIG_EXYNOS_ACE_SHA #define CONFIG_LIB_HW_RAND -#define CONFIG_CMD_GPIO /* USB */ #define CONFIG_CMD_USB diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index bf986f86cb..65f08a1c57 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -108,7 +108,6 @@ #define CONFIG_USB_STORAGE /* USB storage support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_LED /* LED support */ -#define CONFIG_CMD_GPIO /* Enable gpio command */ #define CONFIG_CMD_DHCP #define CONFIG_VIDEO_OMAP3 /* DSS Support */ diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 95614b94cc..15f3eec313 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -39,7 +39,6 @@ #include <configs/ti_omap4_common.h> /* GPIO */ -#define CONFIG_CMD_GPIO /* ENV related config options */ diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index ecb385c0b3..e3e1237fa8 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -52,7 +52,6 @@ /* GPIO is not supported */ #undef CONFIG_INTEL_ICH6_GPIO -#undef CONFIG_CMD_GPIO /* SPI is not supported */ #undef CONFIG_ICH_SPI diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 0b8c681473..1b83eb36a7 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -117,7 +117,6 @@ #define CONFIG_COMMAND_HISTORY /* Commands */ -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index c96ec905db..2a68203446 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -48,7 +48,6 @@ #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_MD5SUM -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GPT #define CONFIG_PARTITION_UUIDS diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index 1715678672..8088359e4d 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -17,7 +17,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC #define CONFIG_CMD_PING #define CONFIG_CMD_USB diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 6d35cd3df5..6642b3f8b4 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_PING diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 76cdbe0c6d..ebc3d642f1 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -20,46 +20,23 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_SHEEVAPLUG /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* - * Compression configuration - */ -#define CONFIG_BZIP2 -#define CONFIG_LZMA -#define CONFIG_LZO - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* - * Miscellaneous configurable options + * Commands configuration */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ +#define CONFIG_CMD_MMC /* - * Commands configuration + * Standard filesystems */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII -#define CONFIG_CMD_MMC -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB +#define CONFIG_SYS_MVFS /* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h" /* * Environment variables configurations @@ -132,18 +109,4 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif /* CONFIG_CMD_IDE */ -/* - * File system - */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_RBTREE -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_MTDPARTS - #endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 6c374eb082..9ab04577d4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -615,7 +615,6 @@ #define CONFIG_OMAP_GPIO /* Gpio cmd support */ -#define CONFIG_CMD_GPIO /* Watchdog */ #define CONFIG_HW_WATCHDOG diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index afcd16afbe..e5cf7d2610 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -151,7 +151,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C -#define CONFIG_CMD_GPIO #define CONFIG_CMD_USB #define CONFIG_CMD_MII #define CONFIG_CMD_NAND diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index b75b0a27fa..8364c66a8d 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index fa67b25a79..86b53e200d 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 191e1f7a43..3ae9b3ef42 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index 65816a05cf..4b270cecae 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 6c71ef4e23..742c5ae61f 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index f5db4d3e3e..d7d5d25c0b 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -271,7 +271,6 @@ extern int soft_i2c_gpio_scl; /* GPIO */ #define CONFIG_SUNXI_GPIO #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_CMD_GPIO #ifdef CONFIG_VIDEO /* diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h index fddba92389..af8730a6cb 100644 --- a/include/configs/suvd3.h +++ b/include/configs/suvd3.h @@ -29,13 +29,48 @@ #define CONFIG_KM_BOARD_NAME "suvd3" /* include common defines/options for all 8321 Keymile boards */ #include "km/km8321-common.h" + #elif defined(CONFIG_KMVECT1) /* VECT1 board specific */ #define CONFIG_HOSTNAME kmvect1 #define CONFIG_KM_BOARD_NAME "kmvect1" +/* at end of uboot partition, before env */ +#define CONFIG_SYS_QE_FW_ADDR 0xF00B0000 +/* include common defines/options for all 8309 Keymile boards */ +#include "km/km8309-common.h" + +#elif defined(CONFIG_KMTEGR1) /* TEGR1 board specific */ +#define CONFIG_HOSTNAME kmtegr1 +#define CONFIG_KM_BOARD_NAME "kmtegr1" +#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define MTDIDS_DEFAULT "nor0=boot,nand0=app" +#define MTDPARTS_DEFAULT "mtdparts=" \ + "boot:" \ + "768k(u-boot)," \ + "256k(qe-fw)," \ + "128k(env)," \ + "128k(envred)," \ + "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");" \ + "app:" \ + "-(" CONFIG_KM_UBI_PARTITION_NAME_APP ");" + +#define CONFIG_ENV_ADDR 0xF0100000 +#define CONFIG_ENV_OFFSET 0x100000 + +#define CONFIG_CMD_NAND +#define CONFIG_NAND_ECC_BCH +#define CONFIG_BCH +#define CONFIG_NAND_KMETER1 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define NAND_MAX_CHIPS 1 + /* include common defines/options for all 8309 Keymile boards */ #include "km/km8309-common.h" +/* must be after the include because KMBEC_FPGA is otherwise undefined */ +#define CONFIG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ + #else -#error Supported boards are: SUVD3, KMVECT1 +#error Supported boards are: SUVD3, KMVECT1, KMTEGR1 #endif #define CONFIG_SYS_APP1_BASE 0xA0000000 @@ -56,6 +91,7 @@ * */ +#if defined(CONFIG_SUVD3) || defined(CONFIG_KMVECT1) /* * APP1 on the local bus CS2 */ @@ -82,14 +118,26 @@ 0x0000c000 | \ MxMR_WLFx_2X) +#elif defined(CONFIG_KMTEGR1) +#define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_APP2_BASE | \ + BR_PS_16 | \ + BR_MS_GPCM | \ + BR_V) + +#define CONFIG_SYS_OR3_PRELIM (MEG_TO_AM(CONFIG_SYS_APP2_SIZE) | \ + OR_GPCM_SCY_5 | \ + OR_GPCM_TRLX_CLEAR | \ + OR_GPCM_EHTR_CLEAR) + +#endif /* CONFIG_KMTEGR1 */ + #define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE #define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) /* * MMU Setup */ - - +#if defined(CONFIG_SUVD3) || defined(CONFIG_KMVECT1) /* APP1: icache cacheable, but dcache-inhibit and guarded */ #define CONFIG_SYS_IBAT5L (CONFIG_SYS_APP1_BASE | BATL_PP_RW | \ BATL_MEMCOHERENCE) @@ -99,6 +147,13 @@ BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE) #define CONFIG_SYS_DBAT5U CONFIG_SYS_IBAT5U +#elif defined(CONFIG_KMTEGR1) +#define CONFIG_SYS_IBAT5L (0) +#define CONFIG_SYS_IBAT5U (0) +#define CONFIG_SYS_DBAT5L CONFIG_SYS_IBAT5L +#define CONFIG_SYS_DBAT5U CONFIG_SYS_IBAT5U +#endif /* CONFIG_KMTEGR1 */ + #define CONFIG_SYS_IBAT6L (CONFIG_SYS_APP2_BASE | BATL_PP_RW | \ BATL_MEMCOHERENCE) #define CONFIG_SYS_IBAT6U (CONFIG_SYS_APP2_BASE | BATU_BL_256M | \ @@ -131,7 +186,9 @@ #define CONFIG_SYS_UEC1_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR #define CONFIG_SYS_UEC1_INTERFACE_TYPE PHY_INTERFACE_MODE_MII #define CONFIG_SYS_UEC1_INTERFACE_SPEED 100 +#endif /* CONFIG_KMVECT1 */ +#if defined(CONFIG_KMVECT1) || defined(CONFIG_KMTEGR1) /* ethernet port connected to piggy (UEC2) */ #define CONFIG_HAS_ETH1 #define CONFIG_UEC_ETH2 @@ -142,6 +199,6 @@ #define CONFIG_SYS_UEC2_PHY_ADDR 0 #define CONFIG_SYS_UEC2_INTERFACE_TYPE PHY_INTERFACE_MODE_RMII #define CONFIG_SYS_UEC2_INTERFACE_SPEED 100 -#endif /* CONFIG_KMVECT1 */ +#endif /* CONFIG_KMVECT1 || CONFIG_KMTEGR1 */ #endif /* __CONFIG_H */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index f993433285..4cb79021e9 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -103,7 +103,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ -#define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MII #define CONFIG_CMD_MMC /* MMC support */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 32cc39bbe3..5bb9e485f2 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -113,7 +113,6 @@ GENERATED_GBL_DATA_SIZE) #define CONFIG_TEGRA_GPIO -#define CONFIG_CMD_GPIO #define CONFIG_CMD_ENTERRCM /* Defines for SPL */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 7810dd6c30..2087eb194c 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -101,7 +101,6 @@ #define CONFIG_CMD_SPI /* GPIO block */ -#define CONFIG_CMD_GPIO /* * The following are general good-enough settings for U-Boot. We set a diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ed865612fd..2b2c060782 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -302,7 +302,6 @@ /* And no support for GPIO, yet.. */ #undef CONFIG_SPL_GPIO_SUPPORT -#undef CONFIG_CMD_GPIO /* we may include files below only after all above definitions */ #include <asm/arch/hardware.h> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 1330a0a591..450073c606 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_RTC_DS1337_NOOSC #define CONFIG_CMD_DATE -#define CONFIG_CMD_GPIO /* LED */ #define CONFIG_CMD_LED diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index 08ead7fa44..e2ca9e3ef8 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -36,6 +36,9 @@ #elif defined(CONFIG_KMOPTI2) #define CONFIG_KM_BOARD_NAME "kmopti2" #define CONFIG_HOSTNAME kmopti2 +#elif defined(CONFIG_KMTEPR2) +#define CONFIG_KM_BOARD_NAME "kmtepr2" +#define CONFIG_HOSTNAME kmtepr2 #else #error ("Board not supported") #endif @@ -47,21 +50,45 @@ #define CONFIG_SYS_APP1_BASE 0xA0000000 /* PAXG */ #define CONFIG_SYS_APP1_SIZE 256 /* Megabytes */ -#if defined(CONFIG_TUXX1) || defined(CONFIG_KMOPTI2) +#if defined(CONFIG_TUXX1) || defined(CONFIG_KMOPTI2) || defined(CONFIG_KMTEPR2) #define CONFIG_SYS_APP2_BASE 0xB0000000 /* PINC3 */ #define CONFIG_SYS_APP2_SIZE 256 /* Megabytes */ #endif /* * Init Local Bus Memory Controller: - * Device on - * Bank Bus Machine PortSz Size TUDA1 TUXA1 TUGE1 KMSUPX4 KMOPTI2 - * ---- --- ------- ------ ----- --------------------------------------- - * 2 Local GPCM 8 bit 256MB PAXG LPXF PAXI LPXF PAXE - * 3 Local GPCM 8 bit 256MB PINC3 PINC2 unused unused OPI2(16 bit) + * Device on board + * Bank Bus Machine PortSz Size TUDA1 TUXA1 TUGE1 KMSUPX4 KMOPTI2 + * ----------------------------------------------------------------------------- + * 2 Local GPCM 8 bit 256MB PAXG LPXF PAXI LPXF PAXE + * 3 Local GPCM 8 bit 256MB PINC3 PINC2 unused unused OPI2(16 bit) * + * Device on board (continued) + * Bank Bus Machine PortSz Size KMTEPR2 + * ----------------------------------------------------------------------------- + * 2 Local GPCM 8 bit 256MB NVRAM + * 3 Local GPCM 8 bit 256MB TEP2 (16 bit) */ +#if defined(CONFIG_KMTEPRO2) +/* + * Configuration for C2 (NVRAM) on the local bus + */ +#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE +#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) +#define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ + BR_PS_8 | \ + BR_MS_GPCM | \ + BR_V) +#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \ + OR_GPCM_CSNT | \ + OR_GPCM_ACS_DIV2 | \ + OR_GPCM_XACS | \ + OR_GPCM_SCY_2 | \ + OR_GPCM_TRLX_SET | \ + OR_GPCM_EHTR_SET | \ + OR_GPCM_EAD) +#else /* * Configuration for C2 on the local bus */ @@ -82,6 +109,8 @@ OR_GPCM_TRLX_SET | \ OR_GPCM_EHTR_CLEAR | \ OR_GPCM_EAD) +#endif + #if defined(CONFIG_TUXX1) /* * Configuration for C3 on the local bus @@ -108,7 +137,7 @@ MxMR_WLFx_2X) #endif -#if defined(CONFIG_KMOPTI2) +#if defined(CONFIG_KMOPTI2) || defined(CONFIG_KMTEPR2) /* * Configuration for C3 on the local bus */ diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 2acebf1a56..caa0434a00 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -104,7 +104,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_MXC_GPIO #define CONFIG_NET_RETRY_COUNT 100 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index f77d065a72..e9127c34b9 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -153,7 +153,6 @@ * GPIO */ -#define CONFIG_CMD_GPIO #define CONFIG_LPC32XX_GPIO /* diff --git a/include/configs/x600.h b/include/configs/x600.h index 8534766588..58f1aca9a0 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -117,7 +117,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ab9fa0b082..33263ab60c 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -102,7 +102,6 @@ */ #define CONFIG_CMD_DATE #define CONFIG_CMD_FPGA_LOADMK -#define CONFIG_CMD_GPIO #define CONFIG_CMD_IO #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 0551580ccf..aa49c9e7b5 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -17,7 +17,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC #define CONFIG_CMD_PING #define CONFIG_CMD_USB diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 36c11009fc..e990512083 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -94,6 +94,9 @@ # define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI # define CONFIG_CMD_MMC +# ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ +# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 +# endif #endif #if defined(CONFIG_ZYNQ_SDHCI) @@ -182,6 +185,7 @@ # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define CONFIG_PHYLIB # define CONFIG_PHY_MARVELL +# define CONFIG_PHY_TI #endif /* I2C */ diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index ed6023a7bf..8bdb5c9c6d 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -19,6 +19,7 @@ #define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 #define CONFIG_ZYNQ_SDHCI0 +#define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #define CONFIG_ZYNQ_I2C0 #define CONFIG_SYS_I2C_ZYNQ #define CONFIG_ZYNQ_EEPROM diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index f98101fc27..d10f1ddaca 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -44,7 +44,6 @@ #endif #define CONFIG_ZYNQ_GPIO -#define CONFIG_CMD_GPIO /* Ethernet driver */ #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1) @@ -106,6 +105,7 @@ # define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI # define CONFIG_CMD_MMC +# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #endif #ifdef CONFIG_ZYNQ_USB @@ -332,7 +332,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#ifdef CONFIG_OF_CONTROL +#ifdef CONFIG_OF_SEPARATE # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" #else # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" |
